comparison: ui/gtk/window.c
ui/gtk/window.c
- changeset 3
- c1a75454b444
- parent 0
- 1f419bd32da1
- child 4
- 39b9b86ec452
equal
deleted
inserted
replaced
| 2:eeb50c534497 | 3:c1a75454b444 |
|---|---|
| 31 | 31 |
| 32 #include "../ui/window.h" | 32 #include "../ui/window.h" |
| 33 #include "../common/context.h" | 33 #include "../common/context.h" |
| 34 | 34 |
| 35 #include "menu.h" | 35 #include "menu.h" |
| 36 #include "toolbar.h" | |
| 36 | 37 |
| 37 static int nwindows = 0; | 38 static int nwindows = 0; |
| 38 | 39 |
| 39 static ui_callback wclose_fnc = NULL; | 40 static ui_callback wclose_fnc = NULL; |
| 40 static void *wclose_udata = NULL; | 41 static void *wclose_udata = NULL; |
| 84 GtkWidget *mb = ui_create_menubar(obj); | 85 GtkWidget *mb = ui_create_menubar(obj); |
| 85 if(mb) { | 86 if(mb) { |
| 86 gtk_box_pack_start(GTK_BOX(vbox), mb, FALSE, FALSE, 0); | 87 gtk_box_pack_start(GTK_BOX(vbox), mb, FALSE, FALSE, 0); |
| 87 } | 88 } |
| 88 | 89 |
| 90 // toolbar | |
| 91 GtkWidget *tb = ui_create_toolbar(obj); | |
| 92 if(tb) { | |
| 93 gtk_box_pack_start(GTK_BOX(vbox), tb, FALSE, FALSE, 0); | |
| 94 } | |
| 95 | |
| 89 nwindows++; | 96 nwindows++; |
| 90 return obj; | 97 return obj; |
| 91 } | 98 } |
| 92 | 99 |
