gdk/win32: deprecate gdk_win32_handle_table_lookup

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 <marcandre.lureau@redhat.com>

diff --git a/gdk/win32/gdkdevice-win32.c b/gdk/win32/gdkdevice-win32.c
index 48985a76f0f6430965164384848478c58f4fbe37..e2f33623c5974ce45d736103e82512fbd1401905 100644 (file)
--- 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 29eb80c19cd7fabc336fe49c73c4278be384853e..333ecbbca82cf268d384631705666feb09cc0ce3 100644 (file)
--- 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 e879f01db64cb12df9e62440477be5d7b6f744e2..77000c33d961a8feeab26d7831f892ba7a7f9bd2 100644 (file)
--- 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 ed082a2076ab7b88611c1aab075eaf6d46c190a7..6f88df09583d49fdd89ee457111507d649100f3a 100644 (file)
--- 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 c8bf213b7244b9af14a51750a695e0cc3b4de985..c6ef3455dfe183e7a2c451bca561d8e5b23a8e23 100644 (file)
--- 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 4dc6f38fdd49c409e35715710d6ea01261a7edd9..1b5ade69ad26c4bac1b780d582999a2600be4d43 100644 (file)
--- 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 006e59fc7c2830a31b9a5104648760408f812481..6eb5871b2c4c7c562ccb5ca1fac0034997baf58d 100644 (file)
--- 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 404a3baba03a9f731ce8f8061786d8d4a146b78b..e51d3424c867d9e191284a7a6ff9daa63130fede 100644 (file)
--- 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);