summaryrefslogtreecommitdiff
path: root/gtk/gtkcombo.c
diff options
context:
space:
mode:
authorOwen Taylor <otaylor@src.gnome.org>1998-05-01 04:23:59 +0000
committerOwen Taylor <otaylor@src.gnome.org>1998-05-01 04:23:59 +0000
commit05bc6a5b3639869eee69cfa4a2db8b8968b247cb (patch)
tree58bad8f48d24c88dfc95206defe79dd0464256f6 /gtk/gtkcombo.c
parente909f843f8e2949144e624ce1af4fd1737396f62 (diff)
downloadgdk-pixbuf-05bc6a5b3639869eee69cfa4a2db8b8968b247cb.tar.gz
Merged changes from gtk-1-0. Check ChangeLog for details.
Diffstat (limited to 'gtk/gtkcombo.c')
-rw-r--r--gtk/gtkcombo.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/gtk/gtkcombo.c b/gtk/gtkcombo.c
index a22c654cc..7ca02840c 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);
}