radiant: less deprecated GTK2 stuff, they are even not supported in GTK3

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

diff --git a/radiant/mainframe.h b/radiant/mainframe.h
index 27d09c0194e784cdfb4e99616e53f3007d1da643..cb5068efbd430d823e9cc736b28519a5b26f0d29 100644 (file)
--- a/radiant/mainframe.h
+++ b/radiant/mainframe.h
@@ -54,12 +54,13 @@ enum EViewStyle
        eFloating = 1,
        eSplit = 2,
        eRegularLeft = 3,
+       eSingle = 4,
 };
 
 MainFrame();
 ~MainFrame();
 
-ui::Window m_window;
+ui::Window m_window{ui::null};
 
 CopiedString m_command_status;
 CopiedString m_position_status;
@@ -72,9 +73,12 @@ void Create();
 void SaveWindowInfo();
 void Shutdown();
 
-ui::Widget m_vSplit;
-ui::Widget m_hSplit;
-ui::Widget m_vSplit2;
+public:
+ui::Widget m_vSplit{ui::null};
+ui::Widget m_hSplit{ui::null};
+ui::Widget m_vSplit2{ui::null};
+
+private:
 
 XYWnd* m_pXYWnd;
 XYWnd* m_pYZWnd;
@@ -85,7 +89,7 @@ XYWnd* m_pActiveXY;
 
 bool m_bSleeping;
 
-ui::Widget m_pStatusLabel[c_count_status];
+void *m_pStatusLabel[c_count_status];
 
 
 EViewStyle m_nCurrentStyle;
@@ -103,10 +107,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(){
@@ -142,7 +146,7 @@ bool FloatingGroupDialog(){
 extern MainFrame* g_pParentWnd;
 
 ui::Window MainFrame_getWindow();
-
+/*
 enum EMouseButtonMode
 {
        ETwoButton = 0,
@@ -157,15 +161,14 @@ struct glwindow_globals_t
                m_nMouseType( EThreeButton ){
        }
 };
-
+*/
 void GLWindow_Construct();
 void GLWindow_Destroy();
 
-extern glwindow_globals_t g_glwindow_globals;
+//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();
 
@@ -206,8 +209,22 @@ void EnginePath_verify();
 const char* EnginePath_get();
 const char* QERApp_GetGamePath();
 
+extern bool g_disableEnginePath;
+extern bool g_disableHomePath;
+
+const int g_pakPathCount = 5;
+extern CopiedString g_strPakPath[g_pakPathCount];
+const char* PakPath_get( int num );
+
+extern CopiedString g_strAppFilePath;
 extern CopiedString g_strAppPath;
+extern CopiedString g_strLibPath;
+extern CopiedString g_strDataPath;
+
+const char* AppFilePath_get();
 const char* AppPath_get();
+const char *LibPath_get();
+const char *DataPath_get();
 
 extern CopiedString g_strSettingsPath;
 const char* SettingsPath_get();
@@ -231,6 +248,7 @@ void UpdateAllWindows();
 
 
 void ClipperChangeNotify();
+void ClipperMode();
 
 void DefaultMode();
 
@@ -258,6 +276,8 @@ void Radiant_detachHomePathsObserver( ModuleObserver& observer );
 void MainFrame_Construct();
 void MainFrame_Destroy();
 
+extern char **environ;
+void Radiant_Restart();
 
 extern float ( *GridStatus_getGridSize )();
 extern int ( *GridStatus_getRotateIncrement )();
@@ -272,4 +292,6 @@ void XYWindowMouseDown_disconnect( MouseEventHandlerId id );
 
 extern ui::Widget g_page_entity;
 
+void FocusAllViews();
+
 #endif