diff options
author | Owen Taylor <otaylor@src.gnome.org> | 1998-05-01 04:23:59 +0000 |
---|---|---|
committer | Owen Taylor <otaylor@src.gnome.org> | 1998-05-01 04:23:59 +0000 |
commit | 05bc6a5b3639869eee69cfa4a2db8b8968b247cb (patch) | |
tree | 58bad8f48d24c88dfc95206defe79dd0464256f6 /gtk/gtkcombo.c | |
parent | e909f843f8e2949144e624ce1af4fd1737396f62 (diff) | |
download | gtk+-05bc6a5b3639869eee69cfa4a2db8b8968b247cb.tar.gz |
Merged changes from gtk-1-0. Check ChangeLog for details.
Diffstat (limited to 'gtk/gtkcombo.c')
-rw-r--r-- | gtk/gtkcombo.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/gtk/gtkcombo.c b/gtk/gtkcombo.c index a22c654cc3..7ca02840c5 100644 --- a/gtk/gtkcombo.c +++ b/gtk/gtkcombo.c @@ -494,12 +494,15 @@ gtk_combo_button_release (GtkWidget * widget, GdkEvent * event, GtkCombo * combo GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK, NULL, NULL, GDK_CURRENT_TIME); - return FALSE; } } else { + /* Don't remove the popwin when the user adjusts the scrollbats */ + if (!(GTK_LIST (combo->list)->button)) + return FALSE; + gtk_grab_remove (combo->popwin); gdk_pointer_ungrab (event->button.time); } |