diff --git a/ChangeLog b/ChangeLog index 1b2ecdec72..1f7aa5f216 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Thu Jul 17 19:06:34 2003 Kristian Rietveld + + Merged from stable. + + * gtk/gtktreeviewcolumn.c (_gtk_tree_view_column_realize_button): + Don't set attr.event_mask twice, those things were meant to be + ORred. (#115139, pointed out by Morten Welinder). + Thu Jul 17 16:11:21 2003 Kristian Rietveld Merged from stable. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 1b2ecdec72..1f7aa5f216 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,11 @@ +Thu Jul 17 19:06:34 2003 Kristian Rietveld + + Merged from stable. + + * gtk/gtktreeviewcolumn.c (_gtk_tree_view_column_realize_button): + Don't set attr.event_mask twice, those things were meant to be + ORred. (#115139, pointed out by Morten Welinder). + Thu Jul 17 16:11:21 2003 Kristian Rietveld Merged from stable. diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 1b2ecdec72..1f7aa5f216 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,11 @@ +Thu Jul 17 19:06:34 2003 Kristian Rietveld + + Merged from stable. + + * gtk/gtktreeviewcolumn.c (_gtk_tree_view_column_realize_button): + Don't set attr.event_mask twice, those things were meant to be + ORred. (#115139, pointed out by Morten Welinder). + Thu Jul 17 16:11:21 2003 Kristian Rietveld Merged from stable. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 1b2ecdec72..1f7aa5f216 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,11 @@ +Thu Jul 17 19:06:34 2003 Kristian Rietveld + + Merged from stable. + + * gtk/gtktreeviewcolumn.c (_gtk_tree_view_column_realize_button): + Don't set attr.event_mask twice, those things were meant to be + ORred. (#115139, pointed out by Morten Welinder). + Thu Jul 17 16:11:21 2003 Kristian Rietveld Merged from stable. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 1b2ecdec72..1f7aa5f216 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,11 @@ +Thu Jul 17 19:06:34 2003 Kristian Rietveld + + Merged from stable. + + * gtk/gtktreeviewcolumn.c (_gtk_tree_view_column_realize_button): + Don't set attr.event_mask twice, those things were meant to be + ORred. (#115139, pointed out by Morten Welinder). + Thu Jul 17 16:11:21 2003 Kristian Rietveld Merged from stable. diff --git a/gtk/gtktreeviewcolumn.c b/gtk/gtktreeviewcolumn.c index cba68c0e6a..178f44f2ea 100644 --- a/gtk/gtktreeviewcolumn.c +++ b/gtk/gtktreeviewcolumn.c @@ -1204,8 +1204,8 @@ _gtk_tree_view_column_realize_button (GtkTreeViewColumn *column) attr.wclass = GDK_INPUT_ONLY; attr.visual = gtk_widget_get_visual (GTK_WIDGET (tree_view)); attr.colormap = gtk_widget_get_colormap (GTK_WIDGET (tree_view)); - attr.event_mask = gtk_widget_get_events (GTK_WIDGET (tree_view)); - attr.event_mask = (GDK_BUTTON_PRESS_MASK | + attr.event_mask = gtk_widget_get_events (GTK_WIDGET (tree_view)) | + (GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK |