From 29d18d6945b531aae7d3658a9d1f986184757e89 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 9 Oct 2001 15:11:22 +0000 Subject: [PATCH] fixed results of strange cvs code merge git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11902 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/gtk/window.cpp | 15 +++++---------- src/gtk1/window.cpp | 15 +++++---------- 2 files changed, 10 insertions(+), 20 deletions(-) diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp index f192a7ef11..e9f5e00cbb 100644 --- a/src/gtk/window.cpp +++ b/src/gtk/window.cpp @@ -683,19 +683,14 @@ static long map_to_wx_keysym( GdkEventKey *event ) case GDK_F11: key_code = WXK_F11; break; case GDK_F12: key_code = WXK_F12; break; default: - { if (event->length == 1) { - if (event->length == 1) - { - key_code = (unsigned char)*event->string; - } - else if ((keysym & 0xFF) == keysym) - { - key_code = (guint)keysym; - } + key_code = (unsigned char)*event->string; + } + else if ((keysym & 0xFF) == keysym) + { + key_code = (guint)keysym; } - } } return key_code; diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp index f192a7ef11..e9f5e00cbb 100644 --- a/src/gtk1/window.cpp +++ b/src/gtk1/window.cpp @@ -683,19 +683,14 @@ static long map_to_wx_keysym( GdkEventKey *event ) case GDK_F11: key_code = WXK_F11; break; case GDK_F12: key_code = WXK_F12; break; default: - { if (event->length == 1) { - if (event->length == 1) - { - key_code = (unsigned char)*event->string; - } - else if ((keysym & 0xFF) == keysym) - { - key_code = (guint)keysym; - } + key_code = (unsigned char)*event->string; + } + else if ((keysym & 0xFF) == keysym) + { + key_code = (guint)keysym; } - } } return key_code;