Do not use deprecated gdk_display_get_core_pointer()

[~andy/gtk] / gdk / gdkevents.c

diff --git a/gdk/gdkevents.c b/gdk/gdkevents.c
index fb9373aee1a2c678e1a34d56009f14fb3d557908..053e6d531181fc8c62eece3dcbed6f4de03a71fd 100644 (file)
--- a/gdk/gdkevents.c
+++ b/gdk/gdkevents.c
@@ -972,7 +972,7 @@ gdk_event_set_device (GdkEvent  *event,
  * If the event contains a "device" field, this function will return
  * it, else it will return %NULL.
  *
- * Returns: a #GdkDevice, or %NULL.
+ * Returns: (transfer none): a #GdkDevice, or %NULL.
  *
  * Since: 3.0
  **/
@@ -1033,13 +1033,15 @@ gdk_event_get_device (const GdkEvent *event)
       {
         GdkDisplay *display;
         GdkDevice *core_pointer;
+        GdkDeviceManager *device_manager;
 
         g_warning ("Event with type %d not holding a GdkDevice. "
                    "It is most likely synthesized outside Gdk/GTK+\n",
                    event->type);
 
         display = gdk_drawable_get_display (event->any.window);
-        core_pointer = gdk_display_get_core_pointer (display);
+        device_manager = gdk_display_get_device_manager (display);
+        core_pointer = gdk_device_manager_get_client_pointer (device_manager);
 
         if (event->type == GDK_KEY_PRESS ||
             event->type == GDK_KEY_RELEASE)
@@ -1445,7 +1447,6 @@ gdk_synthesize_window_state (GdkWindow     *window,
   switch (((GdkWindowObject*) window)->window_type)
     {
     case GDK_WINDOW_TOPLEVEL:
-    case GDK_WINDOW_DIALOG:
     case GDK_WINDOW_TEMP: /* ? */
       gdk_display_put_event (gdk_drawable_get_display (window), &temp_event);
       break;
@@ -1512,17 +1513,9 @@ gdk_display_set_double_click_distance (GdkDisplay *display,
   display->double_click_distance = distance;
 }
 
-GType
-gdk_event_get_type (void)
-{
-  static GType our_type = 0;
-  
-  if (our_type == 0)
-    our_type = g_boxed_type_register_static (g_intern_static_string ("GdkEvent"),
-                                            (GBoxedCopyFunc)gdk_event_copy,
-                                            (GBoxedFreeFunc)gdk_event_free);
-  return our_type;
-}
+G_DEFINE_BOXED_TYPE (GdkEvent, gdk_event,
+                     gdk_event_copy,
+                     gdk_event_free)
 
 /**
  * gdk_setting_get: