Remove gdkx_colormap_get() deprecated function

This commit is contained in:
Javier Jardón 2010-06-07 04:31:56 +02:00
parent 25864cf0ce
commit 47f8beb0a6
5 changed files with 0 additions and 52 deletions

View File

@ -1335,7 +1335,6 @@ GDK_GC_XGC
GDK_GC_GET_XGC
GDK_WINDOW_XWINDOW
gdkx_visual_get
gdkx_colormap_get
gdk_pixmap_foreign_new
gdk_pixmap_foreign_new_for_display
gdk_pixmap_foreign_new_for_screen

View File

@ -249,14 +249,6 @@ Another name for GDK_DRAWABLE_XID().
@Returns:
<!-- ##### FUNCTION gdkx_colormap_get ##### -->
<para>
</para>
@xcolormap:
@Returns:
<!-- ##### FUNCTION gdk_pixmap_foreign_new ##### -->
<para>

View File

@ -1251,9 +1251,6 @@ gdk_x11_xatom_to_atom_for_display
gdk_x11_colormap_foreign_new
gdk_x11_colormap_get_xcolormap
gdk_x11_colormap_get_xdisplay
#ifdef GDK_ENABLE_BROKEN
gdkx_colormap_get
#endif
#endif
#if IN_FILE(__GDK_CURSOR_X11_C__)

View File

@ -1151,41 +1151,6 @@ gdk_x11_colormap_foreign_new (GdkVisual *visual,
}
/**
* gdkx_colormap_get:
* @xcolormap: the XID of a colormap for the default screen.
*
* Returns a #GdkColormap corresponding to a X colormap;
* this function only works if the colormap is already
* known to GTK+ (a colormap created by GTK+ or the default
* colormap for the screen), since GTK+
*
* Always use gdk_x11_colormap_foreign_new() instead.
*
* Return value: the existing #GdkColormap object if it was
* already known to GTK+, otherwise warns and return
* %NULL.
**/
GdkColormap*
gdkx_colormap_get (Colormap xcolormap)
{
GdkScreen *screen = gdk_screen_get_default ();
GdkColormap *colormap;
if (xcolormap == DefaultColormap (GDK_SCREEN_XDISPLAY (screen),
GDK_SCREEN_XNUMBER (screen)))
return g_object_ref (gdk_screen_get_system_colormap (screen));
colormap = gdk_colormap_lookup (screen, xcolormap);
if (colormap)
return g_object_ref (colormap);
g_warning ("Colormap passed to gdkx_colormap_get\n"
"does not previously exist");
return NULL;
}
static gint
gdk_colormap_match_color (GdkColormap *cmap,
GdkColor *color,

View File

@ -129,11 +129,6 @@ GdkVisual* gdk_x11_screen_lookup_visual (GdkScreen *screen,
GdkVisual* gdkx_visual_get (VisualID xvisualid);
#endif
#ifdef GDK_ENABLE_BROKEN
/* XXX: An X Colormap is useless unless we also have the visual. */
GdkColormap* gdkx_colormap_get (Colormap xcolormap);
#endif
GdkColormap *gdk_x11_colormap_foreign_new (GdkVisual *visual,
Colormap xcolormap);