diff options
| author | Owen Taylor <otaylor@redhat.com> | 2001-11-23 23:42:30 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2001-11-23 23:42:30 +0000 |
| commit | 1123956779445f285ab6b807cc7714141c47154b (patch) | |
| tree | 4ee5afb283d04ac4aa0fdc2caf92b53cc6a29ab9 /gtk/gtkcombo.c | |
| parent | 2936c8e9423cc28555dbe56877a315d16b7f7d8f (diff) | |
| download | gtk+-1123956779445f285ab6b807cc7714141c47154b.tar.gz | |
Offset invalidated range correctly. Fix scrolling of title window.
Fri Nov 23 18:36:42 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkrange.c (gtk_range_button_press): Offset
invalidated range correctly.
* gtk/gtkclist.c (hadjustment_value_changed): Fix scrolling
of title window. (#65001, reported by Damon Chaplin)
* gtk/gtkcombo.c (gtk_combo_button_event_after): Replace
horrible hack with use of ::event_after.
Diffstat (limited to 'gtk/gtkcombo.c')
| -rw-r--r-- | gtk/gtkcombo.c | 34 |
1 files changed, 10 insertions, 24 deletions
diff --git a/gtk/gtkcombo.c b/gtk/gtkcombo.c index edbed499cb..589912bb33 100644 --- a/gtk/gtkcombo.c +++ b/gtk/gtkcombo.c @@ -86,7 +86,7 @@ static void gtk_combo_update_list (GtkEntry *entry, static gint gtk_combo_button_press (GtkWidget *widget, GdkEvent *event, GtkCombo *combo); -static gint gtk_combo_button_release (GtkWidget *widget, +static void gtk_combo_button_event_after (GtkWidget *widget, GdkEvent *event, GtkCombo *combo); static gint gtk_combo_list_enter (GtkWidget *widget, @@ -616,23 +616,15 @@ gtk_combo_button_press (GtkWidget * widget, GdkEvent * event, GtkCombo * combo) return TRUE; } -static gint -gtk_combo_button_release (GtkWidget *widget, - GdkEvent *event, - GtkCombo *combo) +static void +gtk_combo_button_event_after (GtkWidget *widget, + GdkEvent *event, + GtkCombo *combo) { GtkWidget *child; - /* Horrible hack to get connect-after effect without regard to the return value of the default - * handler. - */ - gtk_signal_handler_block_by_func (GTK_OBJECT (widget), - GTK_SIGNAL_FUNC (gtk_combo_button_release), - combo); - gtk_widget_event (widget, event); - gtk_signal_handler_unblock_by_func (GTK_OBJECT (widget), - GTK_SIGNAL_FUNC (gtk_combo_button_release), - combo); + if (event->type != GDK_BUTTON_RELEASE) + return; if ((combo->current_button != 0) && (event->button.button == 1)) { @@ -669,7 +661,7 @@ gtk_combo_button_release (GtkWidget *widget, GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK, NULL, NULL, GDK_CURRENT_TIME); - return TRUE; + return; } } else @@ -684,8 +676,6 @@ gtk_combo_button_release (GtkWidget *widget, } gtk_widget_hide (combo->popwin); - - return TRUE; } static gint @@ -789,12 +779,8 @@ gtk_combo_init (GtkCombo * combo) (GtkSignalFunc) gtk_combo_activate, combo); gtk_signal_connect (GTK_OBJECT (combo->button), "button_press_event", (GtkSignalFunc) gtk_combo_popup_button_press, combo); - /*gtk_signal_connect_after (GTK_OBJECT (combo->button), "button_release_event", - (GtkSignalFunc) gtk_combo_button_release, combo);*/ gtk_signal_connect (GTK_OBJECT (combo->button), "leave_notify_event", (GtkSignalFunc) gtk_combo_popup_button_leave, combo); - /*gtk_signal_connect (GTK_OBJECT (combo->button), "clicked", - (GtkSignalFunc)prelight_bug, combo); */ combo->popwin = gtk_window_new (GTK_WINDOW_POPUP); gtk_widget_ref (combo->popwin); @@ -848,8 +834,8 @@ gtk_combo_init (GtkCombo * combo) gtk_signal_connect (GTK_OBJECT (combo->popwin), "button_press_event", GTK_SIGNAL_FUNC (gtk_combo_button_press), combo); - gtk_signal_connect (GTK_OBJECT (combo->list), "button_release_event", - GTK_SIGNAL_FUNC (gtk_combo_button_release), combo); + gtk_signal_connect (GTK_OBJECT (combo->list), "event_after", + (GtkSignalFunc) gtk_combo_button_event_after, combo); /* We connect here on the button, because we'll have a grab on it * when the event occurs. But we are actually interested in enters * for the combo->list. |