callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Keep the main_vbox around in the GimpImageWindow struct (temp hack)

Browse Source
This commit is contained in:
Michael Natterer
2009-09-23 15:46:44 +02:00
parent 639c427429
commit 1823494122
3 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/display/gimpdisplayshell.c
View File

@ -855,7 +855,6 @@ gimp_display_shell_new (GimpDisplay *display,
GimpDisplayShell *shell; GimpDisplayShell *shell;
GimpDisplayOptions *options; GimpDisplayOptions *options;
GimpColorDisplayStack *filter; GimpColorDisplayStack *filter;
GtkWidget *main_vbox;
GtkWidget *disp_vbox; GtkWidget *disp_vbox;
GtkWidget *upper_hbox; GtkWidget *upper_hbox;
GtkWidget *right_vbox; GtkWidget *right_vbox;
@ -997,9 +996,6 @@ gimp_display_shell_new (GimpDisplay *display,
/* the vbox containing all widgets */ /* the vbox containing all widgets */
main_vbox = gtk_vbox_new (FALSE, 0);
gtk_container_add (GTK_CONTAINER (shell), main_vbox);
#ifndef GDK_WINDOWING_QUARTZ #ifndef GDK_WINDOWING_QUARTZ
shell->menubar = shell->menubar =
gtk_ui_manager_get_widget (GTK_UI_MANAGER (shell->menubar_manager), gtk_ui_manager_get_widget (GTK_UI_MANAGER (shell->menubar_manager),
@ -1008,7 +1004,8 @@ gimp_display_shell_new (GimpDisplay *display,
if (shell->menubar) if (shell->menubar)
{ {
gtk_box_pack_start (GTK_BOX (main_vbox), shell->menubar, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (GIMP_IMAGE_WINDOW (shell)->main_vbox),
shell->menubar, FALSE, FALSE, 0);
if (options->show_menubar) if (options->show_menubar)
gtk_widget_show (shell->menubar); gtk_widget_show (shell->menubar);
@ -1036,7 +1033,8 @@ gimp_display_shell_new (GimpDisplay *display,
/* another vbox for everything except the statusbar */ /* another vbox for everything except the statusbar */
disp_vbox = gtk_vbox_new (FALSE, 1); disp_vbox = gtk_vbox_new (FALSE, 1);
gtk_box_pack_start (GTK_BOX (main_vbox), disp_vbox, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (GIMP_IMAGE_WINDOW (shell)->main_vbox),
disp_vbox, TRUE, TRUE, 0);
gtk_widget_show (disp_vbox); gtk_widget_show (disp_vbox);
/* a hbox for the inner_table and the vertical scrollbar */ /* a hbox for the inner_table and the vertical scrollbar */
@ -1284,7 +1282,7 @@ gimp_display_shell_new (GimpDisplay *display,
gtk_box_pack_start (GTK_BOX (lower_hbox), gtk_box_pack_start (GTK_BOX (lower_hbox),
shell->nav_ebox, FALSE, FALSE, 0); shell->nav_ebox, FALSE, FALSE, 0);
gtk_box_pack_end (GTK_BOX (main_vbox), gtk_box_pack_end (GTK_BOX (GIMP_IMAGE_WINDOW (shell)->main_vbox),
shell->statusbar, FALSE, FALSE, 0); shell->statusbar, FALSE, FALSE, 0);
/* show everything *******************************************************/ /* show everything *******************************************************/
@ -1310,8 +1308,6 @@ gimp_display_shell_new (GimpDisplay *display,
if (options->show_statusbar) if (options->show_statusbar)
gtk_widget_show (shell->statusbar); gtk_widget_show (shell->statusbar);
gtk_widget_show (main_vbox);
/* add display filter for color management */ /* add display filter for color management */
filter = gimp_display_shell_filter_new (shell, filter = gimp_display_shell_filter_new (shell,

4
app/display/gimpimagewindow.c
View File

@ -114,6 +114,10 @@ gimp_image_window_constructor (GType type,
g_assert (GIMP_IS_UI_MANAGER (window->menubar_manager)); g_assert (GIMP_IS_UI_MANAGER (window->menubar_manager));
window->main_vbox = gtk_vbox_new (FALSE, 0);
gtk_container_add (GTK_CONTAINER (window), window->main_vbox);
gtk_widget_show (window->main_vbox);
return object; return object;
} }

2
app/display/gimpimagewindow.h
View File

@ -38,6 +38,8 @@ struct _GimpImageWindow
GimpUIManager *menubar_manager; GimpUIManager *menubar_manager;
GtkWidget *main_vbox;
GdkWindowState window_state; GdkWindowState window_state;
}; };