clang: fix build. Still doesn't work right

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

diff --git a/radiant/gtkmisc.h b/radiant/gtkmisc.h
index d0a0e7fdc0a757e8ea1714679c4413277337fad2..0379797781c3cc1cf9287f27d0781b9f07e67b82 100644 (file)
--- a/radiant/gtkmisc.h
+++ b/radiant/gtkmisc.h
@@ -28,71 +28,44 @@
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _GTK_MISC_H_
-#define _GTK_MISC_H_
+#if !defined( INCLUDED_GTKMISC_H )
+#define INCLUDED_GTKMISC_H
 
-#ifdef _WIN32
+#include <uilib/uilib.h>
 
-void win32_get_window_pos( GtkWidget *widget, gint *x, gint *y );
+void command_connect_accelerator(const char *commandName);
 
-inline void get_window_pos( GtkWidget *wnd, int* x, int* y ){
-       win32_get_window_pos( wnd, x, y );
-}
+void command_disconnect_accelerator(const char *commandName);
 
-#else
+void toggle_add_accelerator(const char *commandName);
 
-inline void get_window_pos( GtkWidget *wnd, int* x, int* y ){
-       gdk_window_get_root_origin( wnd->window, x, y );
-}
+void toggle_remove_accelerator(const char *name);
 
-#endif
+// this also sets up the shortcut using command_connect_accelerator
+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
+ui::CheckMenuItem create_check_menu_item_with_mnemonic(ui::Menu menu, const char *mnemonic, const char *commandName);
 
-struct window_position_t
-{
-       int x, y, w, h;
-};
 
-void save_window_pos( GtkWidget *wnd, window_position_t& pos );
-void load_window_pos( GtkWidget *wnd, window_position_t& pos );
-gint widget_delete_hide( GtkWidget *widget );
+// this DOES NOT set up the shortcut using command_connect_accelerator
+ui::ToolButton
+toolbar_append_button(ui::Toolbar toolbar, const char *description, const char *icon, const char *commandName);
 
-// GdkPixmap **gdkpixmap, GdkBitmap **mask
-bool WINAPI load_plugin_bitmap( const char* filename, void **gdkpixmap, void **mask );
-void load_pixmap( const char* filename, GtkWidget* widget, GdkPixmap **gdkpixmap, GdkBitmap **mask );
-GtkWidget* new_pixmap( GtkWidget* widget, const char* filename );
+// this DOES NOT set up the shortcut using command_connect_accelerator
+ui::ToggleToolButton
+toolbar_append_toggle_button(ui::Toolbar toolbar, const char *description, const char *icon, const char *commandName);
 
-GtkWidget* menu_separator( GtkWidget *menu );
-GtkWidget* menu_tearoff( GtkWidget *menu );
-GtkWidget* create_sub_menu_with_mnemonic( GtkWidget *bar, const gchar *mnemonic );
-GtkWidget* create_menu_item_with_mnemonic( GtkWidget *menu, const gchar *mnemonic, GtkSignalFunc func, int id );
-GtkWidget* create_check_menu_item_with_mnemonic( GtkWidget *menu, const gchar *mnemonic, GtkSignalFunc func, int id, gboolean active );
-GtkWidget* create_radio_menu_item_with_mnemonic( GtkWidget *menu, GtkWidget *last, const gchar *mnemonic, GtkSignalFunc func, int id, gboolean state );
-GtkWidget* create_menu_in_menu_with_mnemonic( GtkWidget *menu, const gchar *mnemonic );
 
+template<typename Element>
+class BasicVector3;
 
-/*!
-   \fn gtk_MessageBox
-   do various message boxes, IDOK .. IDNO
-   URL adds an optional 'go to URL' button
- */
-int WINAPI gtk_MessageBox( void *parent, const char* lpText, const char* lpCaption = "Radiant", guint32 uType = MB_OK, const char* URL = NULL );
-// NOTE: the returned filename is allocated with g_malloc and MUST be freed with g_free (both for win32 and Gtk dialogs)
-// GtkWidget *parent
-const gchar* file_dialog( void *parent, gboolean open, const char* title, const char* path = (char*)NULL, const char* pattern = NULL, const char *baseSubDir = NULL );
+typedef BasicVector3<float> Vector3;
 
-/*!
-   \fn dir_dialog, prompts for a directory
- */
-char* WINAPI dir_dialog( void *parent, const char* title = "Choose Directory", const char* path = (char*)NULL );
-// GtkWidget *parent
-bool WINAPI color_dialog( void *parent, float *color, const char* title = "Choose Color" );
+bool color_dialog(ui::Window parent, Vector3 &color, const char *title = "Choose Color");
 
-void dialog_button_callback( GtkWidget *widget, gpointer data );
-gint dialog_delete_callback( GtkWidget *widget, GdkEvent* event, gpointer data );
+void button_clicked_entry_browse_file(ui::Widget widget, ui::Entry entry);
 
-void OpenURL( const char *url );
+void button_clicked_entry_browse_directory(ui::Widget widget, ui::Entry entry);
 
-void CheckMenuSplitting( GtkWidget *&menu );
-
-#endif // _GTK_MISC_H_
+#endif