From 52e3ed13e255b5e54bc9c3838a6bd56eafc71c70 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marc-Andr=C3=A9=20Lureau?= Date: Wed, 24 Aug 2022 21:01:45 +0400 Subject: [PATCH] gdk/win32: deprecate gdk_win32_handle_table_lookup MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This function is probably not generally useful for a Gtk+/win32 user, and it's only used internally by gdk-win32. It's time to deprecate it, I believe. Signed-off-by: Marc-André Lureau --- gdk/win32/gdkdevice-win32.c | 4 ++-- gdk/win32/gdkdevice-winpointer.c | 4 ++-- gdk/win32/gdkdevice-wintab.c | 2 +- gdk/win32/gdkevents-win32.c | 14 +++++++------- gdk/win32/gdkprivate-win32.h | 2 ++ gdk/win32/gdksurface-win32.c | 2 +- gdk/win32/gdkwin32id.c | 8 +++++++- gdk/win32/gdkwin32misc.h | 4 ++-- 8 files changed, 24 insertions(+), 16 deletions(-) diff --git a/gdk/win32/gdkdevice-win32.c b/gdk/win32/gdkdevice-win32.c index 48985a76f0..e2f33623c5 100644 --- a/gdk/win32/gdkdevice-win32.c +++ b/gdk/win32/gdkdevice-win32.c @@ -105,7 +105,7 @@ gdk_device_win32_query_state (GdkDevice *device, hwndc = ChildWindowFromPoint (hwnd, point); if (hwndc && hwndc != hwnd) - *child_window = gdk_win32_handle_table_lookup (hwndc); + *child_window = gdk_win32_handle_table_lookup_ (hwndc); else *child_window = NULL; /* Direct child unknown to gdk */ } @@ -183,7 +183,7 @@ _gdk_device_win32_surface_at_position (GdkDevice *device, if (!PtInRect (&rect, client_pt)) hwnd = NULL; - window = gdk_win32_handle_table_lookup (hwnd); + window = gdk_win32_handle_table_lookup_ (hwnd); if (window && (win_x || win_y)) { diff --git a/gdk/win32/gdkdevice-winpointer.c b/gdk/win32/gdkdevice-winpointer.c index 29eb80c19c..333ecbbca8 100644 --- a/gdk/win32/gdkdevice-winpointer.c +++ b/gdk/win32/gdkdevice-winpointer.c @@ -96,7 +96,7 @@ gdk_device_winpointer_query_state (GdkDevice *device, hwndc = ChildWindowFromPoint (hwnd, point); if (hwndc && hwndc != hwnd) - *child_window = gdk_win32_handle_table_lookup (hwndc); + *child_window = gdk_win32_handle_table_lookup_ (hwndc); else *child_window = NULL; /* Direct child unknown to gdk */ } @@ -160,7 +160,7 @@ gdk_device_winpointer_surface_at_position (GdkDevice *device, if (!PtInRect (&rect, client_pt)) hwnd = NULL; - surface = gdk_win32_handle_table_lookup (hwnd); + surface = gdk_win32_handle_table_lookup_ (hwnd); if (surface && (win_x || win_y)) { diff --git a/gdk/win32/gdkdevice-wintab.c b/gdk/win32/gdkdevice-wintab.c index e879f01db6..77000c33d9 100644 --- a/gdk/win32/gdkdevice-wintab.c +++ b/gdk/win32/gdkdevice-wintab.c @@ -104,7 +104,7 @@ gdk_device_wintab_query_state (GdkDevice *device, hwndc = ChildWindowFromPoint (hwnd, point); if (hwndc && hwndc != hwnd) - *child_window = gdk_win32_handle_table_lookup (hwndc); + *child_window = gdk_win32_handle_table_lookup_ (hwndc); else *child_window = NULL; /* Direct child unknown to gdk */ } diff --git a/gdk/win32/gdkevents-win32.c b/gdk/win32/gdkevents-win32.c index ed082a2076..6f88df0958 100644 --- a/gdk/win32/gdkevents-win32.c +++ b/gdk/win32/gdkevents-win32.c @@ -388,7 +388,7 @@ low_level_keyboard_proc (int code, if (kbd_focus_owner == NULL) break; - gdk_kbd_focus_owner = gdk_win32_handle_table_lookup (kbd_focus_owner); + gdk_kbd_focus_owner = gdk_win32_handle_table_lookup_ (kbd_focus_owner); if (gdk_kbd_focus_owner == NULL) break; @@ -618,7 +618,7 @@ find_window_for_mouse_event (GdkSurface* reported_window, ScreenToClient (hwnd, &client_pt); GetClientRect (hwnd, &rect); if (PtInRect (&rect, client_pt)) - event_surface = gdk_win32_handle_table_lookup (hwnd); + event_surface = gdk_win32_handle_table_lookup_ (hwnd); } if (event_surface == NULL) event_surface = grab->surface; @@ -1782,7 +1782,7 @@ gdk_event_translate (MSG *msg, return TRUE; } - window = gdk_win32_handle_table_lookup (msg->hwnd); + window = gdk_win32_handle_table_lookup_ (msg->hwnd); if (window == NULL) { @@ -2297,7 +2297,7 @@ gdk_event_translate (MSG *msg, ScreenToClient (hwnd, &client_pt); GetClientRect (hwnd, &rect); if (PtInRect (&rect, client_pt)) - new_window = gdk_win32_handle_table_lookup (hwnd); + new_window = gdk_win32_handle_table_lookup_ (hwnd); } synthesize_crossing_events (display, @@ -2438,7 +2438,7 @@ gdk_event_translate (MSG *msg, ScreenToClient (hwnd, &client_pt); GetClientRect (hwnd, &rect); if (PtInRect (&rect, client_pt)) - new_window = gdk_win32_handle_table_lookup (hwnd); + new_window = gdk_win32_handle_table_lookup_ (hwnd); } if (!ignore_leave) @@ -2716,7 +2716,7 @@ gdk_event_translate (MSG *msg, msg->hwnd = hwnd; - g_set_object (&window, gdk_win32_handle_table_lookup (hwnd)); + g_set_object (&window, gdk_win32_handle_table_lookup_ (hwnd)); if (!window) break; @@ -3246,7 +3246,7 @@ gdk_event_translate (MSG *msg, { if (msg->lParam != 0) { - GdkSurface *other_surface = gdk_win32_handle_table_lookup ((HWND) msg->lParam); + GdkSurface *other_surface = gdk_win32_handle_table_lookup_ ((HWND) msg->lParam); if (other_surface != NULL && (GDK_IS_POPUP (other_surface) || GDK_IS_DRAG_SURFACE (other_surface))) { diff --git a/gdk/win32/gdkprivate-win32.h b/gdk/win32/gdkprivate-win32.h index c8bf213b72..c6ef3455df 100644 --- a/gdk/win32/gdkprivate-win32.h +++ b/gdk/win32/gdkprivate-win32.h @@ -447,4 +447,6 @@ GdkPixbuf *gdk_win32_icon_to_pixbuf_libgtk_only (HICON hicon, HICON gdk_win32_pixbuf_to_hicon_libgtk_only (GdkPixbuf *pixbuf); void gdk_win32_set_modal_dialog_libgtk_only (HWND window); +gpointer gdk_win32_handle_table_lookup_ (HWND handle); + #endif /* __GDK_PRIVATE_WIN32_H__ */ diff --git a/gdk/win32/gdksurface-win32.c b/gdk/win32/gdksurface-win32.c index 4dc6f38fdd..1b5ade69ad 100644 --- a/gdk/win32/gdksurface-win32.c +++ b/gdk/win32/gdksurface-win32.c @@ -4259,7 +4259,7 @@ gdk_win32_surface_lookup_for_display (GdkDisplay *display, { g_return_val_if_fail (display == gdk_display_get_default (), NULL); - return (GdkSurface*) gdk_win32_handle_table_lookup (anid); + return (GdkSurface*) gdk_win32_handle_table_lookup_ (anid); } /** diff --git a/gdk/win32/gdkwin32id.c b/gdk/win32/gdkwin32id.c index 006e59fc7c..6eb5871b2c 100644 --- a/gdk/win32/gdkwin32id.c +++ b/gdk/win32/gdkwin32id.c @@ -70,7 +70,7 @@ gdk_win32_handle_table_remove (HANDLE handle) } gpointer -gdk_win32_handle_table_lookup (HWND handle) +gdk_win32_handle_table_lookup_ (HWND handle) { gpointer data = NULL; @@ -79,3 +79,9 @@ gdk_win32_handle_table_lookup (HWND handle) return data; } + +gpointer +gdk_win32_handle_table_lookup (HWND handle) +{ + return gdk_win32_handle_table_lookup_ (handle); +} diff --git a/gdk/win32/gdkwin32misc.h b/gdk/win32/gdkwin32misc.h index 404a3baba0..e51d3424c8 100644 --- a/gdk/win32/gdkwin32misc.h +++ b/gdk/win32/gdkwin32misc.h @@ -73,9 +73,9 @@ gboolean gdk_win32_surface_is_win32 (GdkSurface *surface); GDK_DEPRECATED_IN_4_8_FOR(gdk_win32_surface_get_handle) HWND gdk_win32_surface_get_impl_hwnd (GdkSurface *surface); -/* Return the Gdk* for a particular HANDLE */ -GDK_AVAILABLE_IN_ALL +GDK_DEPRECATED_IN_4_8 gpointer gdk_win32_handle_table_lookup (HWND handle); + /* Translate from window to Windows handle */ GDK_AVAILABLE_IN_ALL HWND gdk_win32_surface_get_handle (GdkSurface *surface); -- 2.30.2