fixed results of strange cvs code merge

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11902 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2001-10-09 15:11:22 +00:00
parent 56cfd0d766
commit 29d18d6945
2 changed files with 10 additions and 20 deletions

View File

@@ -683,9 +683,6 @@ 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;
@@ -695,8 +692,6 @@ static long map_to_wx_keysym( GdkEventKey *event )
key_code = (guint)keysym;
}
}
}
}
return key_code;
}

View File

@@ -683,9 +683,6 @@ 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;
@@ -695,8 +692,6 @@ static long map_to_wx_keysym( GdkEventKey *event )
key_code = (guint)keysym;
}
}
}
}
return key_code;
}