summaryrefslogtreecommitdiff
path: root/gdk/win32
diff options
context:
space:
mode:
authorMichael Natterer <mitch@lanedo.com>2011-10-07 16:10:19 +0200
committerMichael Natterer <mitch@gimp.org>2011-10-07 16:19:41 +0200
commit5b74ee38e87c60e32de2053eec48dd3f67655a46 (patch)
tree0acd7556525ce7f7c613789b89506f4ca1c76d8b /gdk/win32
parent87cc0dc79fe77c46508e89d677bc52ff12915d9a (diff)
downloadgtk+-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/win32')
-rw-r--r--gdk/win32/gdkdisplaymanager-win32.c14
1 files changed, 0 insertions, 14 deletions
diff --git a/gdk/win32/gdkdisplaymanager-win32.c b/gdk/win32/gdkdisplaymanager-win32.c
index 3df8d1752e..1f2a0297c7 100644
--- a/gdk/win32/gdkdisplaymanager-win32.c
+++ b/gdk/win32/gdkdisplaymanager-win32.c
@@ -83,19 +83,6 @@ gdk_win32_display_manager_lookup_keyval (GdkDisplayManager *manager,
}
static void
-gdk_win32_display_manager_keyval_convert_case (GdkDisplayManager *manager,
- guint symbol,
- guint *lower,
- guint *upper)
-{
- /* FIXME implement this */
- if (lower)
- *lower = symbol;
- if (upper)
- *upper = symbol;
-}
-
-static void
gdk_win32_display_manager_init (GdkWin32DisplayManager *manager)
{
static once = TRUE;
@@ -131,5 +118,4 @@ gdk_win32_display_manager_class_init (GdkWin32DisplayManagerClass *class)
manager_class->get_atom_name = _gdk_win32_display_manager_get_atom_name;
manager_class->lookup_keyval = gdk_win32_display_manager_lookup_keyval;
manager_class->get_keyval_name = gdk_win32_display_manager_get_keyval_name;
- manager_class->keyval_convert_case = gdk_win32_display_manager_keyval_convert_case;
}