X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=radiant%2Fgroupdialog.cpp;h=f175bc514c4cba810d0925829d2150cca3196015;hb=18d60f90d7603cb420150739251cf98519c57406;hp=6559da1988a8ffdae162b42ed2ba20e3365a4571;hpb=225950494a606af9aac2bc2f06ece70cb2146481;p=xonotic%2Fnetradiant.git

diff --git a/radiant/groupdialog.cpp b/radiant/groupdialog.cpp
index 6559da19..f175bc51 100644
--- 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 );
@@ -58,7 +60,7 @@ void Show(){
 	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;
@@ -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 );
@@ -116,7 +118,7 @@ void GroupDlg::Create( ui::Window parent ){
 		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 );
 	}
 }
 
@@ -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};
 }
 
 
@@ -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(){
 }