Only start a drag if the left button is pressed. (#151490, Frederic

Tue Aug 31 23:24:49 2004  Matthias Clasen  <maclas@gmx.de>

	* gtk/gtkcalendar.c (gtk_calendar_main_button): Only start
	a drag if the left button is pressed.  (#151490, Frederic Croszat)

diff --git a/ChangeLog b/ChangeLog
index ee5f0d3934b132471c2e521e9ce1af3ca52d60da..363c1c96f849dd9daaa2a4f3e72efd50e73a0629 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Aug 31 23:24:49 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkcalendar.c (gtk_calendar_main_button): Only start  
+       a drag if the left button is pressed.  (#151490, Frederic Croszat)
+
 Tue Aug 31 23:20:58 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gdk/x11/gdkdnd-x11.c (gdk_drop_finish): Remove debug spew.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index ee5f0d3934b132471c2e521e9ce1af3ca52d60da..363c1c96f849dd9daaa2a4f3e72efd50e73a0629 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Tue Aug 31 23:24:49 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkcalendar.c (gtk_calendar_main_button): Only start  
+       a drag if the left button is pressed.  (#151490, Frederic Croszat)
+
 Tue Aug 31 23:20:58 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gdk/x11/gdkdnd-x11.c (gdk_drop_finish): Remove debug spew.

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index ee5f0d3934b132471c2e521e9ce1af3ca52d60da..363c1c96f849dd9daaa2a4f3e72efd50e73a0629 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Tue Aug 31 23:24:49 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkcalendar.c (gtk_calendar_main_button): Only start  
+       a drag if the left button is pressed.  (#151490, Frederic Croszat)
+
 Tue Aug 31 23:20:58 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gdk/x11/gdkdnd-x11.c (gdk_drop_finish): Remove debug spew.

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index ee5f0d3934b132471c2e521e9ce1af3ca52d60da..363c1c96f849dd9daaa2a4f3e72efd50e73a0629 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Tue Aug 31 23:24:49 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkcalendar.c (gtk_calendar_main_button): Only start  
+       a drag if the left button is pressed.  (#151490, Frederic Croszat)
+
 Tue Aug 31 23:20:58 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gdk/x11/gdkdnd-x11.c (gdk_drop_finish): Remove debug spew.

diff --git a/gtk/gtkcalendar.c b/gtk/gtkcalendar.c
index 72436550bd607005d9d85a9ecb0db80e94746e32..d463314df038e03327b8f6f97cb715b84f6aa7f8 100644 (file)
--- a/gtk/gtkcalendar.c
+++ b/gtk/gtkcalendar.c
@@ -1012,9 +1012,12 @@ gtk_calendar_main_button (GtkWidget       *widget,
       if (!GTK_WIDGET_HAS_FOCUS (widget))
        gtk_widget_grab_focus (widget);
          
-      private_data->in_drag = 1;
-      private_data->drag_start_x = x;
-      private_data->drag_start_y = y;
+      if (event->button == 1) 
+       {
+         private_data->in_drag = 1;
+         private_data->drag_start_x = x;
+         private_data->drag_start_y = y;
+       }
 
       gtk_calendar_select_and_focus_day (calendar, day);
     }