X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fnetradiant.git;a=blobdiff_plain;f=radiant%2Fmainframe.h;h=cb5274f36159490004805a7ca557d5e972f69fd1;hp=c450fd549ca50a9231b9bf0e8d49c8b7ffcd1341;hb=c52a4bd4da209e657018e8d799dcb488cd848e4c;hpb=d347e813d359c2c4c9fc72aaa25aec2e078a8390 diff --git a/radiant/mainframe.h b/radiant/mainframe.h index c450fd54..cb5274f3 100644 --- a/radiant/mainframe.h +++ b/radiant/mainframe.h @@ -22,6 +22,7 @@ #if !defined( INCLUDED_MAINFRAME_H ) #define INCLUDED_MAINFRAME_H +#include #include "gtkutil/window.h" #include "gtkutil/idledraw.h" #include "gtkutil/widget.h" @@ -60,7 +61,7 @@ enum EViewStyle MainFrame(); ~MainFrame(); -GtkWindow* m_window; +ui::Window m_window; CopiedString m_command_status; CopiedString m_position_status; @@ -73,9 +74,9 @@ void Create(); void SaveWindowInfo(); void Shutdown(); -GtkWidget* m_vSplit; -GtkWidget* m_hSplit; -GtkWidget* m_vSplit2; +ui::Widget m_vSplit; +ui::Widget m_hSplit; +ui::Widget m_vSplit2; XYWnd* m_pXYWnd; XYWnd* m_pYZWnd; @@ -86,7 +87,7 @@ XYWnd* m_pActiveXY; bool m_bSleeping; -GtkWidget *m_pStatusLabel[c_count_status]; +ui::Widget m_pStatusLabel[c_count_status]; EViewStyle m_nCurrentStyle; @@ -142,7 +143,7 @@ bool FloatingGroupDialog(){ extern MainFrame* g_pParentWnd; -GtkWindow* MainFrame_getWindow(); +ui::Window MainFrame_getWindow(); enum EMouseButtonMode { @@ -271,6 +272,6 @@ void XYWindowDestroyed_disconnect( SignalHandlerId id ); MouseEventHandlerId XYWindowMouseDown_connect( const MouseEventHandler& handler ); void XYWindowMouseDown_disconnect( MouseEventHandlerId id ); -extern GtkWidget* g_page_entity; +extern ui::Widget g_page_entity; #endif