Merge commit '89c4e25e26ba634d5911fd596597387876f2e636' into garux-merge

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

diff --git a/radiant/multimon.cpp b/radiant/multimon.cpp
index 33ae89f128c3508647389a45b0ebd21adee31b36..abde2ec234331ffe331d6b4b3b3c96248530bbd0 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 ){
-       GtkWidget* primary_monitor = page.appendCheckBox( "Multi Monitor", "Start on Primary Monitor", g_multimon_globals.m_bStartOnPrimMon );
-//     GtkWidget* popup = page.appendCheckBox(
+       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 )
+//             mkImportExportCallback( g_Multimon_enableSysMenuPopups )
 //             );
 //     Widget_connectToggleDependency( popup, primary_monitor );
 }
@@ -44,7 +43,7 @@ void MultiMonitor_constructPreferences( PreferencesPage& page ){
 #include "preferencesystem.h"
 #include "stringio.h"
 
-#include <gdk/gdkdisplay.h>
+#include <gdk/gdk.h>
 
 namespace
 {
@@ -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( FreeCaller1<PreferencesPage&, MultiMonitor_constructPreferences>() );
+       PreferencesDialog_addInterfacePreferences( makeCallbackF(MultiMonitor_constructPreferences) );
 }
+
 void MultiMon_Destroy(){
 }