diff options
author | Benjamin Otte <otte@redhat.com> | 2010-10-06 04:08:20 +0200 |
---|---|---|
committer | Benjamin Otte <otte@redhat.com> | 2010-12-02 20:17:27 +0100 |
commit | 88399c041c76fe30f83e06a426cf8f4961da86c5 (patch) | |
tree | 9c81630a79a92b7db6e1d788e67a62661f686758 | |
parent | 3e6a4af6d398eb95da5b2bafa307901051c47610 (diff) | |
download | gtk+-88399c041c76fe30f83e06a426cf8f4961da86c5.tar.gz |
x11: Remove GdkDrawableImplX11
It's not use anymore, the whole functionality has been moved to
GdkWindowImplX11.
-rw-r--r-- | gdk/Makefile.am | 1 | ||||
-rw-r--r-- | gdk/x11/Makefile.am | 2 | ||||
-rw-r--r-- | gdk/x11/gdkdrawable-x11.c | 53 | ||||
-rw-r--r-- | gdk/x11/gdkdrawable-x11.h | 64 | ||||
-rw-r--r-- | gdk/x11/gdkwindow-x11.c | 2 | ||||
-rw-r--r-- | gdk/x11/gdkwindow-x11.h | 6 |
6 files changed, 4 insertions, 124 deletions
diff --git a/gdk/Makefile.am b/gdk/Makefile.am index 9a48fe8042..f4606b94cf 100644 --- a/gdk/Makefile.am +++ b/gdk/Makefile.am @@ -202,7 +202,6 @@ x11_introspection_files = \ x11/gdkdevice-xi.c \ x11/gdkdisplay-x11.c \ x11/gdkdnd-x11.c \ - x11/gdkdrawable-x11.c \ x11/gdkeventsource.c \ x11/gdkeventtranslator.c \ x11/gdkgeometry-x11.c \ diff --git a/gdk/x11/Makefile.am b/gdk/x11/Makefile.am index 6344754597..b6a4751b32 100644 --- a/gdk/x11/Makefile.am +++ b/gdk/x11/Makefile.am @@ -30,8 +30,6 @@ libgdk_x11_la_SOURCES = \ gdkdisplay-x11.c \ gdkdisplay-x11.h \ gdkdnd-x11.c \ - gdkdrawable-x11.c \ - gdkdrawable-x11.h \ gdkeventsource.c \ gdkeventsource.h \ gdkeventtranslator.c \ diff --git a/gdk/x11/gdkdrawable-x11.c b/gdk/x11/gdkdrawable-x11.c deleted file mode 100644 index 4db0fd50b5..0000000000 --- a/gdk/x11/gdkdrawable-x11.c +++ /dev/null @@ -1,53 +0,0 @@ -/* 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/. - */ - -#include "config.h" - -#include "gdkdrawable-x11.h" - -#include "gdkx.h" -#include "gdkprivate-x11.h" -#include "gdkscreen-x11.h" -#include "gdkdisplay-x11.h" - -#include <cairo-xlib.h> - -#include <stdlib.h> -#include <string.h> - - -G_DEFINE_TYPE (GdkDrawableImplX11, _gdk_drawable_impl_x11, GDK_TYPE_DRAWABLE) - -static void -_gdk_drawable_impl_x11_class_init (GdkDrawableImplX11Class *klass) -{ -} - -static void -_gdk_drawable_impl_x11_init (GdkDrawableImplX11 *impl) -{ -} - diff --git a/gdk/x11/gdkdrawable-x11.h b/gdk/x11/gdkdrawable-x11.h deleted file mode 100644 index 03c621ef7d..0000000000 --- a/gdk/x11/gdkdrawable-x11.h +++ /dev/null @@ -1,64 +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, 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/. - */ - -#ifndef __GDK_DRAWABLE_X11_H__ -#define __GDK_DRAWABLE_X11_H__ - -#include <gdk/gdkdrawable.h> -#include <X11/Xlib.h> - -G_BEGIN_DECLS - -/* Drawable implementation for X11 - */ - -typedef struct _GdkDrawableImplX11 GdkDrawableImplX11; -typedef struct _GdkDrawableImplX11Class GdkDrawableImplX11Class; - -#define GDK_TYPE_DRAWABLE_IMPL_X11 (_gdk_drawable_impl_x11_get_type ()) -#define GDK_DRAWABLE_IMPL_X11(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_DRAWABLE_IMPL_X11, GdkDrawableImplX11)) -#define GDK_DRAWABLE_IMPL_X11_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_DRAWABLE_IMPL_X11, GdkDrawableImplX11Class)) -#define GDK_IS_DRAWABLE_IMPL_X11(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_DRAWABLE_IMPL_X11)) -#define GDK_IS_DRAWABLE_IMPL_X11_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_DRAWABLE_IMPL_X11)) -#define GDK_DRAWABLE_IMPL_X11_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_DRAWABLE_IMPL_X11, GdkDrawableImplX11Class)) - -struct _GdkDrawableImplX11 -{ - GdkDrawable parent_instance; -}; - -struct _GdkDrawableImplX11Class -{ - GdkDrawableClass parent_class; - -}; - -GType _gdk_drawable_impl_x11_get_type (void); - - -G_END_DECLS - -#endif /* __GDK_DRAWABLE_X11_H__ */ diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c index 7e3e810c90..1435fdf94b 100644 --- a/gdk/x11/gdkwindow-x11.c +++ b/gdk/x11/gdkwindow-x11.c @@ -130,7 +130,7 @@ static void gdk_window_impl_iface_init (GdkWindowImplIface *iface); G_DEFINE_TYPE_WITH_CODE (GdkWindowImplX11, gdk_window_impl_x11, - GDK_TYPE_DRAWABLE_IMPL_X11, + GDK_TYPE_DRAWABLE, G_IMPLEMENT_INTERFACE (GDK_TYPE_WINDOW_IMPL, gdk_window_impl_iface_init)); diff --git a/gdk/x11/gdkwindow-x11.h b/gdk/x11/gdkwindow-x11.h index 77eb32b49c..570a9572a3 100644 --- a/gdk/x11/gdkwindow-x11.h +++ b/gdk/x11/gdkwindow-x11.h @@ -27,7 +27,7 @@ #ifndef __GDK_WINDOW_X11_H__ #define __GDK_WINDOW_X11_H__ -#include <gdk/x11/gdkdrawable-x11.h> +#include "gdk/x11/gdkprivate-x11.h" #ifdef HAVE_XDAMAGE #include <X11/extensions/Xdamage.h> @@ -56,7 +56,7 @@ typedef struct _GdkXPositionInfo GdkXPositionInfo; struct _GdkWindowImplX11 { - GdkDrawableImplX11 parent_instance; + GdkDrawable parent_instance; GdkDrawable *wrapper; @@ -81,7 +81,7 @@ struct _GdkWindowImplX11 struct _GdkWindowImplX11Class { - GdkDrawableImplX11Class parent_class; + GdkDrawableClass parent_class; }; struct _GdkToplevelX11 |