comparison: ui/gtk/toolbar.h
ui/gtk/toolbar.h
- branch
- newapi
- changeset 275
- 132c7bcc6997
- parent 176
- bc63cb601f6d
- child 276
- 376921880a7f
equal
deleted
inserted
replaced
| 274:9e2aee097b69 | 275:132c7bcc6997 |
|---|---|
| 28 | 28 |
| 29 #ifndef TOOLBAR_H | 29 #ifndef TOOLBAR_H |
| 30 #define TOOLBAR_H | 30 #define TOOLBAR_H |
| 31 | 31 |
| 32 #include "../ui/toolbar.h" | 32 #include "../ui/toolbar.h" |
| 33 #include "../common/toolbar.h" | |
| 33 #include <cx/map.h> | 34 #include <cx/map.h> |
| 34 #include <cx/list.h> | 35 #include <cx/list.h> |
| 35 | 36 |
| 36 #include "model.h" | |
| 37 #include "tree.h" | 37 #include "tree.h" |
| 38 | 38 |
| 39 #ifdef __cplusplus | 39 #ifdef __cplusplus |
| 40 extern "C" { | 40 extern "C" { |
| 41 #endif | 41 #endif |
| 100 ui_getvaluefunc getvalue; | 100 ui_getvaluefunc getvalue; |
| 101 ui_callback callback; | 101 ui_callback callback; |
| 102 void *userdata; | 102 void *userdata; |
| 103 }; | 103 }; |
| 104 | 104 |
| 105 void ui_toolbar_init(); | |
| 106 | 105 |
| 107 void ui_toolitem_vstgr( | 106 void ui_toolitem_vstgr( |
| 108 char *name, | 107 char *name, |
| 109 char *stockid, | 108 char *stockid, |
| 110 int isimportant, | 109 int isimportant, |
| 112 void *userdata, | 111 void *userdata, |
| 113 va_list ap); | 112 va_list ap); |
| 114 | 113 |
| 115 GtkWidget* ui_create_toolbar(UiObject *obj); | 114 GtkWidget* ui_create_toolbar(UiObject *obj); |
| 116 | 115 |
| 117 void add_toolitem_widget(GtkToolbar *tb, UiToolItem *item, UiObject *obj); | 116 void ui_toolbar_add_items(UiObject *obj, GtkWidget *toolbar, CxMap *items, CxList *defaults); |
| 118 void add_toolitem_st_widget(GtkToolbar *tb, UiStToolItem *item, UiObject *obj); | |
| 119 void add_toolitem_toggle_widget(GtkToolbar *tb, UiToggleToolItem *item, UiObject *obj); | |
| 120 | 117 |
| 118 void add_toolitem_widget(GtkToolbar *tb, UiToolbarItem *item, UiObject *obj); | |
| 119 void add_toolitem_toggle_widget(GtkToolbar *tb, UiToolbarToggleItem *item, UiObject *obj); | |
| 120 void add_toolitem_menu_widget(GtkToolbar *tb, UiToolbarMenuItem *item, UiObject *obj); | |
| 121 | |
| 122 /* | |
| 121 void add_toolbar_combobox(GtkToolbar *tb, UiToolbarComboBox *cb, UiObject *obj); | 123 void add_toolbar_combobox(GtkToolbar *tb, UiToolbarComboBox *cb, UiObject *obj); |
| 122 void add_toolbar_combobox_nv(GtkToolbar *tb, UiToolbarComboBoxNV *cb, UiObject *obj); | 124 void add_toolbar_combobox_nv(GtkToolbar *tb, UiToolbarComboBoxNV *cb, UiObject *obj); |
| 123 void ui_combobox_change_event(GtkComboBox *widget, UiEventData *e); | 125 void ui_combobox_change_event(GtkComboBox *widget, UiEventData *e); |
| 124 void ui_combobox_update(UiEvent *event, void *combobox); | 126 void ui_combobox_update(UiEvent *event, void *combobox); |
| 127 */ | |
| 125 | 128 |
| 126 void ui_tool_button_toggled(GtkToggleToolButton *widget, UiEventData *event); | 129 void ui_tool_button_toggled(GtkToggleToolButton *widget, UiVarEventData *event); |
| 127 int64_t ui_tool_toggle_button_get(UiInteger *integer); | 130 int64_t ui_tool_toggle_button_get(UiInteger *integer); |
| 128 void ui_tool_toggle_button_set(UiInteger *integer, int64_t value); | 131 void ui_tool_toggle_button_set(UiInteger *integer, int64_t value); |
| 129 | 132 |
| 130 #ifdef __cplusplus | 133 #ifdef __cplusplus |
| 131 } | 134 } |
