Callback: remove fixed-arity wrappers

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

diff --git a/radiant/autosave.cpp b/radiant/autosave.cpp
index fe42687cc640d12bb2e877cea69c4f669074407e..5cb91ea84113d2b27ab9b70c8a827d8421de48d4 100644 (file)
--- a/radiant/autosave.cpp
+++ b/radiant/autosave.cpp
@@ -19,7 +19,9 @@
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include <uilib/uilib.h>
 #include "autosave.h"
+#include "globaldefs.h"
 
 #include "os/file.h"
 #include "os/path.h"
@@ -35,7 +37,7 @@
 #include "preferences.h"
 
 
-#if defined( WIN32 )
+#if GDEF_OS_WINDOWS
 #define PATH_MAX 260
 #endif
 
@@ -91,7 +93,7 @@ void Map_Snapshot(){
        {
                StringOutputStream strMsg( 256 );
                strMsg << "Snapshot save failed.. unabled to create directory\n" << snapshotsDir.c_str();
-               gtk_MessageBox( GTK_WIDGET( MainFrame_getWindow() ), strMsg.c_str() );
+               MainFrame_getWindow().alert( strMsg.c_str() );
        }
 }
 /*
@@ -174,8 +176,8 @@ void QE_CheckAutoSave( void ){
 }
 
 void Autosave_constructPreferences( PreferencesPage& page ){
-       GtkWidget* autosave_enabled = page.appendCheckBox( "Autosave", "Enable Autosave", g_AutoSave_Enabled );
-       GtkWidget* autosave_frequency = page.appendSpinner( "Autosave Frequency (minutes)", m_AutoSave_Frequency, 1, 1, 60 );
+       ui::CheckButton autosave_enabled = page.appendCheckBox( "Autosave", "Enable Autosave", g_AutoSave_Enabled );
+       ui::SpinButton autosave_frequency = page.appendSpinner( "Autosave Frequency (minutes)", m_AutoSave_Frequency, 1, 1, 60 );
        Widget_connectToggleDependency( autosave_frequency, autosave_enabled );
        page.appendCheckBox( "", "Save Snapshots", g_SnapShots_Enabled );
 }
@@ -184,7 +186,7 @@ void Autosave_constructPage( PreferenceGroup& group ){
        Autosave_constructPreferences( page );
 }
 void Autosave_registerPreferencesPage(){
-       PreferencesDialog_addSettingsPage( FreeCaller1<PreferenceGroup&, Autosave_constructPage>() );
+       PreferencesDialog_addSettingsPage( FreeCaller<void(PreferenceGroup&), Autosave_constructPage>() );
 }