193 ui_fill_headerbar(obj, headerbar); |
193 ui_fill_headerbar(obj, headerbar); |
194 } |
194 } |
195 #elif GTK_MAJOR_VERSION >= 4 |
195 #elif GTK_MAJOR_VERSION >= 4 |
196 GtkWidget *content_box = ui_gtk_vbox_new(0); |
196 GtkWidget *content_box = ui_gtk_vbox_new(0); |
197 WINDOW_SET_CONTENT(obj->widget, vbox); |
197 WINDOW_SET_CONTENT(obj->widget, vbox); |
|
198 if(!simple) { |
|
199 if(uic_get_menu_list()) { |
|
200 GtkWidget *mb = ui_create_menubar(obj); |
|
201 if(mb) { |
|
202 BOX_ADD(vbox, mb); |
|
203 } |
|
204 } |
|
205 } |
198 if(sidebar) { |
206 if(sidebar) { |
199 GtkWidget *paned = gtk_paned_new(GTK_ORIENTATION_HORIZONTAL); |
207 GtkWidget *paned = gtk_paned_new(GTK_ORIENTATION_HORIZONTAL); |
200 GtkWidget *sidebar_vbox = ui_gtk_vbox_new(0); |
208 GtkWidget *sidebar_vbox = ui_gtk_vbox_new(0); |
201 gtk_paned_set_start_child(GTK_PANED(paned), sidebar_vbox); |
209 gtk_paned_set_start_child(GTK_PANED(paned), sidebar_vbox); |
202 gtk_paned_set_end_child(GTK_PANED(paned), content_box); |
210 gtk_paned_set_end_child(GTK_PANED(paned), content_box); |