Callback: remove fixed-arity wrappers

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

diff --git a/radiant/multimon.cpp b/radiant/multimon.cpp
index 04407591778e78f36bab95aa356dde4d8ffb26e9..91385739239e7df3c7aa6d158c34a447c85ed5fc 100644 (file)
--- a/radiant/multimon.cpp
+++ b/radiant/multimon.cpp
@@ -32,8 +32,8 @@ multimon_globals_t g_multimon_globals;
 LatchedBool 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 )
@@ -44,7 +44,7 @@ void MultiMonitor_constructPreferences( PreferencesPage& page ){
 #include "preferencesystem.h"
 #include "stringio.h"
 
-#include <gdk/gdkdisplay.h>
+#include <gdk/gdk.h>
 
 namespace
 {
@@ -92,7 +92,7 @@ void MultiMon_Construct(){
 
        g_Multimon_enableSysMenuPopups.useLatched();
 
-       PreferencesDialog_addInterfacePreferences( FreeCaller1<PreferencesPage&, MultiMonitor_constructPreferences>() );
+       PreferencesDialog_addInterfacePreferences( FreeCaller<void(PreferencesPage&), MultiMonitor_constructPreferences>() );
 }
 void MultiMon_Destroy(){
 }