radiant/buildmenu: better executable extension strip, ref #138

[xonotic/netradiant.git] / radiant / multimon.cpp

diff --git a/radiant/multimon.cpp b/radiant/multimon.cpp
index 91385739239e7df3c7aa6d158c34a447c85ed5fc..869bc1d86690b28c1eb9d723fe0a9d8cdefaa6ab 100644 (file)
--- a/radiant/multimon.cpp
+++ b/radiant/multimon.cpp
@@ -29,14 +29,13 @@
 
 multimon_globals_t g_multimon_globals;
 
-LatchedBool g_Multimon_enableSysMenuPopups( false, "Floating windows sysmenu icons" );
+LatchedValue<bool> g_Multimon_enableSysMenuPopups( false, "Floating windows sysmenu icons" );
 
 void MultiMonitor_constructPreferences( PreferencesPage& page ){
        ui::CheckButton primary_monitor = page.appendCheckBox( "Multi Monitor", "Start on Primary Monitor", g_multimon_globals.m_bStartOnPrimMon );
        ui::CheckButton popup = page.appendCheckBox(
                "", "Disable system menu on popup windows",
-               LatchedBoolImportCaller( g_Multimon_enableSysMenuPopups ),
-               BoolExportCaller( g_Multimon_enableSysMenuPopups.m_latched )
+               make_property( g_Multimon_enableSysMenuPopups )
                );
        Widget_connectToggleDependency( popup, primary_monitor );
 }
@@ -87,12 +86,13 @@ void MultiMon_Construct(){
                g_multimon_globals.m_bStartOnPrimMon = true;
        }
 
-       GlobalPreferenceSystem().registerPreference( "StartOnPrimMon", BoolImportStringCaller( g_multimon_globals.m_bStartOnPrimMon ), BoolExportStringCaller( g_multimon_globals.m_bStartOnPrimMon ) );
-       GlobalPreferenceSystem().registerPreference( "NoSysMenuPopups", BoolImportStringCaller( g_Multimon_enableSysMenuPopups.m_latched ), BoolExportStringCaller( g_Multimon_enableSysMenuPopups.m_latched ) );
+       GlobalPreferenceSystem().registerPreference( "StartOnPrimMon", make_property_string( g_multimon_globals.m_bStartOnPrimMon ) );
+       GlobalPreferenceSystem().registerPreference( "NoSysMenuPopups", make_property_string( g_Multimon_enableSysMenuPopups.m_latched ) );
 
        g_Multimon_enableSysMenuPopups.useLatched();
 
-       PreferencesDialog_addInterfacePreferences( FreeCaller<void(PreferencesPage&), MultiMonitor_constructPreferences>() );
+       PreferencesDialog_addInterfacePreferences( makeCallbackF(MultiMonitor_constructPreferences) );
 }
+
 void MultiMon_Destroy(){
 }