x11: Move visual-specific API into gdkx11visual.h

diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index 0aeb3aba9f58188fdd8bb441d21dd652b0ec46a7..9f793c7130779e0a4edb37fa6802fff72e979e1f 100644 (file)
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -217,6 +217,7 @@ x11_introspection_files =           \
        x11/xsettings-common.c          \
         x11/gdkx.h                     \
        x11/gdkx11cursor.h              \
+       x11/gdkx11visual.h              \
        x11/gdkx11window.h
 
 GdkX11-3.0.gir: libgdk-3.0.la Gdk-3.0.gir Makefile

diff --git a/gdk/x11/Makefile.am b/gdk/x11/Makefile.am
index 1776ba9702085942853688a8ef5e43d0831549a9..64e8d36d205db7a62e80f7612834e2d45331b684 100644 (file)
--- a/gdk/x11/Makefile.am
+++ b/gdk/x11/Makefile.am
@@ -77,6 +77,7 @@ libgdkinclude_HEADERS =       \
 
 libgdkx11include_HEADERS =     \
        gdkx11cursor.h          \
+       gdkx11visual.h          \
        gdkx11window.h
 
 noinst_PROGRAMS = checksettings

diff --git a/gdk/x11/gdkx.h b/gdk/x11/gdkx.h
index fe56240e21c8bbf9aa52eddfbb750111523e2041..fd5d9af82bb522631bfafbbb869b418018ba48b2 100644 (file)
--- a/gdk/x11/gdkx.h
+++ b/gdk/x11/gdkx.h
@@ -56,6 +56,7 @@
 #define __GDKX_H_INSIDE__
 
 #include <gdk/x11/gdkx11cursor.h>
+#include <gdk/x11/gdkx11visual.h>
 #include <gdk/x11/gdkx11window.h>
 
 #undef __GDKX_H_INSIDE__
@@ -63,7 +64,6 @@
 G_BEGIN_DECLS
 
 Display *gdk_x11_display_get_xdisplay     (GdkDisplay  *display);
-Visual * gdk_x11_visual_get_xvisual       (GdkVisual   *visual);
 Screen * gdk_x11_screen_get_xscreen       (GdkScreen   *screen);
 int      gdk_x11_screen_get_screen_number (GdkScreen   *screen);
 
@@ -119,11 +119,6 @@ gint     gdk_x11_get_default_screen       (void);
  */
 #define GDK_SCREEN_XNUMBER(screen)    (gdk_x11_screen_get_screen_number (screen))
 
-#define GDK_VISUAL_XVISUAL(visual)    (gdk_x11_visual_get_xvisual (visual))
-
-GdkVisual* gdk_x11_screen_lookup_visual (GdkScreen *screen,
-                                         VisualID   xvisualid);
-
 guint32       gdk_x11_display_get_user_time (GdkDisplay *display);
 
 G_CONST_RETURN gchar *gdk_x11_display_get_startup_notification_id (GdkDisplay *display);

diff --git a/gdk/x11/gdkx11visual.h b/gdk/x11/gdkx11visual.h
new file mode 100644 (file)
index 0000000..db328a7
--- /dev/null
+++ b/gdk/x11/gdkx11visual.h
@@ -0,0 +1,50 @@
+/* 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, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+/*
+ * 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/. 
+ */
+
+#if !defined (__GDKX_H_INSIDE__) && !defined (GDK_COMPILATION)
+#error "Only <gdk/gdkx.h> can be included directly."
+#endif
+
+#ifndef __GDK_X11_VISUAL_H__
+#define __GDK_X11_VISUAL_H__
+
+#include <gdk/gdk.h>
+
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+
+G_BEGIN_DECLS
+
+Visual * gdk_x11_visual_get_xvisual       (GdkVisual   *visual);
+
+#define GDK_VISUAL_XVISUAL(visual)    (gdk_x11_visual_get_xvisual (visual))
+
+GdkVisual* gdk_x11_screen_lookup_visual (GdkScreen *screen,
+                                         VisualID   xvisualid);
+
+G_END_DECLS
+
+#endif /* __GDK_X11_VISUAL_H__ */