[gtk: 2/2] Merge branch 'forward-port-mr-991-to-gtk4-2' into 'main'

[Luca Bacci <lbacci src gnome org>]

commit 995f00d23fa841c409c183f691769a4d6983bad2
Merge: 1246cd5e73 c84c469b78
Author: Luca Bacci <luca bacci982 gmail com>
Date:   Mon Oct 17 19:20:08 2022 +0000

    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

 gdk/broadway/gdkeventsource.c         |   3 +-
 gdk/gdkevents.c                       |  40 +++++++++-
 gdk/gdkeventsprivate.h                |  10 ++-
 gdk/macos/gdkmacosdisplay-translate.c |   3 +-
 gdk/macos/gdkmacossurface.c           |   3 +-
 gdk/wayland/gdkdevice-wayland.c       |   3 +-
 gdk/win32/gdkevents-win32.c           | 143 ++++++++++++++--------------------
 gdk/win32/gdksurface-win32.h          |   8 --
 gdk/x11/gdkdevicemanager-xi2.c        |   3 +-
 gtk/gtkimcontext.c                    |   3 +-
 gtk/gtkimcontextime.c                 | 123 ++---------------------------
 gtk/gtkimcontextsimple.c              |   3 +-
 gtk/gtkmain.c                         |   3 +-
 13 files changed, 127 insertions(+), 221 deletions(-)
---
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 */