diff -r 909fe96e5659 -r 102fc0b8fe3e ui/ui/toolkit.h --- a/ui/ui/toolkit.h Sun Jan 24 22:20:47 2016 +0100 +++ b/ui/ui/toolkit.h Mon Jan 25 16:36:31 2016 +0100 @@ -42,24 +42,30 @@ #include #define UIWIDGET GtkWidget* +#define UIMENU GtkMenu* #define UI_GTK #elif UI_MOTIF #include #define UIWIDGET Widget +#define UIMENU Widget #elif defined(UI_QT4) || defined(UI_QT5) #ifdef __cplusplus #include #include +#include #define UIWIDGET QWidget* +#define UIMENU QMenu* #else /* __cplusplus */ #define UIWIDGET void* +#define UIMENU void* #endif #elif UI_WPF #define UIWIDGET void* +#define UIMENU void* #endif #ifndef TRUE @@ -344,9 +350,6 @@ void ui_add_image(char *imgname, char *filename); -// common widget functions -void ui_mouse_handler(UiObject *obj, UIWIDGET widget, ui_callback f, void *u); - // label widgets UIWIDGET ui_label(UiObject *obj, char *label); UIWIDGET ui_llabel(UiObject *obj, char *label);