[gtk/wip/chergert/quartz4u] make things compile

[Christian Hergert <chergert src gnome org>]

commit 5e7a2d5f4bb53b4d0ef1f57a354941d92dce6ffb
Author: Christian Hergert <chergert redhat com>
Date:   Mon Apr 27 15:29:06 2020 -0700

    make things compile

 gdk/macos/GdkMacosWindow.c                              |  6 ++----
 gdk/macos/gdkmacosdevice.c                              |  4 +++-
 .../{gdkmacosdevice-private.h => gdkmacosdevice.h}      |  9 +++++----
 gdk/macos/gdkmacosdragsurface.c                         | 17 +++++++++++------
 gdk/macos/gdkmacospopupsurface.c                        |  7 ++++++-
 gdk/macos/gdkmacosseat.c                                |  2 +-
 gdk/macos/gdkmacossurface-private.h                     | 17 ++++++++++++-----
 gdk/macos/gdkmacostoplevelsurface.c                     |  7 ++++++-
 8 files changed, 46 insertions(+), 23 deletions(-)
---
diff --git a/gdk/macos/GdkMacosWindow.c b/gdk/macos/GdkMacosWindow.c
index c1b4b0ba4b..2d370e221b 100644
--- a/gdk/macos/GdkMacosWindow.c
+++ b/gdk/macos/GdkMacosWindow.c
@@ -26,6 +26,7 @@
 #import "GdkMacosWindow.h"
 
 #include "gdkmacossurface-private.h"
+
 #include "gdksurfaceprivate.h"
 
 @implementation GdkMacosWindow
@@ -305,10 +306,7 @@
 
 -(BOOL)canBecomeMainWindow
 {
-  GdkMacosSurface *surface = self->gdkSurface;
-  GdkSurfaceType surface_type = _gdk_macos_surface_get_surface_type (surface);
-
-  return surface_type == GDK_SURFACE_TOPLEVEL;
+  return GDK_IS_TOPLEVEL (self->gdkSurface);
 }
 
 -(BOOL)canBecomeKeyWindow
diff --git a/gdk/macos/gdkmacosdevice.c b/gdk/macos/gdkmacosdevice.c
index 3a1d50a1a7..7a0b2490dc 100644
--- a/gdk/macos/gdkmacosdevice.c
+++ b/gdk/macos/gdkmacosdevice.c
@@ -21,7 +21,9 @@
 
 #include <gdk/gdk.h>
 
-#include "gdkmacosdevice-private.h"
+#include "gdkdeviceprivate.h"
+
+#include "gdkmacosdevice.h"
 
 struct _GdkMacosDevice
 {
diff --git a/gdk/macos/gdkmacosdevice-private.h b/gdk/macos/gdkmacosdevice.h
similarity index 89%
rename from gdk/macos/gdkmacosdevice-private.h
rename to gdk/macos/gdkmacosdevice.h
index 4c41219b60..c81fde5d1a 100644
--- a/gdk/macos/gdkmacosdevice-private.h
+++ b/gdk/macos/gdkmacosdevice.h
@@ -17,14 +17,14 @@
  * SPDX-License-Identifier: LGPL-2.1-or-later
  */
 
-#ifndef __GDK_MACOS_DEVICE_PRIVATE_H__
-#define __GDK_MACOS_DEVICE_PRIVATE_H__
+#ifndef __GDK_MACOS_DEVICE_H__
+#define __GDK_MACOS_DEVICE_H__
 
 #if !defined (__GDKMACOS_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/macos/gdkmacos.h> can be included directly."
 #endif
 
-#include "gdkdeviceprivate.h"
+#include <gdk/gdk.h>
 
 G_BEGIN_DECLS
 
@@ -35,8 +35,9 @@ typedef struct _GdkMacosDeviceClass GdkMacosDeviceClass;
 #define GDK_MACOS_DEVICE(object)    (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_MACOS_DEVICE, 
GdkMacosDevice))
 #define GDK_IS_MACOS_DEVICE(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_MACOS_DEVICE))
 
+GDK_AVAILABLE_IN_ALL
 GType gdk_macos_device_get_type (void);
 
 G_END_DECLS
 
-#endif /* __GDK_MACOS_DEVICE_PRIVATE_H__ */
+#endif /* __GDK_MACOS_DEVICE_H__ */
diff --git a/gdk/macos/gdkmacosdragsurface.c b/gdk/macos/gdkmacosdragsurface.c
index e84945d64d..c975b230f5 100644
--- a/gdk/macos/gdkmacosdragsurface.c
+++ b/gdk/macos/gdkmacosdragsurface.c
@@ -28,6 +28,11 @@ struct _GdkMacosDragSurface
   GdkMacosSurface parent_instance;
 };
 
