X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=radiant%2Fgtkmisc.h;h=e867d6a213b6611a38836666e246758725cb7231;hb=f6faf961e8151ae67bd5d8f2e65b337d61ef0bf9;hp=3bdfff7a97db4dfbce3e5a275777505f0a77c7a0;hpb=04fe1ceba51db67b2b1743e383f146ea8d31a07e;p=xonotic%2Fnetradiant.git

diff --git a/radiant/gtkmisc.h b/radiant/gtkmisc.h
index 3bdfff7a..e867d6a2 100644
--- a/radiant/gtkmisc.h
+++ b/radiant/gtkmisc.h
@@ -31,46 +31,30 @@
 #if !defined( INCLUDED_GTKMISC_H )
 #define INCLUDED_GTKMISC_H
 
-#include <gtk/gtk.h>
 #include <uilib/uilib.h>
 
-inline void process_gui(){
-	while ( gtk_events_pending() )
-	{
-		gtk_main_iteration();
-	}
-}
-
 void command_connect_accelerator( const char* commandName );
 void command_disconnect_accelerator( const char* commandName );
 void toggle_add_accelerator( const char* commandName );
 void toggle_remove_accelerator( const char* name );
 
-typedef struct _GtkMenu GtkMenu;
-typedef struct _GtkMenuItem GtkMenuItem;
-typedef struct _GtkCheckMenuItem GtkCheckMenuItem;
-
 // this also sets up the shortcut using command_connect_accelerator
-GtkMenuItem* create_menu_item_with_mnemonic( ui::Menu menu, const char *mnemonic, const char* commandName );
+ui::MenuItem create_menu_item_with_mnemonic( ui::Menu menu, const char *mnemonic, const char* commandName );
 // this also sets up the shortcut using command_connect_accelerator
-GtkCheckMenuItem* create_check_menu_item_with_mnemonic( ui::Menu menu, const char* mnemonic, const char* commandName );
+ui::CheckMenuItem create_check_menu_item_with_mnemonic( ui::Menu menu, const char* mnemonic, const char* commandName );
 
-typedef struct _GtkButton GtkButton;
-typedef struct _GtkToggleButton GtkToggleButton;
-typedef struct _GtkToolbar GtkToolbar;
 
 // this DOES NOT set up the shortcut using command_connect_accelerator
-GtkToolButton* toolbar_append_button( GtkToolbar* toolbar, const char* description, const char* icon, const char* commandName );
+ui::ToolButton toolbar_append_button( ui::Toolbar toolbar, const char* description, const char* icon, const char* commandName );
 // this DOES NOT set up the shortcut using command_connect_accelerator
-GtkToggleToolButton* toolbar_append_toggle_button( GtkToolbar* toolbar, const char* description, const char* icon, const char* commandName );
+ui::ToggleToolButton toolbar_append_toggle_button( ui::Toolbar toolbar, const char* description, const char* icon, const char* commandName );
 
 
 template<typename Element> class BasicVector3;
 typedef BasicVector3<float> Vector3;
-bool color_dialog( ui::Widget parent, Vector3& color, const char* title = "Choose Color" );
+bool color_dialog( ui::Window parent, Vector3& color, const char* title = "Choose Color" );
 
-typedef struct _GtkEntry GtkEntry;
-void button_clicked_entry_browse_file( ui::Widget widget, GtkEntry* entry );
-void button_clicked_entry_browse_directory( ui::Widget widget, GtkEntry* entry );
+void button_clicked_entry_browse_file( ui::Widget widget, ui::Entry entry );
+void button_clicked_entry_browse_directory( ui::Widget widget, ui::Entry entry );
 
 #endif