comparison: ui/gtk/toolbar.h
ui/gtk/toolbar.h
- branch
- newapi
- changeset 174
- 0358f1d9c506
- parent 167
- 161511838ea6
- child 176
- bc63cb601f6d
equal
deleted
inserted
replaced
| 173:809581724cc7 | 174:0358f1d9c506 |
|---|---|
| 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 <ucx/map.h> | 33 #include <cx/map.h> |
| 34 #include <ucx/list.h> | 34 #include <cx/list.h> |
| 35 | 35 |
| 36 #include "model.h" | 36 #include "model.h" |
| 37 #include "tree.h" | 37 #include "tree.h" |
| 38 | 38 |
| 39 #ifdef __cplusplus | 39 #ifdef __cplusplus |
| 59 const char *label; | 59 const char *label; |
| 60 const char *image; | 60 const char *image; |
| 61 ui_callback callback; | 61 ui_callback callback; |
| 62 void *userdata; | 62 void *userdata; |
| 63 const char *varname; | 63 const char *varname; |
| 64 UcxList *groups; | 64 CxList *groups; |
| 65 int isimportant; | 65 int isimportant; |
| 66 }; | 66 }; |
| 67 | 67 |
| 68 struct UiStToolItem { | 68 struct UiStToolItem { |
| 69 UiToolItemI item; | 69 UiToolItemI item; |
| 70 const char *stockid; | 70 const char *stockid; |
| 71 ui_callback callback; | 71 ui_callback callback; |
| 72 void *userdata; | 72 void *userdata; |
| 73 const char *varname; | 73 const char *varname; |
| 74 UcxList *groups; | 74 CxList *groups; |
| 75 int isimportant; | 75 int isimportant; |
| 76 }; | 76 }; |
| 77 | 77 |
| 78 struct UiToggleToolItem { | 78 struct UiToggleToolItem { |
| 79 UiToolItemI item; | 79 UiToolItemI item; |
| 80 const char *label; | 80 const char *label; |
| 81 const char *image; | 81 const char *image; |
| 82 const char *stockid; | 82 const char *stockid; |
| 83 UiInteger *value; | 83 UiInteger *value; |
| 84 const char *var; | 84 const char *var; |
| 85 UcxList *groups; | 85 CxList *groups; |
| 86 int isimportant; | 86 int isimportant; |
| 87 }; | 87 }; |
| 88 | 88 |
| 89 struct UiToolbarComboBox { | 89 struct UiToolbarComboBox { |
| 90 UiToolItemI item; | 90 UiToolItemI item; |