+struct _GdkMacosDragSurfaceClass
+{
+  GdkMacosSurfaceClass parent_instance;
+};
+
 static void
 drag_surface_iface_init (GdkDragSurfaceInterface *iface)
 {
@@ -51,17 +56,17 @@ _gdk_macos_drag_surface_class_init (GdkMacosDragSurfaceClass *klass)
 }
 
 static void
-_gdk_macos_drag_surface_init (Gdkmacosdragsurface *self)
+_gdk_macos_drag_surface_init (GdkMacosDragSurface *self)
 {
 }
 
 GdkMacosSurface *
 _gdk_macos_drag_surface_new (GdkMacosDisplay *display,
-                                 GdkSurface      *parent,
-                                 int              x,
-                                 int              y,
-                                 int              width,
-                                 int              height)
+                             GdkSurface      *parent,
+                             int              x,
+                             int              y,
+                             int              width,
+                             int              height)
 {
   g_return_val_if_fail (GDK_IS_MACOS_DISPLAY (display), NULL);
   g_return_val_if_fail (!parent || GDK_IS_MACOS_SURFACE (parent), NULL);
diff --git a/gdk/macos/gdkmacospopupsurface.c b/gdk/macos/gdkmacospopupsurface.c
index e51b5ab536..20fc01b548 100644
--- a/gdk/macos/gdkmacospopupsurface.c
+++ b/gdk/macos/gdkmacospopupsurface.c
@@ -28,6 +28,11 @@ struct _GdkMacosPopupSurface
   GdkMacosSurface parent_instance;
 };
 
+struct _GdkMacosPopupSurfaceClass
+{
+  GdkMacosSurfaceClass parent_class;
+};
+
 static void
 popup_interface_init (GdkPopupInterface *iface)
 {
@@ -53,7 +58,7 @@ _gdk_macos_popup_surface_class_init (GdkMacosPopupSurfaceClass *klass)
 }
 
 static void
-_gdk_macos_popup_surface_init (Gdkmacospopupsurface *self)
+_gdk_macos_popup_surface_init (GdkMacosPopupSurface *self)
 {
 }
 
diff --git a/gdk/macos/gdkmacosseat.c b/gdk/macos/gdkmacosseat.c
index 04282a9744..b396ec565d 100644
--- a/gdk/macos/gdkmacosseat.c
+++ b/gdk/macos/gdkmacosseat.c
@@ -24,7 +24,7 @@
 #include "gdkdeviceprivate.h"
 #include "gdkseatdefaultprivate.h"
 
-#include "gdkmacosdevice-private.h"
+#include "gdkmacosdevice.h"
 #include "gdkmacosseat-private.h"
 
 GdkSeat *
diff --git a/gdk/macos/gdkmacossurface-private.h b/gdk/macos/gdkmacossurface-private.h
index e67648f6d8..24262585c0 100644
--- a/gdk/macos/gdkmacossurface-private.h
+++ b/gdk/macos/gdkmacossurface-private.h
@@ -37,11 +37,18 @@ struct _GdkMacosSurfaceClass
   GdkSurfaceClass parent_class;
 };
 
-void _gdk_macos_surface_get_shadow (GdkMacosSurface *self,
-                                    gint            *top,
-                                    gint            *right,
-                                    gint            *bottom,
-                                    gint            *left);
+GdkMacosSurface *_gdk_macos_surface_new        (GdkMacosDisplay *display,
+                                                GdkSurfaceType   surface_type,
+                                                GdkSurface      *parent,
+                                                int              x,
+                                                int              y,
+                                                int              width,
+                                                int              height);
+void             _gdk_macos_surface_get_shadow (GdkMacosSurface *self,
+                                                gint            *top,
+                                                gint            *right,
+                                                gint            *bottom,
+                                                gint            *left);
 
 G_END_DECLS
 
diff --git a/gdk/macos/gdkmacostoplevelsurface.c b/gdk/macos/gdkmacostoplevelsurface.c
index a260e21a88..c19747ab31 100644
--- a/gdk/macos/gdkmacostoplevelsurface.c
+++ b/gdk/macos/gdkmacostoplevelsurface.c
@@ -28,6 +28,11 @@ struct _GdkMacosToplevelSurface
   GdkMacosSurface parent_instance;
 };
 
+struct _GdkMacosToplevelSurfaceClass
+{
+  GdkMacosSurfaceClass parent_instance;
+};
+
 static void
 toplevel_iface_init (GdkToplevelInterface *iface)
 {
@@ -53,7 +58,7 @@ _gdk_macos_toplevel_surface_class_init (GdkMacosToplevelSurfaceClass *klass)
 }
 
 static void
-_gdk_macos_toplevel_surface_init (Gdkmacostoplevelsurface *self)
+_gdk_macos_toplevel_surface_init (GdkMacosToplevelSurface *self)
 {
 }