diff options
| author | Michael Natterer <mitch@lanedo.com> | 2011-10-07 16:10:19 +0200 |
|---|---|---|
| committer | Michael Natterer <mitch@gimp.org> | 2011-10-07 16:19:41 +0200 |
| commit | 5b74ee38e87c60e32de2053eec48dd3f67655a46 (patch) | |
| tree | 0acd7556525ce7f7c613789b89506f4ca1c76d8b /gdk/gdkdisplaymanager.c | |
| parent | 87cc0dc79fe77c46508e89d677bc52ff12915d9a (diff) | |
| download | gtk+-5b74ee38e87c60e32de2053eec48dd3f67655a46.tar.gz | |
gdk: fix gdk_keyval_to_lower/upper() for Quartz, Win32 and Broadway
In 2.x, the !HAVE_XCONVERTCASE fallback of keyval_convert_case() was
implicitly used as implementation for all !X11 backends.
In 3.x, when this function was virtualized in GdkDisplayManager,
this fallback was moved to the X11 backend and the other backends
"equipped" with /* FIXME implement */ implementations of
keyval_convert_case() which don't convert anything.
Move the fallback code back to gdk/ as default implementation
of GdkDisplayManager::keyval_convert_case() and remove its
implementations is all backends but X11. Also remove the
implementation in Wayland which was a plain copy of what
is now the default implementation.
(cherry picked from commit f46c1b76d839a03bdc8080bc130fabd1068f2557)
Diffstat (limited to 'gdk/gdkdisplaymanager.c')
| -rw-r--r-- | gdk/gdkdisplaymanager.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/gdk/gdkdisplaymanager.c b/gdk/gdkdisplaymanager.c index c21ea02c21..f638f6de45 100644 --- a/gdk/gdkdisplaymanager.c +++ b/gdk/gdkdisplaymanager.c @@ -29,6 +29,7 @@ #include "gdkconfig.h" #include "gdkdisplaymanagerprivate.h" #include "gdkinternals.h" +#include "gdkkeysprivate.h" #include "gdkmarshalers.h" #include "gdkintl.h" @@ -136,6 +137,8 @@ gdk_display_manager_class_init (GdkDisplayManagerClass *klass) object_class->set_property = gdk_display_manager_set_property; object_class->get_property = gdk_display_manager_get_property; + klass->keyval_convert_case = _gdk_display_manager_real_keyval_convert_case; + /** * GdkDisplayManager::display-opened: * @manager: the object on which the signal is emitted |