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:
@@ -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;
|
||||
}
|
||||
|
@@ -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;
|
||||
}
|
||||
|
Reference in New Issue
Block a user