comparison: ui/gtk/window.c
ui/gtk/window.c
- changeset 801
- e096c441e874
- parent 794
- ebd7b3394501
- child 804
- ce992dbfbc39
equal
deleted
inserted
replaced
| 800:814d374fb689 | 801:e096c441e874 |
|---|---|
| 370 // content vbox | 370 // content vbox |
| 371 GtkWidget *content_box = ui_gtk_vbox_new(0); | 371 GtkWidget *content_box = ui_gtk_vbox_new(0); |
| 372 gtk_container_add(GTK_CONTAINER(frame), content_box); | 372 gtk_container_add(GTK_CONTAINER(frame), content_box); |
| 373 obj->container = ui_box_container(obj, content_box); | 373 obj->container = ui_box_container(obj, content_box); |
| 374 */ | 374 */ |
| 375 obj->container = ui_box_container(obj, content_box, UI_CONTAINER_VBOX); | 375 UiContainerX *container = ui_box_container(obj, content_box, UI_CONTAINER_VBOX); |
| 376 uic_object_push_container(obj, container); | |
| 376 | 377 |
| 377 nwindows++; | 378 nwindows++; |
| 378 return obj; | 379 return obj; |
| 379 } | 380 } |
| 380 | 381 |
| 930 GtkWidget *c = gtk_dialog_get_content_area(GTK_DIALOG(dialog)); | 931 GtkWidget *c = gtk_dialog_get_content_area(GTK_DIALOG(dialog)); |
| 931 gtk_container_remove(GTK_CONTAINER(dialog), c); | 932 gtk_container_remove(GTK_CONTAINER(dialog), c); |
| 932 #endif | 933 #endif |
| 933 | 934 |
| 934 GtkWidget *content_vbox = ui_gtk_vbox_new(0); | 935 GtkWidget *content_vbox = ui_gtk_vbox_new(0); |
| 935 obj->container = ui_box_container(obj, content_vbox, UI_CONTAINER_VBOX); | 936 UiContainerX *container = ui_box_container(obj, content_vbox, UI_CONTAINER_VBOX); |
| 937 uic_object_push_container(obj, container); | |
| 936 if(args->lbutton1 || args->lbutton2 || args->rbutton3 || args->rbutton4) { | 938 if(args->lbutton1 || args->lbutton2 || args->rbutton3 || args->rbutton4) { |
| 937 #if GTK_CHECK_VERSION(3, 10, 0) | 939 #if GTK_CHECK_VERSION(3, 10, 0) |
| 938 if(args->titlebar_buttons != UI_OFF) { | 940 if(args->titlebar_buttons != UI_OFF) { |
| 939 GtkWidget *headerbar = gtk_header_bar_new(); | 941 GtkWidget *headerbar = gtk_header_bar_new(); |
| 940 gtk_window_set_titlebar(GTK_WINDOW(dialog), headerbar); | 942 gtk_window_set_titlebar(GTK_WINDOW(dialog), headerbar); |
