From cffa661b92a884af740053ed9eceedc3be16286a Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 3 Aug 2004 22:22:03 +0000 Subject: [PATCH] Fix #149191, reported by Morten Welinder: Tue Aug 3 18:16:55 2004 Matthias Clasen Fix #149191, reported by Morten Welinder: * gtk/gtkmain.c: Include gtkclipboard.h, * gtk/gtkwidget.h: Declare _gtk_widget_grab_notify, not _gtk_widget_emit_grab_notify. --- ChangeLog | 8 ++++++++ ChangeLog.pre-2-10 | 8 ++++++++ ChangeLog.pre-2-6 | 8 ++++++++ ChangeLog.pre-2-8 | 8 ++++++++ gtk/gtkmain.c | 1 + gtk/gtkwidget.h | 4 ++-- 6 files changed, 35 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 28b9f02667..cf35f11da3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Tue Aug 3 18:16:55 2004 Matthias Clasen + + Fix #149191, reported by Morten Welinder: + + * gtk/gtkmain.c: Include gtkclipboard.h, + * gtk/gtkwidget.h: Declare _gtk_widget_grab_notify, not + _gtk_widget_emit_grab_notify. + Tue Aug 3 01:30:40 2004 Matthias Clasen * gtk/gtkcombobox.c (gtk_combo_box_relayout_item): Optimize diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 28b9f02667..cf35f11da3 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,11 @@ +Tue Aug 3 18:16:55 2004 Matthias Clasen + + Fix #149191, reported by Morten Welinder: + + * gtk/gtkmain.c: Include gtkclipboard.h, + * gtk/gtkwidget.h: Declare _gtk_widget_grab_notify, not + _gtk_widget_emit_grab_notify. + Tue Aug 3 01:30:40 2004 Matthias Clasen * gtk/gtkcombobox.c (gtk_combo_box_relayout_item): Optimize diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 28b9f02667..cf35f11da3 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,11 @@ +Tue Aug 3 18:16:55 2004 Matthias Clasen + + Fix #149191, reported by Morten Welinder: + + * gtk/gtkmain.c: Include gtkclipboard.h, + * gtk/gtkwidget.h: Declare _gtk_widget_grab_notify, not + _gtk_widget_emit_grab_notify. + Tue Aug 3 01:30:40 2004 Matthias Clasen * gtk/gtkcombobox.c (gtk_combo_box_relayout_item): Optimize diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 28b9f02667..cf35f11da3 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,11 @@ +Tue Aug 3 18:16:55 2004 Matthias Clasen + + Fix #149191, reported by Morten Welinder: + + * gtk/gtkmain.c: Include gtkclipboard.h, + * gtk/gtkwidget.h: Declare _gtk_widget_grab_notify, not + _gtk_widget_emit_grab_notify. + Tue Aug 3 01:30:40 2004 Matthias Clasen * gtk/gtkcombobox.c (gtk_combo_box_relayout_item): Optimize diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c index 83b2dd7cea..278290d5d3 100644 --- a/gtk/gtkmain.c +++ b/gtk/gtkmain.c @@ -54,6 +54,7 @@ #include "gtkaccelmap.h" #include "gtkbox.h" +#include "gtkclipboard.h" #include "gtkdnd.h" #include "gtkversion.h" #include "gtkmain.h" diff --git a/gtk/gtkwidget.h b/gtk/gtkwidget.h index 51d29be005..bd21a6e61d 100644 --- a/gtk/gtkwidget.h +++ b/gtk/gtkwidget.h @@ -775,8 +775,8 @@ void gtk_requisition_free (GtkRequisition *requisition); # define gtk_widget_unref gtk_object_unref #endif /* GTK_TRACE_OBJECTS && __GNUC__ */ -void _gtk_widget_emit_grab_notify (GtkWidget *widget, - gboolean was_grabbed); +void _gtk_widget_grab_notify (GtkWidget *widget, + gboolean was_grabbed); GtkWidgetAuxInfo *_gtk_widget_get_aux_info (GtkWidget *widget, gboolean create);