comparison: ui/gtk/toolbar.c
ui/gtk/toolbar.c
- changeset 823
- 1e1df80772ed
- parent 659
- d6baaa93f7be
- child 836
- 5a8485ff7f54
equal
deleted
inserted
replaced
| 822:54e43e4efac2 | 823:1e1df80772ed |
|---|---|
| 136 button = gtk_tool_button_new(NULL, item->args.label); | 136 button = gtk_tool_button_new(NULL, item->args.label); |
| 137 #endif | 137 #endif |
| 138 } else { | 138 } else { |
| 139 button = gtk_tool_button_new(NULL, item->args.label); | 139 button = gtk_tool_button_new(NULL, item->args.label); |
| 140 } | 140 } |
| 141 if(item->args.tooltip) { | |
| 142 gtk_tool_item_set_tooltip_text(GTK_TOOL_ITEM(button), item->args.tooltip); | |
| 143 } | |
| 141 | 144 |
| 142 gtk_tool_item_set_homogeneous(button, FALSE); | 145 gtk_tool_item_set_homogeneous(button, FALSE); |
| 143 if(item->args.icon) { | 146 if(item->args.icon) { |
| 144 set_toolbutton_icon(button, item->args.icon); | 147 set_toolbutton_icon(button, item->args.icon); |
| 145 } | 148 } |
| 190 } | 193 } |
| 191 if(item->args.icon) { | 194 if(item->args.icon) { |
| 192 set_toolbutton_icon(button, item->args.icon); | 195 set_toolbutton_icon(button, item->args.icon); |
| 193 } | 196 } |
| 194 } | 197 } |
| 198 if(item->args.tooltip) { | |
| 199 gtk_tool_item_set_tooltip_text(GTK_TOOL_ITEM(button), item->args.tooltip); | |
| 200 } | |
| 195 ui_set_widget_ngroups(obj->ctx, GTK_WIDGET(button), item->args.groups, item->ngroups); | 201 ui_set_widget_ngroups(obj->ctx, GTK_WIDGET(button), item->args.groups, item->ngroups); |
| 196 | 202 |
| 197 UiVar* var = uic_widget_var(obj->ctx, obj->ctx, NULL, item->args.varname, UI_VAR_INTEGER); | 203 UiVar* var = uic_widget_var(obj->ctx, obj->ctx, NULL, item->args.varname, UI_VAR_INTEGER); |
| 198 if(var) { | 204 if(var) { |
| 199 UiInteger *i = (UiInteger*)var->value; | 205 UiInteger *i = (UiInteger*)var->value; |
| 295 | 301 |
| 296 gtk_tool_item_set_homogeneous(button, FALSE); | 302 gtk_tool_item_set_homogeneous(button, FALSE); |
| 297 if(item->args.icon) { | 303 if(item->args.icon) { |
| 298 set_toolbutton_icon(button, item->args.icon); | 304 set_toolbutton_icon(button, item->args.icon); |
| 299 } | 305 } |
| 306 if(item->args.tooltip) { | |
| 307 gtk_tool_item_set_tooltip_text(GTK_TOOL_ITEM(button), item->args.tooltip); | |
| 308 } | |
| 300 gtk_tool_item_set_is_important(button, TRUE); | 309 gtk_tool_item_set_is_important(button, TRUE); |
| 301 | 310 |
| 302 gtk_toolbar_insert(tb, button, -1); | 311 gtk_toolbar_insert(tb, button, -1); |
| 303 | 312 |
| 304 // menu | 313 // menu |
