fixed results of strange cvs code merge

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11902 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index f192a7ef11a36ad15ab088e101beadb9d0fa755d..e9f5e00cbb15dbe7c95db0e3c90072d2eb5c125d 100644 (file)
--- 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 f192a7ef11a36ad15ab088e101beadb9d0fa755d..e9f5e00cbb15dbe7c95db0e3c90072d2eb5c125d 100644 (file)
--- 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;