comparison: ui/ui/button.h
ui/ui/button.h
- branch
- newapi
- changeset 187
- 24ce2c326d85
- parent 186
- 5db4979bf482
- child 188
- fbbae6738252
equal
deleted
inserted
replaced
| 186:5db4979bf482 | 187:24ce2c326d85 |
|---|---|
| 40 UiBool hexpand; | 40 UiBool hexpand; |
| 41 UiBool vexpand; | 41 UiBool vexpand; |
| 42 int colspan; | 42 int colspan; |
| 43 int rowspan; | 43 int rowspan; |
| 44 | 44 |
| 45 char* label; | 45 const char* label; |
| 46 char* stockid; | 46 const char* stockid; |
| 47 ui_callback onclick; | 47 ui_callback onclick; |
| 48 void* onclickdata; | 48 void* onclickdata; |
| 49 } UiButtonArgs; | 49 } UiButtonArgs; |
| 50 | 50 |
| 51 typedef struct UiToggleArgs { | 51 typedef struct UiToggleArgs { |
| 52 char* label; | 52 UiTri fill; |
| 53 char* stockid; | 53 UiBool hexpand; |
| 54 UiBool vexpand; | |
| 55 int colspan; | |
| 56 int rowspan; | |
| 57 | |
| 58 const char* label; | |
| 59 const char* stockid; | |
| 54 UiInteger* value; | 60 UiInteger* value; |
| 55 char* varname; | 61 const char* varname; |
| 56 } UiToggleArgs; | 62 } UiToggleArgs; |
| 57 | 63 |
| 58 #define ui_button(obj, ...) ui_button_create(obj, (UiButtonArgs){ __VA_ARGS__ } ) | 64 #define ui_button(obj, ...) ui_button_create(obj, (UiButtonArgs){ __VA_ARGS__ } ) |
| 65 #define ui_togglebutton(obj, ...) ui_togglebutton_create(obj, (UiToggleArgs){ __VA_ARGS__ } ) | |
| 59 #define ui_checkbox(obj, ...) ui_checkbox_create(obj, (UiToggleArgs){ __VA_ARGS__ } ) | 66 #define ui_checkbox(obj, ...) ui_checkbox_create(obj, (UiToggleArgs){ __VA_ARGS__ } ) |
| 60 #define ui_radiobutton(obj, ...) ui_checkbox_create(obj, (UiToggleArgs){ __VA_ARGS__ } ) | 67 #define ui_radiobutton(obj, ...) ui_checkbox_create(obj, (UiToggleArgs){ __VA_ARGS__ } ) |
| 61 | 68 |
| 62 UIWIDGET ui_button_create(UiObject* obj, UiButtonArgs args); | 69 UIWIDGET ui_button_create(UiObject* obj, UiButtonArgs args); |
| 70 UIWIDGET ui_togglebutton_create(UiObject* obj, UiToggleArgs args); | |
| 63 UIWIDGET ui_checkbox_create(UiObject* obj, UiToggleArgs args); | 71 UIWIDGET ui_checkbox_create(UiObject* obj, UiToggleArgs args); |
| 64 UIWIDGET ui_radiobutton_create(UiObject* obj, UiToggleArgs); | 72 UIWIDGET ui_radiobutton_create(UiObject* obj, UiToggleArgs); |
| 65 | 73 |
| 66 UIWIDGET deprecated_ui_button(UiObject *obj, char *label, ui_callback f, void *data); | 74 UIWIDGET deprecated_ui_button(UiObject *obj, char *label, ui_callback f, void *data); |
| 67 | 75 |
