Merge branch 'master' into master-merge

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

diff --git a/radiant/mainframe.h b/radiant/mainframe.h
index ee7368b1396e47bcb33bbd029d88a4240df22f92..cb5068efbd430d823e9cc736b28519a5b26f0d29 100644 (file)
--- a/radiant/mainframe.h
+++ b/radiant/mainframe.h
@@ -73,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;
@@ -143,7 +146,7 @@ bool FloatingGroupDialog(){
 extern MainFrame* g_pParentWnd;
 
 ui::Window MainFrame_getWindow();
-
+/*
 enum EMouseButtonMode
 {
        ETwoButton = 0,
@@ -158,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;
@@ -245,6 +248,7 @@ void UpdateAllWindows();
 
 
 void ClipperChangeNotify();
+void ClipperMode();
 
 void DefaultMode();
 
@@ -288,4 +292,6 @@ void XYWindowMouseDown_disconnect( MouseEventHandlerId id );
 
 extern ui::Widget g_page_entity;
 
+void FocusAllViews();
+
 #endif