comparison: ui/gtk/window.c
ui/gtk/window.c
- changeset 1123
- 42ef3156ea09
- parent 1096
- 655349c3021e
equal
deleted
inserted
replaced
| 1122:fd0f943ff5f3 | 1123:42ef3156ea09 |
|---|---|
| 396 // content vbox | 396 // content vbox |
| 397 GtkWidget *content_box = ui_gtk_vbox_new(0); | 397 GtkWidget *content_box = ui_gtk_vbox_new(0); |
| 398 gtk_container_add(GTK_CONTAINER(frame), content_box); | 398 gtk_container_add(GTK_CONTAINER(frame), content_box); |
| 399 obj->container = ui_box_container(obj, content_box); | 399 obj->container = ui_box_container(obj, content_box); |
| 400 */ | 400 */ |
| 401 UiContainerX *container = ui_box_container(obj, content_box, UI_CONTAINER_VBOX); | 401 UiContainer *container = ui_box_container(obj, content_box, UI_CONTAINER_VBOX); |
| 402 uic_object_push_container(obj, container); | 402 uic_object_push_container(obj, container); |
| 403 | 403 |
| 404 nwindows++; | 404 nwindows++; |
| 405 return obj; | 405 return obj; |
| 406 } | 406 } |
| 973 GtkWidget *c = gtk_dialog_get_content_area(GTK_DIALOG(dialog)); | 973 GtkWidget *c = gtk_dialog_get_content_area(GTK_DIALOG(dialog)); |
| 974 gtk_container_remove(GTK_CONTAINER(dialog), c); | 974 gtk_container_remove(GTK_CONTAINER(dialog), c); |
| 975 #endif | 975 #endif |
| 976 | 976 |
| 977 GtkWidget *content_vbox = ui_gtk_vbox_new(0); | 977 GtkWidget *content_vbox = ui_gtk_vbox_new(0); |
| 978 UiContainerX *container = ui_box_container(obj, content_vbox, UI_CONTAINER_VBOX); | 978 UiContainer *container = ui_box_container(obj, content_vbox, UI_CONTAINER_VBOX); |
| 979 uic_object_push_container(obj, container); | 979 uic_object_push_container(obj, container); |
| 980 if(args->lbutton1 || args->lbutton2 || args->rbutton3 || args->rbutton4) { | 980 if(args->lbutton1 || args->lbutton2 || args->rbutton3 || args->rbutton4) { |
| 981 #if GTK_CHECK_VERSION(3, 10, 0) | 981 #if GTK_CHECK_VERSION(3, 10, 0) |
| 982 if(args->titlebar_buttons != UI_OFF) { | 982 if(args->titlebar_buttons != UI_OFF) { |
| 983 GtkWidget *headerbar = gtk_header_bar_new(); | 983 GtkWidget *headerbar = gtk_header_bar_new(); |
