Group import/export callbacks

[xonotic/netradiant.git] / radiant / mainframe.h

diff --git a/radiant/mainframe.h b/radiant/mainframe.h
index cb5274f36159490004805a7ca557d5e972f69fd1..944c7b8bbceb513001396163566b3ccf6075fee2 100644 (file)
--- a/radiant/mainframe.h
+++ b/radiant/mainframe.h
@@ -37,8 +37,6 @@ class XYWnd;
 class CamWnd;
 class ZWnd;
 
-typedef struct _GtkWidget GtkWidget;
-typedef struct _GtkWindow GtkWindow;
 
 const int c_command_status = 0;
 const int c_position_status = 1;
@@ -61,7 +59,7 @@ enum EViewStyle
 MainFrame();
 ~MainFrame();
 
-ui::Window m_window;
+ui::Window m_window{ui::null};
 
 CopiedString m_command_status;
 CopiedString m_position_status;
@@ -74,9 +72,9 @@ void Create();
 void SaveWindowInfo();
 void Shutdown();
 
-ui::Widget m_vSplit;
-ui::Widget m_hSplit;
-ui::Widget m_vSplit2;
+ui::Widget m_vSplit{ui::null};
+ui::Widget m_hSplit{ui::null};
+ui::Widget m_vSplit2{ui::null};
 
 XYWnd* m_pXYWnd;
 XYWnd* m_pYZWnd;
@@ -87,7 +85,7 @@ XYWnd* m_pActiveXY;
 
 bool m_bSleeping;
 
-ui::Widget m_pStatusLabel[c_count_status];
+void *m_pStatusLabel[c_count_status];
 
 
 EViewStyle m_nCurrentStyle;
@@ -105,10 +103,10 @@ void OnSleep();
 void SetStatusText( CopiedString& status_text, const char* pText );
 void UpdateStatusText();
 void RedrawStatusText();
-typedef MemberCaller<MainFrame, &MainFrame::RedrawStatusText> RedrawStatusTextCaller;
+typedef MemberCaller<MainFrame, void(), &MainFrame::RedrawStatusText> RedrawStatusTextCaller;
 
 void SetGridStatus();
-typedef MemberCaller<MainFrame, &MainFrame::SetGridStatus> SetGridStatusCaller;
+typedef MemberCaller<MainFrame, void(), &MainFrame::SetGridStatus> SetGridStatusCaller;
 
 void SetActiveXY( XYWnd* p );
 XYWnd* ActiveXY(){
@@ -166,8 +164,7 @@ void GLWindow_Destroy();
 extern glwindow_globals_t g_glwindow_globals;
 template<typename Value>
 class LatchedValue;
-typedef LatchedValue<bool> LatchedBool;
-extern LatchedBool g_Layout_enableDetachableMenus;
+extern LatchedValue<bool> g_Layout_enableDetachableMenus;
 
 void deleteSelection();