diff options
| author | Benjamin Otte <otte@redhat.com> | 2010-08-29 00:03:01 +0200 |
|---|---|---|
| committer | Benjamin Otte <otte@redhat.com> | 2010-09-26 15:11:32 +0200 |
| commit | 894d402c0fe3246b22da0d5e05f96227899c7686 (patch) | |
| tree | ca8a73b4d0d97f0089769f985c0f9e20685c0218 /gdk/win32 | |
| parent | e316157671d0ab67dc9dd7de8f961df80a84f6db (diff) | |
| download | gtk+-894d402c0fe3246b22da0d5e05f96227899c7686.tar.gz | |
API: Remove gdk_drawable_set_colormap()
Diffstat (limited to 'gdk/win32')
| -rw-r--r-- | gdk/win32/gdkdrawable-win32.c | 22 | ||||
| -rw-r--r-- | gdk/win32/gdkwindow-win32.c | 25 |
2 files changed, 0 insertions, 47 deletions
diff --git a/gdk/win32/gdkdrawable-win32.c b/gdk/win32/gdkdrawable-win32.c index e594b88f7b..2ad840ecab 100644 --- a/gdk/win32/gdkdrawable-win32.c +++ b/gdk/win32/gdkdrawable-win32.c @@ -53,9 +53,6 @@ static cairo_surface_t *gdk_win32_create_cairo_surface (GdkDrawable *drawable, int width, int height); -static void gdk_win32_set_colormap (GdkDrawable *drawable, - GdkColormap *colormap); - static GdkColormap* gdk_win32_get_colormap (GdkDrawable *drawable); static gint gdk_win32_get_depth (GdkDrawable *drawable); @@ -82,7 +79,6 @@ _gdk_drawable_impl_win32_class_init (GdkDrawableImplWin32Class *klass) drawable_class->ref_cairo_surface = gdk_win32_ref_cairo_surface; drawable_class->create_cairo_surface = gdk_win32_create_cairo_surface; - drawable_class->set_colormap = gdk_win32_set_colormap; drawable_class->get_colormap = gdk_win32_get_colormap; drawable_class->get_depth = gdk_win32_get_depth; @@ -98,8 +94,6 @@ _gdk_drawable_impl_win32_init (GdkDrawableImplWin32 *impl) static void gdk_drawable_impl_win32_finalize (GObject *object) { - gdk_drawable_set_colormap (GDK_DRAWABLE (object), NULL); - G_OBJECT_CLASS (_gdk_drawable_impl_win32_parent_class)->finalize (object); } @@ -113,22 +107,6 @@ gdk_win32_get_colormap (GdkDrawable *drawable) return GDK_DRAWABLE_IMPL_WIN32 (drawable)->colormap; } -static void -gdk_win32_set_colormap (GdkDrawable *drawable, - GdkColormap *colormap) -{ - GdkDrawableImplWin32 *impl = GDK_DRAWABLE_IMPL_WIN32 (drawable); - - if (impl->colormap == colormap) - return; - - if (impl->colormap) - g_object_unref (impl->colormap); - impl->colormap = colormap; - if (impl->colormap) - g_object_ref (impl->colormap); -} - /* Drawing */ diff --git a/gdk/win32/gdkwindow-win32.c b/gdk/win32/gdkwindow-win32.c index b98cdbd3fc..0ec688b25b 100644 --- a/gdk/win32/gdkwindow-win32.c +++ b/gdk/win32/gdkwindow-win32.c @@ -38,8 +38,6 @@ #include "gdkenumtypes.h" static GdkColormap* gdk_window_impl_win32_get_colormap (GdkDrawable *drawable); -static void gdk_window_impl_win32_set_colormap (GdkDrawable *drawable, - GdkColormap *cmap); static void gdk_window_impl_win32_init (GdkWindowImplWin32 *window); static void gdk_window_impl_win32_class_init (GdkWindowImplWin32Class *klass); static void gdk_window_impl_win32_finalize (GObject *object); @@ -134,7 +132,6 @@ gdk_window_impl_win32_class_init (GdkWindowImplWin32Class *klass) object_class->finalize = gdk_window_impl_win32_finalize; - drawable_class->set_colormap = gdk_window_impl_win32_set_colormap; drawable_class->get_colormap = gdk_window_impl_win32_get_colormap; } @@ -211,28 +208,6 @@ gdk_window_impl_win32_get_colormap (GdkDrawable *drawable) return drawable_impl->colormap; } -static void -gdk_window_impl_win32_set_colormap (GdkDrawable *drawable, - GdkColormap *cmap) -{ - GdkWindowImplWin32 *impl; - GdkDrawableImplWin32 *draw_impl; - - g_return_if_fail (GDK_IS_WINDOW_IMPL_WIN32 (drawable)); - - impl = GDK_WINDOW_IMPL_WIN32 (drawable); - draw_impl = GDK_DRAWABLE_IMPL_WIN32 (drawable); - - /* chain up */ - GDK_DRAWABLE_CLASS (parent_class)->set_colormap (drawable, cmap); - - if (cmap) - { - /* XXX */ - g_print ("gdk_window_impl_win32_set_colormap: XXX\n"); - } -} - void _gdk_root_window_size_init (void) { |