From: Руслан Ижбулатов <lrn1986@gmail.com>
Date: Sat, 24 Mar 2018 12:58:05 +0000 (+0000)
Subject: GDK W32: drop cursor-related GdkWin32Display functions
X-Git-Tag: archive/raspbian/4.4.1+ds1-2+rpi1^2~18^2~22^2~757
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=5c9ae36c508466aa979848d17eff695e12ac4e75;p=gtk4.git

GDK W32: drop cursor-related GdkWin32Display functions

These functions went away in commit 77bab4e027c06dff7726d96fa4e477bc11b23835

https://bugzilla.gnome.org/show_bug.cgi?id=773299
---

diff --git a/gdk/win32/gdkcursor-win32.c b/gdk/win32/gdkcursor-win32.c
index 8e83cfae30..791ec00e9b 100644
--- a/gdk/win32/gdkcursor-win32.c
+++ b/gdk/win32/gdkcursor-win32.c
@@ -891,47 +891,6 @@ gdk_win32_icon_to_pixbuf_libgtk_only (HICON hicon,
   return pixbuf;
 }
 
-gboolean
-_gdk_win32_display_supports_cursor_alpha (GdkDisplay    *display)
-{
-  return TRUE;
-}
-
-gboolean
-_gdk_win32_display_supports_cursor_color (GdkDisplay    *display)
-{
-  return TRUE;
-}
-
-void
-_gdk_win32_display_get_default_cursor_size (GdkDisplay *display,
-					    guint      *width,
-					    guint      *height)
-{
-  /* TODO: Use per-monitor DPI functions (8.1 and newer) or
-   * calculate DPI ourselves and use that, assuming that 72 dpi
-   * corresponds to 32x32 cursors. Take into account that DPI
-   * can be artificially increased by the user to make stuff bigger.
-   */
-
-  if (width)
-    *width = GetSystemMetrics (SM_CXCURSOR);
-  if (height)
-    *height = GetSystemMetrics (SM_CYCURSOR);
-}
-
-void
-_gdk_win32_display_get_maximal_cursor_size (GdkDisplay *display,
-					    guint       *width,
-					    guint       *height)
-{
-  if (width)
-    *width = GetSystemMetrics (SM_CXCURSOR);
-  if (height)
-    *height = GetSystemMetrics (SM_CYCURSOR);
-}
-
-
 /* Convert a pixbuf to an HICON (or HCURSOR).  Supports alpha under
  * Windows XP, thresholds alpha otherwise.  Also used from
  * gdksurface-win32.c for creating application icons.
diff --git a/gdk/win32/gdkdisplay-win32.c b/gdk/win32/gdkdisplay-win32.c
index 821124ee3f..218461ebab 100644
--- a/gdk/win32/gdkdisplay-win32.c
+++ b/gdk/win32/gdkdisplay-win32.c
@@ -1157,10 +1157,6 @@ gdk_win32_display_class_init (GdkWin32DisplayClass *klass)
   display_class->supports_input_shapes = gdk_win32_display_supports_input_shapes;
 
   //? display_class->get_app_launch_context = _gdk_win32_display_get_app_launch_context;
-  display_class->get_default_cursor_size = _gdk_win32_display_get_default_cursor_size;
-  display_class->get_maximal_cursor_size = _gdk_win32_display_get_maximal_cursor_size;
-  display_class->supports_cursor_alpha = _gdk_win32_display_supports_cursor_alpha;
-  display_class->supports_cursor_color = _gdk_win32_display_supports_cursor_color;
 
   display_class->get_next_serial = gdk_win32_display_get_next_serial;
   display_class->notify_startup_complete = gdk_win32_display_notify_startup_complete;
diff --git a/gdk/win32/gdkprivate-win32.h b/gdk/win32/gdkprivate-win32.h
index 967618538d..186a89a6ab 100644
--- a/gdk/win32/gdkprivate-win32.h
+++ b/gdk/win32/gdkprivate-win32.h
@@ -360,15 +360,6 @@ void              win32_cursor_theme_destroy          (Win32CursorTheme *theme);
 Win32CursorTheme *_gdk_win32_display_get_cursor_theme (GdkWin32Display  *win32_display);
 
 /* GdkDisplay member functions */
-void     _gdk_win32_display_get_default_cursor_size (GdkDisplay  *display,
-                                                     guint       *width,
-                                                     guint       *height);
-void     _gdk_win32_display_get_maximal_cursor_size (GdkDisplay  *display,
-                                                     guint       *width,
-                                                     guint       *height);
-gboolean _gdk_win32_display_supports_cursor_alpha (GdkDisplay    *display);
-gboolean _gdk_win32_display_supports_cursor_color (GdkDisplay    *display);
-
 GList *_gdk_win32_display_list_devices (GdkDisplay *dpy);
 
 gboolean _gdk_win32_display_has_pending (GdkDisplay *display);