comparison: ui/gtk/window.c
ui/gtk/window.c
- changeset 59
- eb6611be50c7
- parent 30
- 34513f76d5a8
- child 106
- a4f4123ca12a
equal
deleted
inserted
replaced
| 58:2b124f8ebd95 | 59:eb6611be50c7 |
|---|---|
| 85 obj->widget, | 85 obj->widget, |
| 86 "destroy", | 86 "destroy", |
| 87 G_CALLBACK(ui_exit_event), | 87 G_CALLBACK(ui_exit_event), |
| 88 window_data); | 88 window_data); |
| 89 | 89 |
| 90 GtkWidget *vbox; | 90 GtkWidget *vbox = ui_gtk_vbox_new(); |
| 91 #ifdef UI_GTK3 | |
| 92 vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0); | |
| 93 #else | |
| 94 vbox = gtk_vbox_new(FALSE, 0); | |
| 95 #endif | |
| 96 gtk_container_add(GTK_CONTAINER(obj->widget), vbox); | 91 gtk_container_add(GTK_CONTAINER(obj->widget), vbox); |
| 97 | 92 |
| 98 // menu | 93 // menu |
| 99 GtkWidget *mb = ui_create_menubar(obj); | 94 GtkWidget *mb = ui_create_menubar(obj); |
| 100 if(mb) { | 95 if(mb) { |
| 106 if(tb) { | 101 if(tb) { |
| 107 gtk_box_pack_start(GTK_BOX(vbox), tb, FALSE, FALSE, 0); | 102 gtk_box_pack_start(GTK_BOX(vbox), tb, FALSE, FALSE, 0); |
| 108 } | 103 } |
| 109 | 104 |
| 110 // window content | 105 // window content |
| 106 // the content has a (TODO: not yet) configurable frame | |
| 111 GtkWidget *frame = gtk_alignment_new(0.5, 0.5, 1, 1); | 107 GtkWidget *frame = gtk_alignment_new(0.5, 0.5, 1, 1); |
| 112 gtk_box_pack_start(GTK_BOX(vbox), frame, TRUE, TRUE, 0); | 108 gtk_box_pack_start(GTK_BOX(vbox), frame, TRUE, TRUE, 0); |
| 113 obj->container = ui_frame_container(obj, frame); | 109 |
| 110 // content vbox | |
| 111 GtkWidget *content_box = ui_gtk_vbox_new(); | |
| 112 gtk_container_add(GTK_CONTAINER(frame), content_box); | |
| 113 obj->container = ui_box_container(obj, content_box); | |
| 114 | 114 |
| 115 nwindows++; | 115 nwindows++; |
| 116 return obj; | 116 return obj; |
| 117 } | 117 } |
| 118 | 118 |
