From cbb3d3f1777ff279cc65876f3626a3eca43c7cf0 Mon Sep 17 00:00:00 2001 From: Luca Bacci Date: Tue, 30 May 2023 19:52:13 +0200 Subject: [PATCH] GdkWin32: Remove _gdk_display_hdc global variable --- gdk/win32/gdkglobals-win32.c | 2 -- gdk/win32/gdkmain-win32.c | 1 - gdk/win32/gdkprivate-win32.h | 2 -- gdk/win32/gdkproperty-win32.c | 10 +++++++++- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/gdk/win32/gdkglobals-win32.c b/gdk/win32/gdkglobals-win32.c index 63b6118ef5..50d4770d1b 100644 --- a/gdk/win32/gdkglobals-win32.c +++ b/gdk/win32/gdkglobals-win32.c @@ -30,8 +30,6 @@ GdkDisplay *_gdk_display = NULL; GdkDeviceManagerWin32 *_gdk_device_manager = NULL; -HDC _gdk_display_hdc; - int _gdk_input_ignore_core; HKL _gdk_input_locale; diff --git a/gdk/win32/gdkmain-win32.c b/gdk/win32/gdkmain-win32.c index 7356193500..c84a41bdfc 100644 --- a/gdk/win32/gdkmain-win32.c +++ b/gdk/win32/gdkmain-win32.c @@ -63,7 +63,6 @@ _gdk_win32_surfaceing_init (void) if (gdk_synchronize) GdiSetBatchLimit (1); - _gdk_display_hdc = CreateDC ("DISPLAY", NULL, NULL, NULL); _gdk_input_locale = GetKeyboardLayout (0); _gdk_win32_keymap_set_active_layout (win32_keymap, _gdk_input_locale); diff --git a/gdk/win32/gdkprivate-win32.h b/gdk/win32/gdkprivate-win32.h index 77070fd37b..777c496bf4 100644 --- a/gdk/win32/gdkprivate-win32.h +++ b/gdk/win32/gdkprivate-win32.h @@ -266,8 +266,6 @@ extern GdkDisplay *_gdk_display; extern GdkDeviceManagerWin32 *_gdk_device_manager; -extern HDC _gdk_display_hdc; - extern int _gdk_input_ignore_core; /* These are thread specific, but GDK/win32 works OK only when invoked diff --git a/gdk/win32/gdkproperty-win32.c b/gdk/win32/gdkproperty-win32.c index 0b0b51d5f1..c92853e70b 100644 --- a/gdk/win32/gdkproperty-win32.c +++ b/gdk/win32/gdkproperty-win32.c @@ -113,7 +113,15 @@ _gdk_win32_get_setting (const char *name, } else if (strcmp ("gtk-font-name", name) == 0) { - char *font_name = _get_system_font_name (_gdk_display_hdc); + char *font_name = NULL; + HDC hdc = NULL; + + if ((hdc = GetDC (HWND_DESKTOP)) != NULL) + { + font_name = _get_system_font_name (hdc); + ReleaseDC (HWND_DESKTOP, hdc); + hdc = NULL; + } if (font_name) { -- 2.30.2