From 4e836493cc59f62d94cf7daeb1872fe14525dd91 Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Fri, 24 Sep 2021 21:04:47 +0200 Subject: [PATCH] macos: Don't include gdkinternals.h --- gdk/macos/GdkMacosBaseView.c | 4 ++-- gdk/macos/GdkMacosCairoSubview.c | 1 - gdk/macos/GdkMacosCairoView.c | 1 - gdk/macos/GdkMacosGLView.c | 1 - gdk/macos/GdkMacosWindow.c | 1 + gdk/macos/gdkmacosdisplay-translate.c | 2 ++ gdk/macos/gdkmacosdrag.c | 11 +++++++---- gdk/macos/gdkmacoseventsource.c | 4 ++-- gdk/macos/gdkmacosglcontext-private.h | 1 - gdk/macos/gdkmacosglcontext.c | 1 - gdk/macos/gdkmacospopupsurface.c | 5 +++-- gdk/macos/gdkmacossurface-private.h | 1 - gdk/macos/gdkmacossurface.c | 6 ++++-- gdk/macos/gdkmacostoplevelsurface.c | 5 +++-- 14 files changed, 24 insertions(+), 20 deletions(-) diff --git a/gdk/macos/GdkMacosBaseView.c b/gdk/macos/GdkMacosBaseView.c index c4ba8c1020..ddce1241a3 100644 --- a/gdk/macos/GdkMacosBaseView.c +++ b/gdk/macos/GdkMacosBaseView.c @@ -25,11 +25,11 @@ #import "GdkMacosBaseView.h" #import "GdkMacosWindow.h" -#include "gdkinternals.h" - #include "gdkmacosdisplay-private.h" #include "gdkmacossurface-private.h" +#include "gdkdebug.h" + @implementation GdkMacosBaseView -(id)initWithFrame:(NSRect)frameRect diff --git a/gdk/macos/GdkMacosCairoSubview.c b/gdk/macos/GdkMacosCairoSubview.c index e52acdf168..af79f5e879 100644 --- a/gdk/macos/GdkMacosCairoSubview.c +++ b/gdk/macos/GdkMacosCairoSubview.c @@ -23,7 +23,6 @@ #include #include -#include "gdkinternals.h" #import "GdkMacosCairoSubview.h" #import "GdkMacosCairoView.h" diff --git a/gdk/macos/GdkMacosCairoView.c b/gdk/macos/GdkMacosCairoView.c index 81ac8af6a3..3e830c6a28 100644 --- a/gdk/macos/GdkMacosCairoView.c +++ b/gdk/macos/GdkMacosCairoView.c @@ -24,7 +24,6 @@ #include #include -#include "gdkinternals.h" #import "GdkMacosCairoView.h" #import "GdkMacosCairoSubview.h" diff --git a/gdk/macos/GdkMacosGLView.c b/gdk/macos/GdkMacosGLView.c index 7945184c0b..d7f6437451 100644 --- a/gdk/macos/GdkMacosGLView.c +++ b/gdk/macos/GdkMacosGLView.c @@ -23,7 +23,6 @@ #include #include -#include "gdkinternals.h" #include "gdkmacossurface-private.h" #import "GdkMacosGLView.h" diff --git a/gdk/macos/GdkMacosWindow.c b/gdk/macos/GdkMacosWindow.c index 714a5047cd..750c21d966 100644 --- a/gdk/macos/GdkMacosWindow.c +++ b/gdk/macos/GdkMacosWindow.c @@ -37,6 +37,7 @@ #include "gdkmacostoplevelsurface-private.h" #include "gdkmacosutils-private.h" +#include "gdkeventsprivate.h" #include "gdkmonitorprivate.h" #include "gdksurfaceprivate.h" diff --git a/gdk/macos/gdkmacosdisplay-translate.c b/gdk/macos/gdkmacosdisplay-translate.c index d64dd79e5b..3400d0f9c3 100644 --- a/gdk/macos/gdkmacosdisplay-translate.c +++ b/gdk/macos/gdkmacosdisplay-translate.c @@ -30,6 +30,8 @@ #include "gdkmacossurface-private.h" #include "gdkmacosseat-private.h" +#include "gdk/gdkeventsprivate.h" + #define GDK_MOD2_MASK (1 << 4) #define GRIP_WIDTH 15 #define GRIP_HEIGHT 15 diff --git a/gdk/macos/gdkmacosdrag.c b/gdk/macos/gdkmacosdrag.c index 24e57a5965..cd61c44e1a 100644 --- a/gdk/macos/gdkmacosdrag.c +++ b/gdk/macos/gdkmacosdrag.c @@ -19,16 +19,19 @@ #include "config.h" -#include "gdkdeviceprivate.h" -#include "gdkintl.h" -#include "gdk-private.h" +#include "gdkmacosdrag-private.h" #include "gdkmacosdevice-private.h" #include "gdkmacoscursor-private.h" #include "gdkmacosdisplay-private.h" -#include "gdkmacosdrag-private.h" #include "gdkmacosdragsurface-private.h" +#include "gdk/gdkdeviceprivate.h" +#include "gdk/gdkeventsprivate.h" +#include "gdk/gdkintl.h" +#include "gdk/gdkseatprivate.h" +#include "gdk/gdk-private.h" + #define BIG_STEP 20 #define SMALL_STEP 1 #define ANIM_TIME 500000 /* .5 seconds */ diff --git a/gdk/macos/gdkmacoseventsource.c b/gdk/macos/gdkmacoseventsource.c index b039d04615..4ba14f26e4 100644 --- a/gdk/macos/gdkmacoseventsource.c +++ b/gdk/macos/gdkmacoseventsource.c @@ -27,12 +27,12 @@ #include #include "gdkdisplayprivate.h" -#include "gdkinternals.h" #include "gdkmacoseventsource-private.h" #include "gdkmacosdisplay-private.h" -#include "gdk-private.h" +#include "gdk/gdkeventsprivate.h" +#include "gdk/gdk-private.h" /* * This file implementations integration between the GLib main loop and diff --git a/gdk/macos/gdkmacosglcontext-private.h b/gdk/macos/gdkmacosglcontext-private.h index 533888cd2c..781035677a 100644 --- a/gdk/macos/gdkmacosglcontext-private.h +++ b/gdk/macos/gdkmacosglcontext-private.h @@ -24,7 +24,6 @@ #include "gdkglcontextprivate.h" #include "gdkdisplayprivate.h" #include "gdksurface.h" -#include "gdkinternals.h" #include "gdkmacosdisplay.h" #include "gdkmacossurface.h" diff --git a/gdk/macos/gdkmacosglcontext.c b/gdk/macos/gdkmacosglcontext.c index cc0b5fab15..09da35b69a 100644 --- a/gdk/macos/gdkmacosglcontext.c +++ b/gdk/macos/gdkmacosglcontext.c @@ -23,7 +23,6 @@ #include "gdkmacossurface-private.h" #include "gdkmacostoplevelsurface-private.h" -#include "gdkinternals.h" #include "gdkintl.h" #include diff --git a/gdk/macos/gdkmacospopupsurface.c b/gdk/macos/gdkmacospopupsurface.c index 60239d72ed..6f79b6d31b 100644 --- a/gdk/macos/gdkmacospopupsurface.c +++ b/gdk/macos/gdkmacospopupsurface.c @@ -21,12 +21,13 @@ #import "GdkMacosWindow.h" -#include "gdkinternals.h" +#include "gdkmacospopupsurface-private.h" + #include "gdkpopupprivate.h" +#include "gdkseatprivate.h" #include "gdkmacosdisplay-private.h" #include "gdkmacosmonitor.h" -#include "gdkmacospopupsurface-private.h" #include "gdkmacosutils-private.h" struct _GdkMacosPopupSurface diff --git a/gdk/macos/gdkmacossurface-private.h b/gdk/macos/gdkmacossurface-private.h index 8a5ee526fa..e65505f8a9 100644 --- a/gdk/macos/gdkmacossurface-private.h +++ b/gdk/macos/gdkmacossurface-private.h @@ -23,7 +23,6 @@ #include #include -#include "gdkinternals.h" #include "gdksurfaceprivate.h" #include "gdkmacosdisplay.h" diff --git a/gdk/macos/gdkmacossurface.c b/gdk/macos/gdkmacossurface.c index 88be1f513d..f94eaa2eca 100644 --- a/gdk/macos/gdkmacossurface.c +++ b/gdk/macos/gdkmacossurface.c @@ -25,10 +25,13 @@ #import "GdkMacosCairoView.h" +#include "gdkmacossurface-private.h" + #include "gdkdeviceprivate.h" #include "gdkdisplay.h" +#include "gdkeventsprivate.h" #include "gdkframeclockidleprivate.h" -#include "gdkinternals.h" +#include "gdkseatprivate.h" #include "gdksurfaceprivate.h" #include "gdkmacosdevice.h" @@ -39,7 +42,6 @@ #include "gdkmacosglcontext-private.h" #include "gdkmacosmonitor-private.h" #include "gdkmacospopupsurface-private.h" -#include "gdkmacossurface-private.h" #include "gdkmacostoplevelsurface-private.h" #include "gdkmacosutils-private.h" diff --git a/gdk/macos/gdkmacostoplevelsurface.c b/gdk/macos/gdkmacostoplevelsurface.c index 947d0b20d2..17b1cec708 100644 --- a/gdk/macos/gdkmacostoplevelsurface.c +++ b/gdk/macos/gdkmacostoplevelsurface.c @@ -21,12 +21,13 @@ #import "GdkMacosWindow.h" -#include "gdkinternals.h" +#include "gdkmacostoplevelsurface-private.h" + +#include "gdkseatprivate.h" #include "gdktoplevelprivate.h" #include "gdkmacosdisplay-private.h" #include "gdkmacosmonitor-private.h" -#include "gdkmacostoplevelsurface-private.h" #include "gdkmacosutils-private.h" static void