Handle mask == NULL in shape_combine_mask

This commit is contained in:
Alexander Larsson 2008-12-17 13:57:48 +01:00 committed by Alexander Larsson
parent d7e369c27a
commit 890503099f

View File

@ -6219,7 +6219,10 @@ gdk_window_shape_combine_mask (GdkWindow *window,
private = (GdkWindowObject *) window;
region = _gdk_windowing_get_shape_for_mask (mask);
if (mask)
region = _gdk_windowing_get_shape_for_mask (mask);
else
region = NULL;
gdk_window_shape_combine_region (window,
region,
@ -6383,7 +6386,10 @@ gdk_window_input_shape_combine_mask (GdkWindow *window,
private = (GdkWindowObject *) window;
region = _gdk_windowing_get_shape_for_mask (mask);
if (mask)
region = _gdk_windowing_get_shape_for_mask (mask);
else
region = NULL;
gdk_window_input_shape_combine_region (window,
region,