X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fnetradiant.git;a=blobdiff_plain;f=radiant%2Fgroupdialog.cpp;h=261d625b5d79ace378487b5ca8e37b41313ad7f3;hp=2158f59a5a3b3a7b15feaacd8f246c89b30f9328;hb=6e9818d9cddf3880d001a544770c8c2c5187676f;hpb=8505e24b7f9831e0c01860ed50b835aae4e856a2

diff --git a/radiant/groupdialog.cpp b/radiant/groupdialog.cpp
index 2158f59a..261d625b 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;
@@ -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();