Merge commit '19c67e1114f894604c3346fe1af9b015184328be' into master-merge

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

diff --git a/radiant/mainframe.h b/radiant/mainframe.h
index 85e60f47eb6ba671cc61c10c75d90c276b2df0c2..c5a53efd445510fdeafe6d578dfd84001eb3e16c 100644 (file)
--- a/radiant/mainframe.h
+++ b/radiant/mainframe.h
@@ -54,6 +54,7 @@ enum EViewStyle
        eFloating = 1,
        eSplit = 2,
        eRegularLeft = 3,
+       eSingle = 4,
 };
 
 MainFrame();
@@ -72,10 +73,13 @@ void Create();
 void SaveWindowInfo();
 void Shutdown();
 
+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;
 XYWnd* m_pXZWnd;
@@ -142,7 +146,7 @@ bool FloatingGroupDialog(){
 extern MainFrame* g_pParentWnd;
 
 ui::Window MainFrame_getWindow();
-
+/*
 enum EMouseButtonMode
 {
        ETwoButton = 0,
@@ -157,11 +161,11 @@ 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;
 extern LatchedValue<bool> g_Layout_enableDetachableMenus;
@@ -212,8 +216,15 @@ 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();
@@ -237,6 +248,7 @@ void UpdateAllWindows();
 
 
 void ClipperChangeNotify();
+void ClipperMode();
 
 void DefaultMode();
 
@@ -264,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 )();