diff options
author | Rico Tzschichholz <ricotz@ubuntu.com> | 2016-10-24 12:16:34 +0200 |
---|---|---|
committer | Rico Tzschichholz <ricotz@ubuntu.com> | 2016-10-24 12:22:32 +0200 |
commit | 639898000e8e1f8bf1a72b778978a2c8e30c2d9b (patch) | |
tree | 66468f9d9a703784b50f4aab1cfd7903004592d6 | |
parent | 7630c864684a7b7b74e089326d30abc533ab5235 (diff) | |
download | gtk+-639898000e8e1f8bf1a72b778978a2c8e30c2d9b.tar.gz |
gdkwindow: Remove deprecated APIwip/ricotz/deprecated
-rw-r--r-- | docs/reference/gdk/gdk4-sections.txt | 8 | ||||
-rw-r--r-- | gdk/gdkdeprecated.c | 24 | ||||
-rw-r--r-- | gdk/gdkwindow.c | 111 | ||||
-rw-r--r-- | gdk/gdkwindow.h | 30 |
4 files changed, 1 insertions, 172 deletions
diff --git a/docs/reference/gdk/gdk4-sections.txt b/docs/reference/gdk/gdk4-sections.txt index c6c1da6c27..079fca6a2b 100644 --- a/docs/reference/gdk/gdk4-sections.txt +++ b/docs/reference/gdk/gdk4-sections.txt @@ -327,7 +327,6 @@ gdk_window_get_window_type gdk_window_get_display gdk_window_get_screen gdk_window_get_visual -gdk_window_at_pointer gdk_window_show gdk_window_show_unraised gdk_window_hide @@ -353,8 +352,6 @@ gdk_window_set_fullscreen_mode gdk_window_set_keep_above gdk_window_set_keep_below gdk_window_set_opacity -gdk_window_set_composited -gdk_window_get_composited gdk_window_set_pass_through gdk_window_get_pass_through gdk_window_move @@ -402,8 +399,6 @@ gdk_window_freeze_updates gdk_window_thaw_updates gdk_window_process_all_updates gdk_window_process_updates -gdk_window_enable_synchronized_configure -gdk_window_configure_finished gdk_window_get_frame_clock <SUBSECTION> @@ -424,7 +419,6 @@ gdk_window_merge_child_shapes gdk_window_input_shape_combine_region gdk_window_set_child_input_shapes gdk_window_merge_child_input_shapes -gdk_window_set_static_gravities gdk_window_set_title gdk_window_set_background gdk_window_set_background_rgba @@ -525,8 +519,6 @@ GdkWindowImpl GdkWindowImplClass GdkWindowRedirect gdk_window_impl_get_type -gdk_window_freeze_toplevel_updates_libgtk_only -gdk_window_thaw_toplevel_updates_libgtk_only gdk_fullscreen_mode_get_type </SECTION> diff --git a/gdk/gdkdeprecated.c b/gdk/gdkdeprecated.c index e6e895582f..cfe2932909 100644 --- a/gdk/gdkdeprecated.c +++ b/gdk/gdkdeprecated.c @@ -27,28 +27,4 @@ #include "gdkmain.h" #include "gdkwindow.h" -/** - * gdk_window_at_pointer: - * @win_x: (out) (allow-none): return location for origin of the window under the pointer - * @win_y: (out) (allow-none): return location for origin of the window under the pointer - * - * Obtains the window underneath the mouse pointer, returning the - * location of that window in @win_x, @win_y. Returns %NULL if the - * window under the mouse pointer is not known to GDK (if the window - * belongs to another application and a #GdkWindow hasn’t been created - * for it with gdk_window_foreign_new()) - * - * NOTE: For multihead-aware widgets or applications use - * gdk_display_get_window_at_pointer() instead. - * - * Returns: (transfer none): window under the mouse pointer - * - * Deprecated: 3.0: Use gdk_device_get_window_at_position() instead. - **/ -GdkWindow* -gdk_window_at_pointer (gint *win_x, - gint *win_y) -{ - return gdk_display_get_window_at_pointer (gdk_display_get_default (), win_x, win_y); -} diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c index 214246dd45..6697a530b9 100644 --- a/gdk/gdkwindow.c +++ b/gdk/gdkwindow.c @@ -3316,21 +3316,6 @@ gdk_window_mark_paint_from_clip (GdkWindow *window, } /** - * gdk_window_flush: - * @window: a #GdkWindow - * - * This function does nothing. - * - * Since: 2.18 - * - * Deprecated: 3.14 - **/ -void -gdk_window_flush (GdkWindow *window) -{ -} - -/** * gdk_window_get_clip_region: * @window: a #GdkWindow * @@ -4543,29 +4528,6 @@ gdk_window_thaw_updates (GdkWindow *window) gdk_window_schedule_update (GDK_WINDOW (impl_window)); } -/** - * gdk_window_freeze_toplevel_updates_libgtk_only: - * @window: a #GdkWindow - * - * Temporarily freezes a window and all its descendants such that it won't - * receive expose events. The window will begin receiving expose events - * again when gdk_window_thaw_toplevel_updates_libgtk_only() is called. If - * gdk_window_freeze_toplevel_updates_libgtk_only() - * has been called more than once, - * gdk_window_thaw_toplevel_updates_libgtk_only() must be called - * an equal number of times to begin processing exposes. - * - * This function is not part of the GDK public API and is only - * for use by GTK+. - * - * Deprecated: 3.16: This symbol was never meant to be used outside of GTK+ - */ -void -gdk_window_freeze_toplevel_updates_libgtk_only (GdkWindow *window) -{ - gdk_window_freeze_toplevel_updates (window); -} - void gdk_window_freeze_toplevel_updates (GdkWindow *window) { @@ -4576,24 +4538,6 @@ gdk_window_freeze_toplevel_updates (GdkWindow *window) _gdk_frame_clock_freeze (gdk_window_get_frame_clock (window)); } -/** - * gdk_window_thaw_toplevel_updates_libgtk_only: - * @window: a #GdkWindow - * - * Thaws a window frozen with - * gdk_window_freeze_toplevel_updates_libgtk_only(). - * - * This function is not part of the GDK public API and is only - * for use by GTK+. - * - * Deprecated: 3.16: This symbol was never meant to be used outside of GTK+ - */ -void -gdk_window_thaw_toplevel_updates_libgtk_only (GdkWindow *window) -{ - gdk_window_thaw_toplevel_updates (window); -} - void gdk_window_thaw_toplevel_updates (GdkWindow *window) { @@ -4751,8 +4695,7 @@ gdk_window_constrain_size (GdkGeometry *geometry, * corner of @window. * * Returns: (nullable) (transfer none): the window containing the - * pointer (as with gdk_window_at_pointer()), or %NULL if the window - * containing the pointer isn’t known to GDK + * pointer, or %NULL if the window containing the pointer isn’t known to GDK * * Deprecated: 3.0: Use gdk_window_get_device_position() instead. **/ @@ -6963,30 +6906,6 @@ gdk_window_merge_child_input_shapes (GdkWindow *window) /** - * gdk_window_set_static_gravities: - * @window: a #GdkWindow - * @use_static: %TRUE to turn on static gravity - * - * Used to set the bit gravity of the given window to static, and flag - * it so all children get static subwindow gravity. This is used if you - * are implementing scary features that involve deep knowledge of the - * windowing system. Don’t worry about it. - * - * Returns: %FALSE - * - * Deprecated: 3.16: static gravities haven't worked on anything but X11 - * for a long time. - */ -gboolean -gdk_window_set_static_gravities (GdkWindow *window, - gboolean use_static) -{ - g_return_val_if_fail (GDK_IS_WINDOW (window), FALSE); - - return FALSE; -} - -/** * gdk_window_get_modal_hint: * @window: A toplevel #GdkWindow. * @@ -10577,34 +10496,6 @@ gdk_window_begin_move_drag (GdkWindow *window, } /** - * gdk_window_enable_synchronized_configure: - * @window: a toplevel #GdkWindow - * - * Does nothing, present only for compatiblity. - * - * Since: 2.6 - * Deprecated: 3.8: this function is no longer needed - **/ -void -gdk_window_enable_synchronized_configure (GdkWindow *window) -{ -} - -/** - * gdk_window_configure_finished: - * @window: a toplevel #GdkWindow - * - * Does nothing, present only for compatiblity. - * - * Since: 2.6 - * Deprecated: 3.8: this function is no longer needed - **/ -void -gdk_window_configure_finished (GdkWindow *window) -{ -} - -/** * gdk_window_set_opacity: * @window: a top-level or non-native #GdkWindow * @opacity: opacity diff --git a/gdk/gdkwindow.h b/gdk/gdkwindow.h index 7bc84bddc0..a6bc688197 100644 --- a/gdk/gdkwindow.h +++ b/gdk/gdkwindow.h @@ -521,11 +521,6 @@ GDK_AVAILABLE_IN_ALL GdkScreen * gdk_window_get_screen (GdkWindow *window); GDK_AVAILABLE_IN_ALL GdkDisplay * gdk_window_get_display (GdkWindow *window); -#ifndef GDK_MULTIDEVICE_SAFE -GDK_DEPRECATED_IN_3_0_FOR(gdk_device_get_window_at_position) -GdkWindow* gdk_window_at_pointer (gint *win_x, - gint *win_y); -#endif /* GDK_MULTIDEVICE_SAFE */ GDK_AVAILABLE_IN_ALL void gdk_window_show (GdkWindow *window); GDK_AVAILABLE_IN_ALL @@ -620,12 +615,6 @@ void gdk_window_shape_combine_region (GdkWindow *window, GDK_AVAILABLE_IN_ALL void gdk_window_set_child_shapes (GdkWindow *window); -GDK_DEPRECATED_IN_3_16 -gboolean gdk_window_get_composited (GdkWindow *window); -GDK_DEPRECATED_IN_3_16 -void gdk_window_set_composited (GdkWindow *window, - gboolean composited); - /* * This routine allows you to merge (ie ADD) child shapes to your * own window’s shape keeping its current shape and ADDING the child @@ -671,12 +660,6 @@ gboolean gdk_window_is_shaped (GdkWindow *window); GDK_AVAILABLE_IN_ALL GdkWindowState gdk_window_get_state (GdkWindow *window); -/* Set static bit gravity on the parent, and static - * window gravity on all children. - */ -GDK_DEPRECATED_IN_3_16 -gboolean gdk_window_set_static_gravities (GdkWindow *window, - gboolean use_static); /* GdkWindow */ @@ -746,9 +729,6 @@ GDK_AVAILABLE_IN_3_22 void gdk_window_end_draw_frame (GdkWindow *window, GdkDrawingContext *context); -GDK_DEPRECATED_IN_3_14 -void gdk_window_flush (GdkWindow *window); - GDK_AVAILABLE_IN_ALL void gdk_window_set_title (GdkWindow *window, const gchar *title); @@ -1028,11 +1008,6 @@ void gdk_window_freeze_updates (GdkWindow *window); GDK_AVAILABLE_IN_ALL void gdk_window_thaw_updates (GdkWindow *window); -GDK_DEPRECATED_IN_3_16 -void gdk_window_freeze_toplevel_updates_libgtk_only (GdkWindow *window); -GDK_DEPRECATED_IN_3_16 -void gdk_window_thaw_toplevel_updates_libgtk_only (GdkWindow *window); - GDK_AVAILABLE_IN_ALL void gdk_window_process_all_updates (void); GDK_AVAILABLE_IN_ALL @@ -1047,11 +1022,6 @@ void gdk_window_constrain_size (GdkGeometry *geometry, gint *new_width, gint *new_height); -GDK_DEPRECATED_IN_3_8 -void gdk_window_enable_synchronized_configure (GdkWindow *window); -GDK_DEPRECATED_IN_3_8 -void gdk_window_configure_finished (GdkWindow *window); - GDK_AVAILABLE_IN_ALL GdkWindow *gdk_get_default_root_window (void); |