Merged from stable.

Thu Jul 17 19:06:34 2003  Kristian Rietveld  <kris@gtk.org>

	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).
This commit is contained in:
Kristian Rietveld 2003-07-17 17:09:57 +00:00 committed by Kristian Rietveld
parent bdce65ea3f
commit c400b654ca
6 changed files with 42 additions and 2 deletions

View File

@ -1,3 +1,11 @@
Thu Jul 17 19:06:34 2003 Kristian Rietveld <kris@gtk.org>
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 <kris@gtk.org>
Merged from stable.

View File

@ -1,3 +1,11 @@
Thu Jul 17 19:06:34 2003 Kristian Rietveld <kris@gtk.org>
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 <kris@gtk.org>
Merged from stable.

View File

@ -1,3 +1,11 @@
Thu Jul 17 19:06:34 2003 Kristian Rietveld <kris@gtk.org>
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 <kris@gtk.org>
Merged from stable.

View File

@ -1,3 +1,11 @@
Thu Jul 17 19:06:34 2003 Kristian Rietveld <kris@gtk.org>
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 <kris@gtk.org>
Merged from stable.

View File

@ -1,3 +1,11 @@
Thu Jul 17 19:06:34 2003 Kristian Rietveld <kris@gtk.org>
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 <kris@gtk.org>
Merged from stable.

View File

@ -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 |