Wrap GTK

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

diff --git a/radiant/mainframe.h b/radiant/mainframe.h
index c450fd549ca50a9231b9bf0e8d49c8b7ffcd1341..cb5274f36159490004805a7ca557d5e972f69fd1 100644 (file)
--- a/radiant/mainframe.h
+++ b/radiant/mainframe.h
@@ -22,6 +22,7 @@
 #if !defined( INCLUDED_MAINFRAME_H )
 #define INCLUDED_MAINFRAME_H
 
 #if !defined( INCLUDED_MAINFRAME_H )
 #define INCLUDED_MAINFRAME_H
 

+#include <uilib/uilib.h>

 #include "gtkutil/window.h"
 #include "gtkutil/idledraw.h"
 #include "gtkutil/widget.h"
 #include "gtkutil/window.h"
 #include "gtkutil/idledraw.h"
 #include "gtkutil/widget.h"


@@ -60,7 +61,7 @@ enum EViewStyle
 MainFrame();
 ~MainFrame();
 
 MainFrame();
 ~MainFrame();
 

-GtkWindow* m_window;
+ui::Window m_window;

 
 CopiedString m_command_status;
 CopiedString m_position_status;
 
 CopiedString m_command_status;
 CopiedString m_position_status;


@@ -73,9 +74,9 @@ void Create();
 void SaveWindowInfo();
 void Shutdown();
 
 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;
 
 XYWnd* m_pXYWnd;
 XYWnd* m_pYZWnd;


@@ -86,7 +87,7 @@ XYWnd* m_pActiveXY;
 
 bool m_bSleeping;
 
 
 bool m_bSleeping;
 

-GtkWidget *m_pStatusLabel[c_count_status];
+ui::Widget m_pStatusLabel[c_count_status];

 
 
 EViewStyle m_nCurrentStyle;
 
 
 EViewStyle m_nCurrentStyle;


@@ -142,7 +143,7 @@ bool FloatingGroupDialog(){
 
 extern MainFrame* g_pParentWnd;
 
 
 extern MainFrame* g_pParentWnd;
 

-GtkWindow* MainFrame_getWindow();
+ui::Window MainFrame_getWindow();

 
 enum EMouseButtonMode
 {
 
 enum EMouseButtonMode
 {


@@ -271,6 +272,6 @@ void XYWindowDestroyed_disconnect( SignalHandlerId id );
 MouseEventHandlerId XYWindowMouseDown_connect( const MouseEventHandler& handler );
 void XYWindowMouseDown_disconnect( MouseEventHandlerId id );
 
 MouseEventHandlerId XYWindowMouseDown_connect( const MouseEventHandler& handler );
 void XYWindowMouseDown_disconnect( MouseEventHandlerId id );
 

-extern GtkWidget* g_page_entity;
+extern ui::Widget g_page_entity;

 
 #endif
 
 #endif