forked from AuroraMiddleware/gtk
set popup_in_progress to TRUE, (gtk_combo_box_menu_show): and back to
Tue Sep 30 21:43:34 2003 Kristian Rietveld <kris@gtk.org> * gtk/gtkcombobox.c (gtk_combo_box_menu_button_press): set popup_in_progress to TRUE, (gtk_combo_box_menu_show): and back to FALSE here; the menu now won't disappear on the first button release. (Reported by Matthias Clasen).
This commit is contained in:
parent
b78ee57ea4
commit
039c6b3bb1
@ -1,3 +1,11 @@
|
||||
Tue Sep 30 21:43:34 2003 Kristian Rietveld <kris@gtk.org>
|
||||
|
||||
* gtk/gtkcombobox.c (gtk_combo_box_menu_button_press): set
|
||||
popup_in_progress to TRUE,
|
||||
(gtk_combo_box_menu_show): and back to FALSE here; the menu now
|
||||
won't disappear on the first button release. (Reported by Matthias
|
||||
Clasen).
|
||||
|
||||
Tue Sep 30 21:08:43 2003 Kristian Rietveld <kris@gtk.org>
|
||||
|
||||
* gtk/gtkcombobox.c (gtk_combo_box_init): actually show the child.
|
||||
|
@ -1,3 +1,11 @@
|
||||
Tue Sep 30 21:43:34 2003 Kristian Rietveld <kris@gtk.org>
|
||||
|
||||
* gtk/gtkcombobox.c (gtk_combo_box_menu_button_press): set
|
||||
popup_in_progress to TRUE,
|
||||
(gtk_combo_box_menu_show): and back to FALSE here; the menu now
|
||||
won't disappear on the first button release. (Reported by Matthias
|
||||
Clasen).
|
||||
|
||||
Tue Sep 30 21:08:43 2003 Kristian Rietveld <kris@gtk.org>
|
||||
|
||||
* gtk/gtkcombobox.c (gtk_combo_box_init): actually show the child.
|
||||
|
@ -1,3 +1,11 @@
|
||||
Tue Sep 30 21:43:34 2003 Kristian Rietveld <kris@gtk.org>
|
||||
|
||||
* gtk/gtkcombobox.c (gtk_combo_box_menu_button_press): set
|
||||
popup_in_progress to TRUE,
|
||||
(gtk_combo_box_menu_show): and back to FALSE here; the menu now
|
||||
won't disappear on the first button release. (Reported by Matthias
|
||||
Clasen).
|
||||
|
||||
Tue Sep 30 21:08:43 2003 Kristian Rietveld <kris@gtk.org>
|
||||
|
||||
* gtk/gtkcombobox.c (gtk_combo_box_init): actually show the child.
|
||||
|
@ -1,3 +1,11 @@
|
||||
Tue Sep 30 21:43:34 2003 Kristian Rietveld <kris@gtk.org>
|
||||
|
||||
* gtk/gtkcombobox.c (gtk_combo_box_menu_button_press): set
|
||||
popup_in_progress to TRUE,
|
||||
(gtk_combo_box_menu_show): and back to FALSE here; the menu now
|
||||
won't disappear on the first button release. (Reported by Matthias
|
||||
Clasen).
|
||||
|
||||
Tue Sep 30 21:08:43 2003 Kristian Rietveld <kris@gtk.org>
|
||||
|
||||
* gtk/gtkcombobox.c (gtk_combo_box_init): actually show the child.
|
||||
|
@ -1,3 +1,11 @@
|
||||
Tue Sep 30 21:43:34 2003 Kristian Rietveld <kris@gtk.org>
|
||||
|
||||
* gtk/gtkcombobox.c (gtk_combo_box_menu_button_press): set
|
||||
popup_in_progress to TRUE,
|
||||
(gtk_combo_box_menu_show): and back to FALSE here; the menu now
|
||||
won't disappear on the first button release. (Reported by Matthias
|
||||
Clasen).
|
||||
|
||||
Tue Sep 30 21:08:43 2003 Kristian Rietveld <kris@gtk.org>
|
||||
|
||||
* gtk/gtkcombobox.c (gtk_combo_box_init): actually show the child.
|
||||
|
@ -571,6 +571,7 @@ gtk_combo_box_menu_show (GtkWidget *menu,
|
||||
|
||||
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (combo_box->priv->button),
|
||||
TRUE);
|
||||
combo_box->priv->popup_in_progress = FALSE;
|
||||
}
|
||||
|
||||
static void
|
||||
@ -1431,6 +1432,7 @@ gtk_combo_box_menu_button_press (GtkWidget *widget,
|
||||
|
||||
if (event->type == GDK_BUTTON_PRESS && event->button == 1)
|
||||
{
|
||||
combo_box->priv->popup_in_progress = TRUE;
|
||||
gtk_menu_popup (GTK_MENU (combo_box->priv->popup_widget),
|
||||
NULL, NULL,
|
||||
gtk_combo_box_menu_position, combo_box,
|
||||
|
Loading…
Reference in New Issue
Block a user