[glom] Fix the build with latest GTK+ with --enable-warnings=fatal



commit c2ed7d809f758189676b8d55551a830441510b3f
Author: Murray Cumming <murrayc murrayc com>
Date:   Fri Nov 18 13:43:56 2011 +0100

    Fix the build with latest GTK+ with --enable-warnings=fatal
    
    * glom/utility_widgets/eggspreadtable/eggspreadtablednd.c
    (set_drag_icon): Update from libegg to fix the build with deprecated GTK+
      API disabled.

 ChangeLog                                          |    8 ++++++++
 .../eggspreadtable/eggspreadtablednd.c             |    7 ++++++-
 2 files changed, 14 insertions(+), 1 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 2dd1d28..124fec3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2011-11-18  Murray Cumming  <murrayc murrayc com>
 
+	Fix the build with latest GTK+ with --enable-warnings=fatal
+
+	* glom/utility_widgets/eggspreadtable/eggspreadtablednd.c
+	(set_drag_icon): Update from libegg to fix the build with deprecated GTK+ 
+  API disabled.
+
+2011-11-18  Murray Cumming  <murrayc murrayc com>
+
 	Details: Move the checkbutton titles to the left.
 
 	* glom/mode_data/datawidget/checkbutton.h: Contructor:
diff --git a/glom/utility_widgets/eggspreadtable/eggspreadtablednd.c b/glom/utility_widgets/eggspreadtable/eggspreadtablednd.c
index b07715a..1c475ec 100644
--- a/glom/utility_widgets/eggspreadtable/eggspreadtablednd.c
+++ b/glom/utility_widgets/eggspreadtable/eggspreadtablednd.c
@@ -975,12 +975,17 @@ set_drag_icon (GtkWidget      *widget,
   GtkStyleContext *style;
   GdkPixbuf       *pixbuf;
   gint             hot_x, hot_y;
+  GdkModifierType  modifier_mask;
 
   /* XXX Force allocate here ? need to absolutely have an allocated widget
    * for this to work (gtk_widget_draw() needs that). */
 
   gtk_widget_get_allocation (widget, &allocation);
-  gtk_widget_get_pointer (widget, &hot_x, &hot_y);
+
+  gdk_window_get_device_position(
+    gtk_widget_get_window (widget),
+    gtk_get_current_event_device (),
+    &hot_x, &hot_y, &modifier_mask);
 
   surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, allocation.width, allocation.height);
   cr      = cairo_create (surface);



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]