Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert some over-eager deprecation removal

Browse Source 
We can't replace drawable api with window api when the object
is actually a pixmap.
This commit is contained in:
Matthias Clasen
2010-12-27 18:16:14 -05:00
parent e369d70dd6
commit c76b247da5
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gdk/gdkdrawable.h
View File

@@ -255,14 +255,16 @@ void gdk_drawable_set_colormap (GdkDrawable *drawable,
GdkColormap* gdk_drawable_get_colormap (GdkDrawable *drawable);
gint gdk_drawable_get_depth (GdkDrawable *drawable);
#ifndef GDK_DISABLE_DEPRECATED
#if !defined (GDK_DISABLE_DEPRECATED) || defined (GTK_COMPILATION)
void gdk_drawable_get_size (GdkDrawable *drawable,
gint *width,
gint *height);
GdkVisual* gdk_drawable_get_visual (GdkDrawable *drawable);
GdkScreen* gdk_drawable_get_screen (GdkDrawable *drawable);
GdkDisplay* gdk_drawable_get_display (GdkDrawable *drawable);
#endif /* GDK_DISABLE_DEPRECATED || GTK_COMPILATION */
#ifndef GDK_DISABLE_DEPRECATED
GdkDrawable* gdk_drawable_ref (GdkDrawable *drawable);
void gdk_drawable_unref (GdkDrawable *drawable);
#endif /* GDK_DISABLE_DEPRECATED */

7
gtk/gtkdnd.c
View File

@@ -3268,11 +3268,10 @@ gtk_drag_set_icon_pixmap (GdkDragContext *context,
screen = gdk_colormap_get_screen (colormap);
g_return_if_fail (gdk_window_get_screen (pixmap) == screen);
g_return_if_fail (gdk_drawable_get_screen (pixmap) == screen);
g_return_if_fail (!mask || gdk_window_get_screen (mask) == screen);
width = gdk_window_get_width (pixmap);
height = gdk_window_get_height (pixmap);
gdk_drawable_get_size (pixmap, &width, &height);
gtk_widget_push_colormap (colormap);