Merge branch 'forward-port-mr-991-to-gtk4-2' into 'main'
authorLuca Bacci <luca.bacci982@gmail.com>
Mon, 17 Oct 2022 19:20:08 +0000 (19:20 +0000)
committerLuca Bacci <luca.bacci982@gmail.com>
Mon, 17 Oct 2022 19:20:08 +0000 (19:20 +0000)
Use native Windows API for converting keystrokes to characters

Closes #2944

See merge request GNOME/gtk!4986

1  2 
gdk/gdkevents.c
gdk/macos/gdkmacossurface.c
gdk/wayland/gdkdevice-wayland.c
gdk/win32/gdkevents-win32.c
gdk/x11/gdkdevicemanager-xi2.c
gtk/gtkimcontext.c
gtk/gtkimcontextime.c
gtk/gtkimcontextsimple.c
gtk/gtkmain.c

diff --cc gdk/gdkevents.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 33a69f45c55d844d119dd210ca828800056da03b,1fba0af36fe217ecdf828d31164a0ce50eec91fd..a2ecd61aee5974a980249e491f9ccce24b24a87c
  #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 */
Simple merge
diff --cc gtk/gtkmain.c
Simple merge