comparison: ui/gtk/widget.c
ui/gtk/widget.c
- changeset 108
- 77254bd6dccb
- parent 103
- 6606616eca9f
- child 112
- c3f2f16fa4b8
equal
deleted
inserted
replaced
| 107:b34bd1557c6c | 108:77254bd6dccb |
|---|---|
| 29 #include "widget.h" | 29 #include "widget.h" |
| 30 #include "container.h" | 30 #include "container.h" |
| 31 | 31 |
| 32 #include "../common/object.h" | 32 #include "../common/object.h" |
| 33 | 33 |
| 34 UIEXPORT UIWIDGET ui_customwidget_create(UiObject *obj, ui_createwidget_func create_widget, void *userdata, UiWidgetArgs args) { | 34 UIEXPORT UIWIDGET ui_customwidget_create(UiObject *obj, ui_createwidget_func create_widget, void *userdata, UiWidgetArgs *args) { |
| 35 UiObject* current = uic_current_obj(obj); | 35 UiObject* current = uic_current_obj(obj); |
| 36 | 36 |
| 37 UIWIDGET widget = create_widget(obj, args, userdata); | 37 UIWIDGET widget = create_widget(obj, args, userdata); |
| 38 | 38 |
| 39 UI_APPLY_LAYOUT1(current, args); | 39 UI_APPLY_LAYOUT2(current, args); |
| 40 current->container->add(current->container, widget, FALSE); | 40 current->container->add(current->container, widget); |
| 41 | 41 |
| 42 return widget; | 42 return widget; |
| 43 } | 43 } |
| 44 | 44 |
| 45 UIWIDGET ui_separator_create(UiObject *obj, UiWidgetArgs *args) { | 45 UIWIDGET ui_separator_create(UiObject *obj, UiWidgetArgs *args) { |
| 46 UiObject* current = uic_current_obj(obj); | 46 UiObject* current = uic_current_obj(obj); |
| 47 GtkWidget *widget = gtk_separator_new(GTK_ORIENTATION_HORIZONTAL); | 47 GtkWidget *widget = gtk_separator_new(GTK_ORIENTATION_HORIZONTAL); |
| 48 ui_set_name_and_style(widget, args->name, args->style_class); | 48 ui_set_name_and_style(widget, args->name, args->style_class); |
| 49 UI_APPLY_LAYOUT1(current, (*args)); | 49 UI_APPLY_LAYOUT1(current, (*args)); |
| 50 current->container->add(current->container, widget, FALSE); | 50 current->container->add(current->container, widget); |
| 51 return widget; | 51 return widget; |
| 52 } | 52 } |
| 53 | 53 |
| 54 void ui_widget_set_size(UIWIDGET w, int width, int height) { | 54 void ui_widget_set_size(UIWIDGET w, int width, int height) { |
| 55 gtk_widget_set_size_request(w, width, height); | 55 gtk_widget_set_size_request(w, width, height); |
