diff options
| -rw-r--r-- | gdk/Makefile.am | 1 | ||||
| -rw-r--r-- | gdk/x11/Makefile.am | 1 | ||||
| -rw-r--r-- | gdk/x11/gdkx.h | 18 | ||||
| -rw-r--r-- | gdk/x11/gdkx11property.h | 59 |
4 files changed, 62 insertions, 17 deletions
diff --git a/gdk/Makefile.am b/gdk/Makefile.am index ad795efb4d..2a460e2924 100644 --- a/gdk/Makefile.am +++ b/gdk/Makefile.am @@ -218,6 +218,7 @@ x11_introspection_files = \ x11/gdkx.h \ x11/gdkx11cursor.h \ x11/gdkx11display.h \ + x11/gdkx11property.h \ x11/gdkx11screen.h \ x11/gdkx11selection.h \ x11/gdkx11visual.h \ diff --git a/gdk/x11/Makefile.am b/gdk/x11/Makefile.am index 0bc6348a95..e7522fdbb0 100644 --- a/gdk/x11/Makefile.am +++ b/gdk/x11/Makefile.am @@ -78,6 +78,7 @@ libgdkinclude_HEADERS = \ libgdkx11include_HEADERS = \ gdkx11cursor.h \ gdkx11display.h \ + gdkx11property.h \ gdkx11screen.h \ gdkx11selection.h \ gdkx11visual.h \ diff --git a/gdk/x11/gdkx.h b/gdk/x11/gdkx.h index c3cea2d4a1..3f4af1fdbb 100644 --- a/gdk/x11/gdkx.h +++ b/gdk/x11/gdkx.h @@ -57,6 +57,7 @@ #include <gdk/x11/gdkx11cursor.h> #include <gdk/x11/gdkx11display.h> +#include <gdk/x11/gdkx11property.h> #include <gdk/x11/gdkx11screen.h> #include <gdk/x11/gdkx11selection.h> #include <gdk/x11/gdkx11visual.h> @@ -85,23 +86,6 @@ void gdk_x11_grab_server (void); void gdk_x11_ungrab_server (void); #endif - -/* Functions to get the X Atom equivalent to the GdkAtom */ -Atom gdk_x11_atom_to_xatom_for_display (GdkDisplay *display, - GdkAtom atom); -GdkAtom gdk_x11_xatom_to_atom_for_display (GdkDisplay *display, - Atom xatom); -Atom gdk_x11_get_xatom_by_name_for_display (GdkDisplay *display, - const gchar *atom_name); -G_CONST_RETURN gchar *gdk_x11_get_xatom_name_for_display (GdkDisplay *display, - Atom xatom); -#ifndef GDK_MULTIHEAD_SAFE -Atom gdk_x11_atom_to_xatom (GdkAtom atom); -GdkAtom gdk_x11_xatom_to_atom (Atom xatom); -Atom gdk_x11_get_xatom_by_name (const gchar *atom_name); -G_CONST_RETURN gchar *gdk_x11_get_xatom_name (Atom xatom); -#endif - G_END_DECLS #endif /* __GDK_X_H__ */ diff --git a/gdk/x11/gdkx11property.h b/gdk/x11/gdkx11property.h new file mode 100644 index 0000000000..64fb97865d --- /dev/null +++ b/gdk/x11/gdkx11property.h @@ -0,0 +1,59 @@ +/* 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_PROPERTY_H__ +#define __GDK_X11_PROPERTY_H__ + +#include <gdk/gdk.h> + +#include <X11/Xlib.h> +#include <X11/Xutil.h> + +G_BEGIN_DECLS + +/* Functions to get the X Atom equivalent to the GdkAtom */ +Atom gdk_x11_atom_to_xatom_for_display (GdkDisplay *display, + GdkAtom atom); +GdkAtom gdk_x11_xatom_to_atom_for_display (GdkDisplay *display, + Atom xatom); +Atom gdk_x11_get_xatom_by_name_for_display (GdkDisplay *display, + const gchar *atom_name); +G_CONST_RETURN gchar *gdk_x11_get_xatom_name_for_display (GdkDisplay *display, + Atom xatom); +#ifndef GDK_MULTIHEAD_SAFE +Atom gdk_x11_atom_to_xatom (GdkAtom atom); +GdkAtom gdk_x11_xatom_to_atom (Atom xatom); +Atom gdk_x11_get_xatom_by_name (const gchar *atom_name); +G_CONST_RETURN gchar *gdk_x11_get_xatom_name (Atom xatom); +#endif + +G_END_DECLS + +#endif /* __GDK_X11_PROPERTY_H__ */ |