Callback: remove fixed-arity wrappers

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

diff --git a/radiant/groupdialog.cpp b/radiant/groupdialog.cpp
index 7e7b3285e3dd35188c0d25c7d12604cedb043b90..f175bc514c4cba810d0925829d2150cca3196015 100644 (file)
--- a/radiant/groupdialog.cpp
+++ b/radiant/groupdialog.cpp
@@ -27,10 +27,12 @@
 //
 
 #include "groupdialog.h"
+#include "globaldefs.h"
 
 #include "debugging/debugging.h"
 
 #include <vector>
+#include <gtk/gtk.h>
 
 #include "gtkutil/widget.h"
 #include "gtkutil/accelerator.h"
@@ -46,8 +48,8 @@
 class GroupDlg
 {
 public:
-ui::Widget m_pNotebook;
-ui::Window m_window;
+ui::Widget m_pNotebook{ui::null};
+ui::Window m_window{ui::null};
 
 GroupDlg();
 void Create( ui::Window parent );
@@ -55,10 +57,10 @@ void Create( ui::Window parent );
 void Show(){
        // workaround for strange gtk behaviour - modifying the contents of a window while it is not visible causes the window position to change without sending a configure_event
        m_position_tracker.sync( m_window );
-       gtk_widget_show( GTK_WIDGET( m_window ) );
+       m_window.show();
 }
 void Hide(){
-       gtk_widget_hide( GTK_WIDGET( m_window ) );
+       m_window.hide();
 }
 
 WindowPositionTracker m_position_tracker;
@@ -74,12 +76,12 @@ std::vector<StringExportCallback> g_pages;
 
 void GroupDialog_updatePageTitle( ui::Window window, std::size_t pageIndex ){
        if ( pageIndex < g_pages.size() ) {
-               g_pages[pageIndex]( PointerCaller1<GtkWindow, const char*, gtk_window_set_title>( window ) );
+               g_pages[pageIndex]( PointerCaller<GtkWindow, void(const char*), gtk_window_set_title>( window ) );
        }
 }
 
 static gboolean switch_page( GtkNotebook *notebook, gpointer page, guint page_num, gpointer data ){
-       GroupDialog_updatePageTitle( ui::Window(GTK_WINDOW( data )), page_num );
+       GroupDialog_updatePageTitle( ui::Window::from(data), page_num );
        g_current_page = page_num;
 
        return FALSE;
@@ -92,7 +94,7 @@ GroupDlg::GroupDlg() : m_window( 0 ){
 void GroupDlg::Create( ui::Window parent ){
        ASSERT_MESSAGE( !m_window, "dialog already created" );
 
-       ui::Window window = ui::Window(create_persistent_floating_window( "Entities", parent ));
+       auto window = ui::Window(create_persistent_floating_window( "Entities", parent ));
 
        global_accel_connect_window( window );
 
@@ -100,7 +102,7 @@ void GroupDlg::Create( ui::Window parent ){
 
        m_window = window;
 
-#ifdef WIN32
+#if GDEF_OS_WINDOWS
        if ( g_multimon_globals.m_bStartOnPrimMon ) {
                WindowPosition pos( m_position_tracker.getPosition() );
                PositionWindowOnPrimaryScreen( pos );
@@ -111,19 +113,19 @@ void GroupDlg::Create( ui::Window parent ){
 
        {
                ui::Widget notebook = ui::Widget(gtk_notebook_new());
-               gtk_widget_show( notebook );
-               gtk_container_add( GTK_CONTAINER( window ), notebook );
+               notebook.show();
+               window.add(notebook);
                gtk_notebook_set_tab_pos( GTK_NOTEBOOK( notebook ), GTK_POS_BOTTOM );
                m_pNotebook = notebook;
 
-               g_signal_connect( G_OBJECT(notebook), "switch_page", G_CALLBACK( switch_page ), (gpointer) window );
+               notebook.connect( "switch_page", G_CALLBACK( switch_page ), (gpointer) window );
        }
 }
 
 
 ui::Widget GroupDialog_addPage( const char* tabLabel, ui::Widget widget, const StringExportCallback& title ){
        ui::Widget w = ui::Label( tabLabel );
-       gtk_widget_show( w );
+       w.show();
        ui::Widget page = ui::Widget(gtk_notebook_get_nth_page( GTK_NOTEBOOK( g_GroupDlg.m_pNotebook ), gtk_notebook_insert_page( GTK_NOTEBOOK( g_GroupDlg.m_pNotebook ), widget, w, -1 ) ));
        g_pages.push_back( title );
 
@@ -132,7 +134,7 @@ ui::Widget GroupDialog_addPage( const char* tabLabel, ui::Widget widget, const S
 
 
 bool GroupDialog_isShown(){
-       return widget_is_visible( g_GroupDlg.m_window );
+       return g_GroupDlg.m_window.visible();
 }
 void GroupDialog_setShown( bool shown ){
        shown ? g_GroupDlg.Show() : g_GroupDlg.Hide();
@@ -147,7 +149,7 @@ void GroupDialog_constructWindow( ui::Window main_window ){
 void GroupDialog_destroyWindow(){
        ASSERT_TRUE( g_GroupDlg.m_window );
        destroy_floating_window( g_GroupDlg.m_window );
-       g_GroupDlg.m_window = ui::Window();
+       g_GroupDlg.m_window = ui::Window{ui::null};
 }
 
 
@@ -173,7 +175,7 @@ void GroupDialog_showPage( ui::Widget page ){
        }
        else
        {
-               gtk_widget_show( GTK_WIDGET( g_GroupDlg.m_window ) );
+               g_GroupDlg.m_window.show();
                GroupDialog_setPage( page );
        }
 }
@@ -195,7 +197,7 @@ void GroupDialog_updatePageTitle( ui::Widget page ){
 void GroupDialog_Construct(){
        GlobalPreferenceSystem().registerPreference( "EntityWnd", WindowPositionTrackerImportStringCaller( g_GroupDlg.m_position_tracker ), WindowPositionTrackerExportStringCaller( g_GroupDlg.m_position_tracker ) );
 
-       GlobalCommands_insert( "ViewEntityInfo", FreeCaller<GroupDialog_ToggleShow>(), Accelerator( 'N' ) );
+       GlobalCommands_insert( "ViewEntityInfo", FreeCaller<void(), GroupDialog_ToggleShow>(), Accelerator( 'N' ) );
 }
 void GroupDialog_Destroy(){
 }