Commit c24e5e28 authored by Owen Taylor's avatar Owen Taylor Committed by Owen Taylor

gdk/linux-fb/gdkwindow-fb.c (gdk_window_set_back_pixmap)

2005-08-12  Owen Taylor  <otaylor@redhat.com>

        * gdk/linux-fb/gdkwindow-fb.c (gdk_window_set_back_pixmap)
        * gdk/win32/gdkwindow-win32.c (gdk_window_set_back_pixmap)
        * gdk/x11/gdkwindow-x11.c (gdk_window_set_back_pixmap): Warn if
        gdk_drawable_get_colormap (pixmap) is NULL and return.
parent 2e680b56
2005-08-12 Owen Taylor <otaylor@redhat.com>
* gdk/linux-fb/gdkwindow-fb.c (gdk_window_set_back_pixmap)
* gdk/win32/gdkwindow-win32.c (gdk_window_set_back_pixmap)
* gdk/x11/gdkwindow-x11.c (gdk_window_set_back_pixmap): Warn if
gdk_drawable_get_colormap (pixmap) is NULL and return.
2005-08-12 Matthias Clasen <mclasen@redhat.com>
* configure.in: Bump version to 2.8.0
......
2005-08-12 Owen Taylor <otaylor@redhat.com>
* gdk/linux-fb/gdkwindow-fb.c (gdk_window_set_back_pixmap)
* gdk/win32/gdkwindow-win32.c (gdk_window_set_back_pixmap)
* gdk/x11/gdkwindow-x11.c (gdk_window_set_back_pixmap): Warn if
gdk_drawable_get_colormap (pixmap) is NULL and return.
2005-08-12 Matthias Clasen <mclasen@redhat.com>
* configure.in: Bump version to 2.8.0
......
2005-08-12 Owen Taylor <otaylor@redhat.com>
* gdk/linux-fb/gdkwindow-fb.c (gdk_window_set_back_pixmap)
* gdk/win32/gdkwindow-win32.c (gdk_window_set_back_pixmap)
* gdk/x11/gdkwindow-x11.c (gdk_window_set_back_pixmap): Warn if
gdk_drawable_get_colormap (pixmap) is NULL and return.
2005-08-12 Matthias Clasen <mclasen@redhat.com>
* configure.in: Bump version to 2.8.0
......
......@@ -1473,6 +1473,12 @@ gdk_window_set_back_pixmap (GdkWindow *window,
g_return_if_fail (pixmap == NULL || !parent_relative);
g_return_if_fail (pixmap == NULL || gdk_drawable_get_depth (window) == gdk_drawable_get_depth (pixmap));
if (!gdk_drawable_get_colormap (pixmap))
{
g_warning ("gdk_window_set_back_pixmap(): pixmap must have a colormap");
return;
}
old_pixmap = private->bg_pixmap;
if (parent_relative)
......
......@@ -1849,6 +1849,12 @@ gdk_window_set_back_pixmap (GdkWindow *window,
g_return_if_fail (pixmap == NULL || !parent_relative);
g_return_if_fail (pixmap == NULL || gdk_drawable_get_depth (window) == gdk_drawable_get_depth (pixmap));
if (!gdk_drawable_get_colormap (pixmap))
{
g_warning ("gdk_window_set_back_pixmap(): pixmap must have a colormap");
return;
}
if (private->bg_pixmap &&
private->bg_pixmap != GDK_PARENT_RELATIVE_BG &&
private->bg_pixmap != GDK_NO_BG)
......
......@@ -2912,6 +2912,12 @@ gdk_window_set_back_pixmap (GdkWindow *window,
g_return_if_fail (GDK_IS_WINDOW (window));
g_return_if_fail (pixmap == NULL || !parent_relative);
g_return_if_fail (pixmap == NULL || gdk_drawable_get_depth (window) == gdk_drawable_get_depth (pixmap));
if (!gdk_drawable_get_colormap (pixmap))
{
g_warning ("gdk_window_set_back_pixmap(): pixmap must have a colormap");
return;
}
if (private->bg_pixmap &&
private->bg_pixmap != GDK_PARENT_RELATIVE_BG &&
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment