From 441f0484260b58147345fccda758948702fd884c Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Tue, 24 Jul 2007 14:40:21 +0000 Subject: [PATCH] Cosmetic changes. 2007-07-24 Tor Lillqvist * gdk/win32/gdkkeys-win32.c (update_keymap): Cosmetic changes. svn path=/trunk/; revision=18538 --- ChangeLog | 4 ++++ gdk/win32/gdkkeys-win32.c | 11 +++-------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7b6ba7fb40..6f1222b60c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2007-07-24 Tor Lillqvist + + * gdk/win32/gdkkeys-win32.c (update_keymap): Cosmetic changes. + 2007-07-24 Matthias Clasen * gtk/gtkmenubar.c (window_key_press_handler): diff --git a/gdk/win32/gdkkeys-win32.c b/gdk/win32/gdkkeys-win32.c index f2bdae970e..65310cc901 100644 --- a/gdk/win32/gdkkeys-win32.c +++ b/gdk/win32/gdkkeys-win32.c @@ -384,22 +384,17 @@ update_keymap (void) wchar_t wcs[10]; gint k; + wcs[0] = wcs[1] = 0; k = ToUnicodeEx (vk, scancode, key_state, wcs, G_N_ELEMENTS (wcs), 0, _gdk_input_locale); #if 0 - g_print ("ToUnicodeEx(%02x, %d: %d): %d, %04x %04x\n", + g_print ("ToUnicodeEx(%#02x, %d: %d): %d, %04x %04x\n", vk, scancode, shift, k, - (k != 0 ? wcs[0] : 0), - (k >= 2 ? wcs[1] : 0)); + wcs[0], wcs[1]); #endif if (k == 1) *ksymp = gdk_unicode_to_keyval (wcs[0]); - - if (k == 1) - { - /* Keysym already stored above */ - } else if (k == -1) { guint keysym = gdk_unicode_to_keyval (wcs[0]);