Drop GdkScreen from public api

It is still used by some of the backends, so keep the
files around.

diff --git a/gdk/gdk-autocleanup.h b/gdk/gdk-autocleanup.h
index 20c048f8ee67b8622904b81b16468c0942bb86dd..4941827663de5a2be88e42740a3e3fd1f7a583cd 100644 (file)
--- a/gdk/gdk-autocleanup.h
+++ b/gdk/gdk-autocleanup.h
@@ -31,7 +31,6 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkDragContext, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkFrameClock, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkGLContext, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkKeymap, g_object_unref)
-G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkScreen, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkWindow, g_object_unref)
 
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkEvent, gdk_event_free)

diff --git a/gdk/gdk.h b/gdk/gdk.h
index 945f8f885dd558d0f48e15912a3510b8b895d6c1..5ec87bbcbc38757de40931e9ef1eb85aa80b77bb 100644 (file)
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -55,7 +55,6 @@
 #include <gdk/gdkproperty.h>
 #include <gdk/gdkrectangle.h>
 #include <gdk/gdkrgba.h>
-#include <gdk/gdkscreen.h>
 #include <gdk/gdkseat.h>
 #include <gdk/gdkselection.h>
 #include <gdk/gdkthreads.h>

diff --git a/gdk/gdkapplaunchcontext.h b/gdk/gdkapplaunchcontext.h
index 739fad43b45b43d7ef4b841b18094e82c819c9df..9c9d739bbaa122ea7a919ffaed431e8c3d51a5d7 100644 (file)
--- a/gdk/gdkapplaunchcontext.h
+++ b/gdk/gdkapplaunchcontext.h
@@ -28,7 +28,6 @@
 #include <gio/gio.h>
 #include <gdk/gdkversionmacros.h>
 #include <gdk/gdktypes.h>
-#include <gdk/gdkscreen.h>
 
 G_BEGIN_DECLS
 

diff --git a/gdk/gdkscreen.h b/gdk/gdkscreen.h
index 07dac9af56353cc769f48634a7bc0a9fcf3e75d7..c6a99fc05fd4d458d37c0360d3ddbab8eecd9e5b 100644 (file)
--- a/gdk/gdkscreen.h
+++ b/gdk/gdkscreen.h
@@ -38,10 +38,8 @@ G_BEGIN_DECLS
 #define GDK_IS_SCREEN(object)      (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_SCREEN))
 
 
-GDK_AVAILABLE_IN_ALL
 GType        gdk_screen_get_type              (void) G_GNUC_CONST;
 
-GDK_AVAILABLE_IN_ALL
 GdkDisplay * gdk_screen_get_display           (GdkScreen   *screen);
 
 G_END_DECLS

diff --git a/gdk/meson.build b/gdk/meson.build
index c14a8a692bf00a944d6235588ac26e780adcb415..9857dc397659f294d968226bcc1fbff4d7f0b860 100644 (file)
--- a/gdk/meson.build
+++ b/gdk/meson.build
@@ -66,7 +66,6 @@ gdk_public_headers = files([
   'gdkproperty.h',
   'gdkrectangle.h',
   'gdkrgba.h',
-  'gdkscreen.h',
   'gdkseat.h',
   'gdkselection.h',
   'gdkthreads.h',