diff --git a/ChangeLog b/ChangeLog index 0dc8afaa63..908d53e2a3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2006-02-20 Tor Lillqvist + * gdk/win32/gdkdisplay-win32.c (gdk_display_supports_shapes): + New function, return TRUE. + (gdk_display_supports_input_shapes): New function, return FALSE. + * gdk/win32/gdkwindow-win32.c (do_shape_combine_region): New function. Factor out code from gdk_window_shape_combine_mask(). (gdk_window_shape_combine_region): Actually do something. Convert diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 0dc8afaa63..908d53e2a3 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,9 @@ 2006-02-20 Tor Lillqvist + * gdk/win32/gdkdisplay-win32.c (gdk_display_supports_shapes): + New function, return TRUE. + (gdk_display_supports_input_shapes): New function, return FALSE. + * gdk/win32/gdkwindow-win32.c (do_shape_combine_region): New function. Factor out code from gdk_window_shape_combine_mask(). (gdk_window_shape_combine_region): Actually do something. Convert diff --git a/gdk/win32/gdkdisplay-win32.c b/gdk/win32/gdkdisplay-win32.c index c9c1c4fbb3..5b77fb11bb 100644 --- a/gdk/win32/gdkdisplay-win32.c +++ b/gdk/win32/gdkdisplay-win32.c @@ -369,3 +369,23 @@ gdk_display_store_clipboard (GdkDisplay *display, gint n_targets) { } + +gboolean +gdk_display_supports_shapes (GdkDisplay *display) +{ + g_return_val_if_fail (GDK_IS_DISPLAY (display), FALSE); + + return TRUE; +} + +gboolean +gdk_display_supports_input_shapes (GdkDisplay *display) +{ + g_return_val_if_fail (GDK_IS_DISPLAY (display), FALSE); + + /* Not yet implemented. See comment in + * gdk_window_input_shape_combine_mask(). + */ + + return FALSE; +}