From 9fe98980458865dbcec44cfaf28a5cfeb3f2d5aa Mon Sep 17 00:00:00 2001 From: Tristan Van Berkom Date: Mon, 29 Mar 2010 13:22:18 -0400 Subject: [PATCH] Added missing default events in realize() implementations Added gtk_widget_get_events() to the event masks declared by GtkToolPalette & GtkToolItemGroup. --- gtk/gtktoolitemgroup.c | 7 ++++--- gtk/gtktoolpalette.c | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/gtk/gtktoolitemgroup.c b/gtk/gtktoolitemgroup.c index fea9f29d45..a3d75b7565 100644 --- a/gtk/gtktoolitemgroup.c +++ b/gtk/gtktoolitemgroup.c @@ -1167,9 +1167,10 @@ gtk_tool_item_group_realize (GtkWidget *widget) attributes.wclass = GDK_INPUT_OUTPUT; attributes.visual = gtk_widget_get_visual (widget); attributes.colormap = gtk_widget_get_colormap (widget); - attributes.event_mask = GDK_VISIBILITY_NOTIFY_MASK | GDK_EXPOSURE_MASK - | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - | GDK_BUTTON_MOTION_MASK; + attributes.event_mask = gtk_widget_get_events (widget) + | GDK_VISIBILITY_NOTIFY_MASK | GDK_EXPOSURE_MASK + | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + | GDK_BUTTON_MOTION_MASK; widget->window = gdk_window_new (gtk_widget_get_parent_window (widget), &attributes, attributes_mask); diff --git a/gtk/gtktoolpalette.c b/gtk/gtktoolpalette.c index e7b94007a7..fa37edcc56 100644 --- a/gtk/gtktoolpalette.c +++ b/gtk/gtktoolpalette.c @@ -662,9 +662,10 @@ gtk_tool_palette_realize (GtkWidget *widget) attributes.wclass = GDK_INPUT_OUTPUT; attributes.visual = gtk_widget_get_visual (widget); attributes.colormap = gtk_widget_get_colormap (widget); - attributes.event_mask = GDK_VISIBILITY_NOTIFY_MASK | GDK_EXPOSURE_MASK - | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - | GDK_BUTTON_MOTION_MASK; + attributes.event_mask = gtk_widget_get_events (widget) + | GDK_VISIBILITY_NOTIFY_MASK | GDK_EXPOSURE_MASK + | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + | GDK_BUTTON_MOTION_MASK; widget->window = gdk_window_new (gtk_widget_get_parent_window (widget), &attributes, attributes_mask);