From: Luca Bacci <luca.bacci982@gmail.com>
Date: Mon, 17 Oct 2022 19:20:08 +0000 (+0000)
Subject: Merge branch 'forward-port-mr-991-to-gtk4-2' into 'main'
X-Git-Tag: archive/raspbian/4.12.3+ds-1+rpi1~1^2^2^2~22^2~9^2~168
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=995f00d23fa841c409c183f691769a4d6983bad2;p=gtk4.git

Merge branch 'forward-port-mr-991-to-gtk4-2' into 'main'

Use native Windows API for converting keystrokes to characters

Closes #2944

See merge request GNOME/gtk!4986
---

995f00d23fa841c409c183f691769a4d6983bad2
diff --cc gtk/gtkimcontextime.c
index 33a69f45c5,1fba0af36f..a2ecd61aee
--- a/gtk/gtkimcontextime.c
+++ b/gtk/gtkimcontextime.c
@@@ -34,9 -34,10 +34,10 @@@
  #include "imm-extra.h"
  
  #include "gdk/gdkkeysyms.h"
+ #include "gdk/gdkeventsprivate.h"
  #include "gdk/win32/gdkwin32.h"
  #include "gtk/gtkimmodule.h"
 -#include "gtk/gtkstylecontextprivate.h"
 +#include "gtk/deprecated/gtkstylecontextprivate.h"
  #include "gtk/gtkcssstyleprivate.h"
  
  /* avoid warning */