From 71c463ae8548fa6c32aec43158f447430fc26af6 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 17 Nov 2017 13:03:11 -0500 Subject: [PATCH] x11: Drop GdkX11Visual as public api There was no useful functionality left here, so just remove this from the api altogether. --- gdk/x11/gdkglcontext-x11.c | 1 - gdk/x11/gdkglcontext-x11.h | 2 +- gdk/x11/gdkscreen-x11.h | 2 +- gdk/x11/gdkvisual-x11.h | 37 +++++++++++++++++++ gdk/x11/gdkx-autocleanups.h | 1 - gdk/x11/gdkx.h | 1 - gdk/x11/gdkx11visual.h | 74 ------------------------------------- 7 files changed, 39 insertions(+), 79 deletions(-) delete mode 100644 gdk/x11/gdkx11visual.h diff --git a/gdk/x11/gdkglcontext-x11.c b/gdk/x11/gdkglcontext-x11.c index 871c8129f9..74911ddbd9 100644 --- a/gdk/x11/gdkglcontext-x11.c +++ b/gdk/x11/gdkglcontext-x11.c @@ -29,7 +29,6 @@ #include "gdkx11glcontext.h" #include "gdkx11screen.h" #include "gdkx11window.h" -#include "gdkx11visual.h" #include "gdkvisual-x11.h" #include "gdkx11property.h" #include diff --git a/gdk/x11/gdkglcontext-x11.h b/gdk/x11/gdkglcontext-x11.h index af5ea6586d..f5af2115df 100644 --- a/gdk/x11/gdkglcontext-x11.h +++ b/gdk/x11/gdkglcontext-x11.h @@ -29,7 +29,7 @@ #include "gdkglcontextprivate.h" #include "gdkdisplayprivate.h" -#include "gdkx11visual.h" +#include "gdkvisual-x11.h" #include "gdkwindow.h" #include "gdkinternals.h" diff --git a/gdk/x11/gdkscreen-x11.h b/gdk/x11/gdkscreen-x11.h index 482052626b..0b14d31df0 100644 --- a/gdk/x11/gdkscreen-x11.h +++ b/gdk/x11/gdkscreen-x11.h @@ -23,7 +23,7 @@ #define __GDK_X11_SCREEN__ #include "gdkx11screen.h" -#include "gdkx11visual.h" +#include "gdkvisual-x11.h" #include #include diff --git a/gdk/x11/gdkvisual-x11.h b/gdk/x11/gdkvisual-x11.h index 807c577946..9b3bdd5ee3 100644 --- a/gdk/x11/gdkvisual-x11.h +++ b/gdk/x11/gdkvisual-x11.h @@ -18,6 +18,34 @@ G_BEGIN_DECLS +#include +#include + +#include +#include + +G_BEGIN_DECLS + +#define GDK_TYPE_X11_VISUAL (gdk_x11_visual_get_type ()) +#define GDK_X11_VISUAL(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_X11_VISUAL, GdkX11Visual)) +#define GDK_X11_VISUAL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_X11_VISUAL, GdkX11VisualClass)) +#define GDK_IS_X11_VISUAL(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_X11_VISUAL)) +#define GDK_IS_X11_VISUAL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_X11_VISUAL)) +#define GDK_X11_VISUAL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_X11_VISUAL, GdkX11VisualClass)) + +typedef struct _GdkX11Visual GdkX11Visual; +typedef struct _GdkX11VisualClass GdkX11VisualClass; + +typedef enum +{ + GDK_VISUAL_STATIC_GRAY, + GDK_VISUAL_GRAYSCALE, + GDK_VISUAL_STATIC_COLOR, + GDK_VISUAL_PSEUDO_COLOR, + GDK_VISUAL_TRUE_COLOR, + GDK_VISUAL_DIRECT_COLOR +} GdkVisualType; + struct _GdkX11Visual { GObject parent_instance; @@ -35,6 +63,15 @@ struct _GdkX11Visual Visual *xvisual; }; +GType gdk_x11_visual_get_type (void); + +Visual * gdk_x11_visual_get_xvisual (GdkX11Visual *visual); + +#define GDK_VISUAL_XVISUAL(visual) (gdk_x11_visual_get_xvisual (visual)) + +GdkX11Visual* gdk_x11_screen_lookup_visual (GdkX11Screen *screen, + VisualID xvisualid); + G_END_DECLS #endif diff --git a/gdk/x11/gdkx-autocleanups.h b/gdk/x11/gdkx-autocleanups.h index 90b47dcff8..d18abfa48b 100644 --- a/gdk/x11/gdkx-autocleanups.h +++ b/gdk/x11/gdkx-autocleanups.h @@ -31,7 +31,6 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkX11DragContext, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkX11GLContext, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkX11Keymap, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkX11Screen, g_object_unref) -G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkX11Visual, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkX11Window, g_object_unref) #endif diff --git a/gdk/x11/gdkx.h b/gdk/x11/gdkx.h index 87960fdfc8..153b4a501e 100644 --- a/gdk/x11/gdkx.h +++ b/gdk/x11/gdkx.h @@ -48,7 +48,6 @@ #include #include #include -#include #include #include diff --git a/gdk/x11/gdkx11visual.h b/gdk/x11/gdkx11visual.h deleted file mode 100644 index 2bdd7776c5..0000000000 --- a/gdk/x11/gdkx11visual.h +++ /dev/null @@ -1,74 +0,0 @@ -/* GDK - The GIMP Drawing Kit - * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library. If not, see . - */ - -/* - * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS - * file for a list of people on the GTK+ Team. See the ChangeLog - * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. - */ - -#ifndef __GDK_X11_VISUAL_H__ -#define __GDK_X11_VISUAL_H__ - -#if !defined (__GDKX_H_INSIDE__) && !defined (GDK_COMPILATION) -#error "Only can be included directly." -#endif - -#include -#include - -#include -#include - -G_BEGIN_DECLS - -#define GDK_TYPE_X11_VISUAL (gdk_x11_visual_get_type ()) -#define GDK_X11_VISUAL(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_X11_VISUAL, GdkX11Visual)) -#define GDK_X11_VISUAL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_X11_VISUAL, GdkX11VisualClass)) -#define GDK_IS_X11_VISUAL(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_X11_VISUAL)) -#define GDK_IS_X11_VISUAL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_X11_VISUAL)) -#define GDK_X11_VISUAL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_X11_VISUAL, GdkX11VisualClass)) - -typedef struct _GdkX11Visual GdkX11Visual; -typedef struct _GdkX11VisualClass GdkX11VisualClass; - -typedef enum -{ - GDK_VISUAL_STATIC_GRAY, - GDK_VISUAL_GRAYSCALE, - GDK_VISUAL_STATIC_COLOR, - GDK_VISUAL_PSEUDO_COLOR, - GDK_VISUAL_TRUE_COLOR, - GDK_VISUAL_DIRECT_COLOR -} GdkVisualType; - -GDK_AVAILABLE_IN_ALL -GType gdk_x11_visual_get_type (void); - -GDK_AVAILABLE_IN_ALL -Visual * gdk_x11_visual_get_xvisual (GdkX11Visual *visual); - -#define GDK_VISUAL_XVISUAL(visual) (gdk_x11_visual_get_xvisual (visual)) - -GDK_AVAILABLE_IN_ALL -GdkX11Visual* gdk_x11_screen_lookup_visual (GdkX11Screen *screen, - VisualID xvisualid); - -G_END_DECLS - -#endif /* __GDK_X11_VISUAL_H__ */