Merge from HEAD.

Wed Dec 17 23:16:45 2003  Kristian Rietveld  <kris@gtk.org>

	Merge from HEAD.

	* gtk/gtktreeview.c (gtk_tree_view_button_press): fix compile warning.
	(#122727, patch from Kjartan Maraas).
This commit is contained in:
Kristian Rietveld
2003-12-17 22:20:39 +00:00
committed by Kristian Rietveld
parent 62f23fd5aa
commit 2258d82b57
6 changed files with 36 additions and 1 deletions

View File

@@ -1,3 +1,10 @@
Wed Dec 17 23:16:45 2003 Kristian Rietveld <kris@gtk.org>
Merge from HEAD.
* gtk/gtktreeview.c (gtk_tree_view_button_press): fix compile warning.
(#122727, patch from Kjartan Maraas).
2003-12-14 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkselection-win32.c: Calls to OpenClipboard() must be

View File

@@ -1,3 +1,10 @@
Wed Dec 17 23:16:45 2003 Kristian Rietveld <kris@gtk.org>
Merge from HEAD.
* gtk/gtktreeview.c (gtk_tree_view_button_press): fix compile warning.
(#122727, patch from Kjartan Maraas).
2003-12-14 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkselection-win32.c: Calls to OpenClipboard() must be

View File

@@ -1,3 +1,10 @@
Wed Dec 17 23:16:45 2003 Kristian Rietveld <kris@gtk.org>
Merge from HEAD.
* gtk/gtktreeview.c (gtk_tree_view_button_press): fix compile warning.
(#122727, patch from Kjartan Maraas).
2003-12-14 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkselection-win32.c: Calls to OpenClipboard() must be

View File

@@ -1,3 +1,10 @@
Wed Dec 17 23:16:45 2003 Kristian Rietveld <kris@gtk.org>
Merge from HEAD.
* gtk/gtktreeview.c (gtk_tree_view_button_press): fix compile warning.
(#122727, patch from Kjartan Maraas).
2003-12-14 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkselection-win32.c: Calls to OpenClipboard() must be

View File

@@ -1,3 +1,10 @@
Wed Dec 17 23:16:45 2003 Kristian Rietveld <kris@gtk.org>
Merge from HEAD.
* gtk/gtktreeview.c (gtk_tree_view_button_press): fix compile warning.
(#122727, patch from Kjartan Maraas).
2003-12-14 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkselection-win32.c: Calls to OpenClipboard() must be

View File

@@ -2106,7 +2106,7 @@ gtk_tree_view_button_press (GtkWidget *widget,
/* Save press to possibly begin a drag
*/
grab_widget = gtk_grab_get_current ();
if ((grab_widget == NULL || grab_widget == GTK_WIDGET (tree_view)) &&
if ((grab_widget == NULL || grab_widget == widget) &&
!column_handled_click &&
tree_view->priv->pressed_button < 0)
{