Use motion union member for MOTION events.

git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@6 f5e0f49d-192f-0410-a22d-a8d8700d0965

diff --git a/glabels1/src/display.c b/glabels1/src/display.c
index 554400933f4c87c9dd4cd5e92dd2b50ce7503e40..9440820d3843c3a71cc397d549cbd5c1d3b07172 100644 (file)
--- a/glabels1/src/display.c
+++ b/glabels1/src/display.c
@@ -1023,8 +1023,8 @@ canvas_event_arrow_mode (GnomeCanvas * canvas,
        case GDK_MOTION_NOTIFY:
                if (dragging && (event->motion.state & GDK_BUTTON1_MASK)) {
                        gnome_canvas_window_to_world (canvas,
-                                                     event->button.x,
-                                                     event->button.y, &x, &y);
+                                                     event->motion.x,
+                                                     event->motion.y, &x, &y);
 
                        gnome_canvas_item_set (item,
                                               "x1", MIN (x, x0),

diff --git a/glabels1/src/item_box.c b/glabels1/src/item_box.c
index 2b110f7c23794729875ef2374ba9ae3f7ede5db4..802009478c6775a38aa7740196144742156fe493 100644 (file)
--- a/glabels1/src/item_box.c
+++ b/glabels1/src/item_box.c
@@ -470,8 +470,8 @@ gl_item_box_create_event_handler (GnomeCanvas * canvas,
        case GDK_MOTION_NOTIFY:
                if (dragging && (event->motion.state & GDK_BUTTON1_MASK)) {
                        gnome_canvas_window_to_world (canvas,
-                                                     event->button.x,
-                                                     event->button.y, &x, &y);
+                                                     event->motion.x,
+                                                     event->motion.y, &x, &y);
                        object->x = MIN (x, x0);
                        object->y = MIN (y, y0);
                        object->arg.box.w = MAX (x, x0) - MIN (x, x0);

diff --git a/glabels1/src/item_ellipse.c b/glabels1/src/item_ellipse.c
index 9b5aae2d590768b485b1cf2ea6dc948762c2b541..5a45b487e3f660455597f74bda18148cfaf332fa 100644 (file)
--- a/glabels1/src/item_ellipse.c
+++ b/glabels1/src/item_ellipse.c
@@ -474,8 +474,8 @@ gl_item_ellipse_create_event_handler (GnomeCanvas * canvas,
        case GDK_MOTION_NOTIFY:
                if (dragging && (event->motion.state & GDK_BUTTON1_MASK)) {
                        gnome_canvas_window_to_world (canvas,
-                                                     event->button.x,
-                                                     event->button.y, &x, &y);
+                                                     event->motion.x,
+                                                     event->motion.y, &x, &y);
                        object->x = MIN (x, x0);
                        object->y = MIN (y, y0);
                        object->arg.ellipse.w = MAX (x, x0) - MIN (x, x0);

diff --git a/glabels1/src/item_image.c b/glabels1/src/item_image.c
index 0dcef76b392c6e6dfae303e381b282e97535d8b1..4eee6c6512efba573e66882d546ee48bdf9ee156 100644 (file)
--- a/glabels1/src/item_image.c
+++ b/glabels1/src/item_image.c
@@ -593,8 +593,8 @@ gl_item_image_create_event_handler (GnomeCanvas * canvas,
        case GDK_MOTION_NOTIFY:
                if (dragging && (event->motion.state & GDK_BUTTON1_MASK)) {
                        gnome_canvas_window_to_world (canvas,
-                                                     event->button.x,
-                                                     event->button.y, &x, &y);
+                                                     event->motion.x,
+                                                     event->motion.y, &x, &y);
                        object->x = MIN (x, x0);
                        object->y = MIN (y, y0);
                        object->arg.image.w = MAX (x, x0) - MIN (x, x0);

diff --git a/glabels1/src/item_line.c b/glabels1/src/item_line.c
index daf30ec83fc216f8f99cbecafe84c9d9bc687dae..9d14abe8cef5fc546101c770cabfb3a5b577220f 100644 (file)
--- a/glabels1/src/item_line.c
+++ b/glabels1/src/item_line.c
@@ -462,8 +462,8 @@ gl_item_line_create_event_handler (GnomeCanvas * canvas,
        case GDK_MOTION_NOTIFY:
                if (dragging && (event->motion.state & GDK_BUTTON1_MASK)) {
                        gnome_canvas_window_to_world (canvas,
-                                                     event->button.x,
-                                                     event->button.y, &x, &y);
+                                                     event->motion.x,
+                                                     event->motion.y, &x, &y);
                        object->x = x0;
                        object->y = y0;
                        object->arg.line.dx = (x - x0);