comparison: ui/gtk/window.c
ui/gtk/window.c
- branch
- newapi
- changeset 254
- 13997c76859b
- parent 253
- 087cc9216f28
- child 276
- 376921880a7f
equal
deleted
inserted
replaced
| 253:087cc9216f28 | 254:13997c76859b |
|---|---|
| 31 #include <string.h> | 31 #include <string.h> |
| 32 | 32 |
| 33 #include "../ui/window.h" | 33 #include "../ui/window.h" |
| 34 #include "../ui/properties.h" | 34 #include "../ui/properties.h" |
| 35 #include "../common/context.h" | 35 #include "../common/context.h" |
| 36 #include "../common/menu.h" | |
| 37 #include "../common/toolbar.h" | |
| 36 | 38 |
| 37 #include <cx/mempool.h> | 39 #include <cx/mempool.h> |
| 38 | 40 |
| 39 #include "menu.h" | 41 #include "menu.h" |
| 40 #include "toolbar.h" | 42 #include "toolbar.h" |
| 108 GtkWidget *vbox = ui_gtk_vbox_new(0); | 110 GtkWidget *vbox = ui_gtk_vbox_new(0); |
| 109 gtk_container_add(GTK_CONTAINER(obj->widget), vbox); | 111 gtk_container_add(GTK_CONTAINER(obj->widget), vbox); |
| 110 | 112 |
| 111 if(!simple) { | 113 if(!simple) { |
| 112 // menu | 114 // menu |
| 113 GtkWidget *mb = ui_create_menubar(obj); | 115 if(uic_get_menu_list()) { |
| 114 if(mb) { | 116 GtkWidget *mb = ui_create_menubar(obj); |
| 115 gtk_box_pack_start(GTK_BOX(vbox), mb, FALSE, FALSE, 0); | 117 if(mb) { |
| 118 gtk_box_pack_start(GTK_BOX(vbox), mb, FALSE, FALSE, 0); | |
| 119 } | |
| 116 } | 120 } |
| 117 | 121 |
| 118 // toolbar | 122 // toolbar |
| 119 GtkWidget *tb = ui_create_toolbar(obj); | 123 if(uic_toolbar_isenabled()) { |
| 120 if(tb) { | 124 GtkWidget *tb = ui_create_toolbar(obj); |
| 121 gtk_box_pack_start(GTK_BOX(vbox), tb, FALSE, FALSE, 0); | 125 if(tb) { |
| 126 gtk_box_pack_start(GTK_BOX(vbox), tb, FALSE, FALSE, 0); | |
| 127 } | |
| 122 } | 128 } |
| 123 } | 129 } |
| 124 | 130 |
| 125 // window content | 131 // window content |
| 126 // the content has a (TODO: not yet) configurable frame | 132 // the content has a (TODO: not yet) configurable frame |
