[gtk/wip/otte/win32-cleanup: 52/63] win32: Remove gdkscreen-win32.c

[Benjamin Otte <otte src gnome org>]

commit f97b53a5ddf5a639c159cd7b4c100a973b2fd287
Author: Benjamin Otte <otte redhat com>
Date:   Tue Jul 20 19:43:00 2021 +0200

    win32: Remove gdkscreen-win32.c
    
    It's been entirely unused fora while.

 gdk/win32/gdkdisplay-win32.c |  13 +++--
 gdk/win32/gdkdisplay-win32.h |   7 +--
 gdk/win32/gdkscreen-win32.c  | 114 -------------------------------------------
 gdk/win32/meson.build        |   1 -
 4 files changed, 7 insertions(+), 128 deletions(-)
---
diff --git a/gdk/win32/gdkdisplay-win32.c b/gdk/win32/gdkdisplay-win32.c
index d8ef0208fa..95097ae6f0 100644
--- a/gdk/win32/gdkdisplay-win32.c
+++ b/gdk/win32/gdkdisplay-win32.c
@@ -30,7 +30,6 @@
 #include "gdkdevicemanager-win32.h"
 #include "gdkglcontext-win32.h"
 #include "gdkwin32display.h"
-#include "gdkwin32screen.h"
 #include "gdkwin32surface.h"
 #include "gdkmonitor-win32.h"
 #include "gdkwin32.h"
@@ -190,8 +189,8 @@ _gdk_win32_display_find_matching_monitor (GdkWin32Display *win32_display,
   return NULL;
 }
 
-void
-_gdk_win32_display_init_monitors (GdkWin32Display *win32_display)
+static void
+gdk_win32_display_init_monitors (GdkWin32Display *win32_display)
 {
   GPtrArray *new_monitors;
   int i;
@@ -437,9 +436,9 @@ inner_display_change_window_procedure (HWND   hwnd,
       }
     case WM_DISPLAYCHANGE:
       {
-        GdkWin32Display *win32_display = GDK_WIN32_DISPLAY (GetWindowLongPtr (hwnd, GWLP_USERDATA));
+        GdkWin32Display *self = GDK_WIN32_DISPLAY (GetWindowLongPtr (hwnd, GWLP_USERDATA));
 
-        _gdk_win32_screen_on_displaychange_event (GDK_WIN32_SCREEN (win32_display->screen));
+        gdk_win32_display_init_monitors (self);
         return 0;
       }
     default:
@@ -524,8 +523,8 @@ _gdk_win32_display_open (const char *display_name)
   _gdk_display = g_object_new (GDK_TYPE_WIN32_DISPLAY, NULL);
   win32_display = GDK_WIN32_DISPLAY (_gdk_display);
 
-  win32_display->screen = g_object_new (GDK_TYPE_WIN32_SCREEN, NULL);
-
+  gdk_win32_display_init_monitors (win32_display);
+  
   _gdk_events_init (_gdk_display);
 
   _gdk_input_ignore_core = 0;
diff --git a/gdk/win32/gdkdisplay-win32.h b/gdk/win32/gdkdisplay-win32.h
index 221987c537..4b81bfff36 100644
--- a/gdk/win32/gdkdisplay-win32.h
+++ b/gdk/win32/gdkdisplay-win32.h
@@ -22,7 +22,6 @@
 #ifndef __GDK_DISPLAY__WIN32_H__
 #define __GDK_DISPLAY__WIN32_H__
 
-#include "gdkwin32screen.h"
 #include "gdkwin32cursor.h"
  
 #ifdef GDK_WIN32_ENABLE_EGL
@@ -116,9 +115,7 @@ struct _GdkWin32Display
 {
   GdkDisplay display;
 
-  GdkWin32Screen *screen;
-
-  Win32CursorTheme *cursor_theme;
+    Win32CursorTheme *cursor_theme;
   char *cursor_theme_name;
   int cursor_theme_size;
 
@@ -185,8 +182,6 @@ struct _GdkWin32DisplayClass
   GdkDisplayClass display_class;
 };
 
-void       _gdk_win32_display_init_monitors    (GdkWin32Display *display);
-
 GPtrArray *_gdk_win32_display_get_monitor_list (GdkWin32Display *display);
 
 void        gdk_win32_display_check_composited (GdkWin32Display *display);
diff --git a/gdk/win32/meson.build b/gdk/win32/meson.build
index 1f4c9d6e9f..796cec8fb9 100644
--- a/gdk/win32/meson.build
+++ b/gdk/win32/meson.build
@@ -21,7 +21,6 @@ gdk_win32_sources = files([
   'gdkmain-win32.c',
   'gdkmonitor-win32.c',
   'gdkproperty-win32.c',
-  'gdkscreen-win32.c',
   'gdkvulkancontext-win32.c',
   'gdkwin32cursor.h',
   'gdkwin32display.h',