X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fnetradiant.git;a=blobdiff_plain;f=radiant%2Fmultimon.cpp;h=869bc1d86690b28c1eb9d723fe0a9d8cdefaa6ab;hp=04407591778e78f36bab95aa356dde4d8ffb26e9;hb=e553b29962caee1b43b28b5bae55b214e4316e1d;hpb=7fc621fc78d0e040dc2c12f38dc53dd9048215dc

diff --git a/radiant/multimon.cpp b/radiant/multimon.cpp
index 04407591..869bc1d8 100644
--- 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 )
+		make_property( 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(){
 }