diff options
| author | Soeren Sandmann <sandmann@daimi.au.dk> | 2004-03-02 20:49:15 +0000 |
|---|---|---|
| committer | Søren Sandmann Pedersen <ssp@src.gnome.org> | 2004-03-02 20:49:15 +0000 |
| commit | cddfd994ef4ed9a92444c409dd37d9357acbfacb (patch) | |
| tree | 046fa434f0e40fa93e33f946756009c925037c36 /gtk/gtkcombo.c | |
| parent | f05cb42db9b7c1d8409f4dcfc0f25d32ef62a973 (diff) | |
| download | gtk+-cddfd994ef4ed9a92444c409dd37d9357acbfacb.tar.gz | |
Patch from Frederic Crozat, test code from Jean-Philippe Chancelier. Fixes
Tue Mar 2 21:23:30 2004 Soeren Sandmann <sandmann@daimi.au.dk>
Patch from Frederic Crozat, test code from Jean-Philippe
Chancelier. Fixes bug #120479.
* gtk/gtkcombo.c (gtk_combo_popup_list): Make sure popup belongs
to the right window group.
* gtk/gtkmenu.c (gtk_menu_popup): Same
* tests/testsocket.c (main): Pack the plugs into an hbox instead
of a vbox.
* tests/testsocket_common.c: Add a GtkMenuBar, a GtkCombo and a
GtkComboBox to the children.
Diffstat (limited to 'gtk/gtkcombo.c')
| -rw-r--r-- | gtk/gtkcombo.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/gtk/gtkcombo.c b/gtk/gtkcombo.c index 51bb602832..00fafbe996 100644 --- a/gtk/gtkcombo.c +++ b/gtk/gtkcombo.c @@ -515,6 +515,7 @@ gtk_combo_get_pos (GtkCombo * combo, gint * x, gint * y, gint * height, gint * w static void gtk_combo_popup_list (GtkCombo * combo) { + GtkWidget *toplevel; GtkList *list; gint height, width, x, y; gint old_width, old_height; @@ -553,6 +554,15 @@ gtk_combo_popup_list (GtkCombo * combo) } gtk_window_move (GTK_WINDOW (combo->popwin), x, y); + + toplevel = gtk_widget_get_toplevel (combo); + + if (GTK_IS_WINDOW (toplevel)) + { + gtk_window_group_add_window (_gtk_window_get_group (GTK_WINDOW (toplevel)), + GTK_WINDOW (combo->popwin)); + } + gtk_widget_set_size_request (combo->popwin, width, height); gtk_widget_show (combo->popwin); @@ -580,6 +590,8 @@ gtk_combo_popdown_list (GtkCombo *combo) } gtk_widget_hide (combo->popwin); + + gtk_window_group_add_window (_gtk_window_get_group (NULL), GTK_WINDOW (combo->popwin)); } static gboolean |