X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=radiant%2Fgtkmisc.h;h=0379797781c3cc1cf9287f27d0781b9f07e67b82;hb=9dfae1c9b270ee369c6362903a9205b30751b95f;hp=867aaccb4f295d98a0eb5dbb0c4de0169736c752;hpb=c52a4bd4da209e657018e8d799dcb488cd848e4c;p=xonotic%2Fnetradiant.git

diff --git a/radiant/gtkmisc.h b/radiant/gtkmisc.h
index 867aaccb..03797977 100644
--- a/radiant/gtkmisc.h
+++ b/radiant/gtkmisc.h
@@ -31,46 +31,41 @@
 #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_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 );
+void command_disconnect_accelerator(const char *commandName);
 
-typedef struct _GtkMenu GtkMenu;
-typedef struct _GtkMenuItem GtkMenuItem;
-typedef struct _GtkCheckMenuItem GtkCheckMenuItem;
+void toggle_add_accelerator(const char *commandName);
+
+void toggle_remove_accelerator(const char *name);
 
 // this also sets up the shortcut using command_connect_accelerator
-GtkMenuItem* create_menu_item_with_mnemonic( GtkMenu *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( GtkMenu* 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;
+template<typename Element>
+class BasicVector3;
+
 typedef BasicVector3<float> Vector3;
-bool color_dialog( ui::Widget 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 );
+bool color_dialog(ui::Window parent, Vector3 &color, const char *title = "Choose Color");
+
+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