Merge branch 'move-gdkgrab-decl' into 'master'

gdk: Move GdkGrabStatus and GdkGrabOwnership decl.

See merge request GNOME/gtk!1615

gdk/broadway/broadway-server.c

@@ -7,6 +7,7 @@
 #include <glib.h>
 #include <glib/gprintf.h>
 #include "gdktypes.h"
+#include "gdkinternals.h"
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>

gdk/broadway/gdkbroadway-server.h

@@ -3,6 +3,7 @@
 
 #include <gdk/gdktypes.h>
 #include "broadway-protocol.h"
+#include "gdkinternals.h"
 
 typedef struct _GdkBroadwayServer GdkBroadwayServer;
 typedef struct _GdkBroadwayServerClass GdkBroadwayServerClass;

gdk/gdkdeviceprivate.h

@@ -22,6 +22,7 @@
 #include "gdkdevicetool.h"
 #include "gdkevents.h"
 #include "gdkseat.h"
+#include "gdkinternals.h"
 
 G_BEGIN_DECLS
 

gdk/gdkinternals.h

@@ -224,6 +224,45 @@ void gdk_synthesize_surface_state (GdkSurface     *surface,
                                    GdkSurfaceState unset_flags,
                                    GdkSurfaceState set_flags);
 
+/**
+ * GdkGrabStatus:
+ * @GDK_GRAB_SUCCESS: the resource was successfully grabbed.
+ * @GDK_GRAB_ALREADY_GRABBED: the resource is actively grabbed by another client.
+ * @GDK_GRAB_INVALID_TIME: the resource was grabbed more recently than the
+ *  specified time.
+ * @GDK_GRAB_NOT_VIEWABLE: the grab surface or the @confine_to surface are not
+ *  viewable.
+ * @GDK_GRAB_FROZEN: the resource is frozen by an active grab of another client.
+ * @GDK_GRAB_FAILED: the grab failed for some other reason
+ *
+ * Returned by gdk_device_grab() to indicate success or the reason for the
+ * failure of the grab attempt.
+ */
+typedef enum
+{
+  GDK_GRAB_SUCCESS         = 0,
+  GDK_GRAB_ALREADY_GRABBED = 1,
+  GDK_GRAB_INVALID_TIME    = 2,
+  GDK_GRAB_NOT_VIEWABLE    = 3,
+  GDK_GRAB_FROZEN          = 4,
+  GDK_GRAB_FAILED          = 5
+} GdkGrabStatus;
+
+/**
+ * GdkGrabOwnership:
+ * @GDK_OWNERSHIP_NONE: All other devices’ events are allowed.
+ * @GDK_OWNERSHIP_SURFACE: Other devices’ events are blocked for the grab surface.
+ * @GDK_OWNERSHIP_APPLICATION: Other devices’ events are blocked for the whole application.
+ *
+ * Defines how device grabs interact with other devices.
+ */
+typedef enum
+{
+  GDK_OWNERSHIP_NONE,
+  GDK_OWNERSHIP_SURFACE,
+  GDK_OWNERSHIP_APPLICATION
+} GdkGrabOwnership;
+
 GdkGrabStatus gdk_device_grab (GdkDevice        *device,
                                GdkSurface        *surface,
                                GdkGrabOwnership  grab_ownership,

gdk/gdktypes.h

@@ -341,45 +341,6 @@ typedef enum
   GDK_MODIFIER_INTENT_DEFAULT_MOD_MASK,
 } GdkModifierIntent;
 
-/**
- * GdkGrabStatus:
- * @GDK_GRAB_SUCCESS: the resource was successfully grabbed.
- * @GDK_GRAB_ALREADY_GRABBED: the resource is actively grabbed by another client.
- * @GDK_GRAB_INVALID_TIME: the resource was grabbed more recently than the
- *  specified time.
- * @GDK_GRAB_NOT_VIEWABLE: the grab surface or the @confine_to surface are not
- *  viewable.
- * @GDK_GRAB_FROZEN: the resource is frozen by an active grab of another client.
- * @GDK_GRAB_FAILED: the grab failed for some other reason
- *
- * Returned by gdk_device_grab() to indicate success or the reason for the
- * failure of the grab attempt.
- */
-typedef enum
-{
-  GDK_GRAB_SUCCESS         = 0,
-  GDK_GRAB_ALREADY_GRABBED = 1,
-  GDK_GRAB_INVALID_TIME    = 2,
-  GDK_GRAB_NOT_VIEWABLE    = 3,
-  GDK_GRAB_FROZEN          = 4,
-  GDK_GRAB_FAILED          = 5
-} GdkGrabStatus;
-
-/**
- * GdkGrabOwnership:
- * @GDK_OWNERSHIP_NONE: All other devices’ events are allowed.
- * @GDK_OWNERSHIP_SURFACE: Other devices’ events are blocked for the grab surface.
- * @GDK_OWNERSHIP_APPLICATION: Other devices’ events are blocked for the whole application.
- *
- * Defines how device grabs interact with other devices.
- */
-typedef enum
-{
-  GDK_OWNERSHIP_NONE,
-  GDK_OWNERSHIP_SURFACE,
-  GDK_OWNERSHIP_APPLICATION
-} GdkGrabOwnership;
-
 /**
  * GdkEventMask:
  * @GDK_EXPOSURE_MASK: receive expose events