From: Luca Bacci <luca.bacci982@gmail.com>
Date: Fri, 14 Jan 2022 14:09:48 +0000 (+0100)
Subject: GdkWin32: Remove _gdk_input_codepage variable
X-Git-Tag: archive/raspbian/4.6.5+ds-1+rpi1~1^2~19^2~4^2~78^2~1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=4916ebd05e10ca5bbb28d351267bb954809b6207;p=gtk4.git

GdkWin32: Remove _gdk_input_codepage variable

It's unused
---

diff --git a/gdk/win32/gdkevents-win32.c b/gdk/win32/gdkevents-win32.c
index dda6066620..2c3dc5c6ae 100644
--- a/gdk/win32/gdkevents-win32.c
+++ b/gdk/win32/gdkevents-win32.c
@@ -1830,22 +1830,18 @@ gdk_event_translate (MSG *msg,
       {
         GdkWin32Keymap *win32_keymap;
         GdkTranslatedKey translated;
-        char buf[256];
 
         win32_keymap = GDK_WIN32_KEYMAP (_gdk_win32_display_get_keymap (_gdk_display));
 
         _gdk_input_locale = (HKL) msg->lParam;
         _gdk_win32_keymap_set_active_layout (win32_keymap, _gdk_input_locale);
-        GetLocaleInfo (MAKELCID (LOWORD (_gdk_input_locale), SORT_DEFAULT),
-                       LOCALE_IDEFAULTANSICODEPAGE, buf, sizeof (buf));
-        _gdk_input_codepage = atoi (buf);
         _gdk_keymap_serial++;
+
         GDK_NOTE (EVENTS,
-                  g_print (" cs:%lu hkl:%p%s cp:%d",
+                  g_print (" cs:%lu hkl:%p%s",
                            (gulong) msg->wParam,
                            (gpointer) msg->lParam,
-                           _gdk_input_locale_is_ime ? " (IME)" : "",
-                           _gdk_input_codepage));
+                           _gdk_input_locale_is_ime ? " (IME)" : ""));
         gdk_display_setting_changed (display, "gtk-im-module");
 
         /* Generate a dummy key event to "nudge" IMContext */
diff --git a/gdk/win32/gdkglobals-win32.c b/gdk/win32/gdkglobals-win32.c
index a5708ef161..07a6e4aa07 100644
--- a/gdk/win32/gdkglobals-win32.c
+++ b/gdk/win32/gdkglobals-win32.c
@@ -38,7 +38,6 @@ int		  _gdk_input_ignore_core;
 
 HKL		  _gdk_input_locale;
 gboolean	  _gdk_input_locale_is_ime = FALSE;
-UINT		  _gdk_input_codepage;
 
 GdkWin32ModalOpKind	  _modal_operation_in_progress = GDK_WIN32_MODAL_OP_NONE;
 HWND              _modal_move_resize_window = NULL;
diff --git a/gdk/win32/gdkmain-win32.c b/gdk/win32/gdkmain-win32.c
index 1a52f706e5..d140d8e644 100644
--- a/gdk/win32/gdkmain-win32.c
+++ b/gdk/win32/gdkmain-win32.c
@@ -52,7 +52,9 @@ static gboolean gdk_synchronize = FALSE;
 void
 _gdk_win32_surfaceing_init (void)
 {
-  char buf[10];
+  GdkWin32Keymap *win32_keymap;
+
+  win32_keymap = GDK_WIN32_KEYMAP (_gdk_win32_display_get_keymap (_gdk_display));
 
   if (gdk_synchronize)
     GdiSetBatchLimit (1);
@@ -60,13 +62,9 @@ _gdk_win32_surfaceing_init (void)
   _gdk_app_hmodule = GetModuleHandle (NULL);
   _gdk_display_hdc = CreateDC ("DISPLAY", NULL, NULL, NULL);
   _gdk_input_locale = GetKeyboardLayout (0);
-  _gdk_win32_keymap_set_active_layout (GDK_WIN32_KEYMAP (_gdk_win32_display_get_keymap (_gdk_display)), _gdk_input_locale);
-  GetLocaleInfo (MAKELCID (LOWORD (_gdk_input_locale), SORT_DEFAULT),
-		 LOCALE_IDEFAULTANSICODEPAGE,
-		 buf, sizeof (buf));
-  _gdk_input_codepage = atoi (buf);
-  GDK_NOTE (EVENTS, g_print ("input_locale:%p, codepage:%d\n",
-			     _gdk_input_locale, _gdk_input_codepage));
+  _gdk_win32_keymap_set_active_layout (win32_keymap, _gdk_input_locale);
+
+  GDK_NOTE (EVENTS, g_print ("input_locale: %p\n", _gdk_input_locale));
 
   _gdk_win32_clipdrop_init ();
 }
diff --git a/gdk/win32/gdkprivate-win32.h b/gdk/win32/gdkprivate-win32.h
index 69fdc4b9b7..652272c5cc 100644
--- a/gdk/win32/gdkprivate-win32.h
+++ b/gdk/win32/gdkprivate-win32.h
@@ -269,7 +269,6 @@ extern int               _gdk_input_ignore_core;
  */
 extern HKL               _gdk_input_locale;
 extern gboolean          _gdk_input_locale_is_ime;
-extern UINT              _gdk_input_codepage;
 
 extern guint             _gdk_keymap_serial;