Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes from review

Browse Source
This commit is contained in:
Ian McInerney
2019-08-25 17:31:02 +02:00
parent e961307043
commit 2c146d830d
2 changed files with 15 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/common/accelcmn.cpp
View File

@@ -193,8 +193,8 @@ bool wxAcceleratorEntry::ValidateKey(int flags, int keycode)
if ( !flags ) if ( !flags )
{ {
valid = false; valid = false;
wxLogDebug( wxString::Format( wxT("Compatibility issue: %s key must have modifiers to be an accelerator key on GTK"), wxLogDebug( "Compatibility issue: %s key must have modifiers to be an accelerator key on GTK",
keyname ) ); keyname );
} }
break; break;
@@ -238,8 +238,8 @@ bool wxAcceleratorEntry::ValidateKey(int flags, int keycode)
case WXK_SPECIAL16: case WXK_SPECIAL17: case WXK_SPECIAL18: case WXK_SPECIAL16: case WXK_SPECIAL17: case WXK_SPECIAL18:
case WXK_SPECIAL19: case WXK_SPECIAL20: case WXK_SPECIAL19: case WXK_SPECIAL20:
valid = false; valid = false;
wxLogDebug( wxString::Format( wxT("Compatibility issue: %s is not supported as a keyboard accelerator key on GTK"), wxLogDebug( "Compatibility issue: %s is not supported as a keyboard accelerator key on GTK",
keyname ) ); keyname );
break; break;
} }

49
src/gtk/menu.cpp
View File

@@ -1062,37 +1062,25 @@ static wxString GetGtkHotKey( const wxMenuItem& item )
if ( flags ) if ( flags )
hotkey << wxT("Up" ); hotkey << wxT("Up" );
else else
{ hotkey.clear();
wxLogDebug( wxT("The Up key must have modifiers to be an accelerator key") );
hotkey.Clear();
}
break; break;
case WXK_DOWN: case WXK_DOWN:
if ( flags ) if ( flags )
hotkey << wxT("Down" ); hotkey << wxT("Down" );
else else
{ hotkey.clear();
wxLogDebug( wxT("The Down key must have modifiers to be an accelerator key") );
hotkey.Clear();
}
break; break;
case WXK_LEFT: case WXK_LEFT:
if ( flags ) if ( flags )
hotkey << wxT("Left" ); hotkey << wxT("Left" );
else else
{ hotkey.clear();
wxLogDebug( wxT("The Left key must have modifiers to be an accelerator key") );
hotkey.Clear();
}
break; break;
case WXK_RIGHT: case WXK_RIGHT:
if ( flags ) if ( flags )
hotkey << wxT("Right" ); hotkey << wxT("Right" );
else else
{ hotkey.clear();
wxLogDebug( wxT("The Right key must have modifiers to be an accelerator key") );
hotkey.Clear();
}
break; break;
case WXK_PAGEUP: case WXK_PAGEUP:
hotkey << wxT("Page_Up" ); hotkey << wxT("Page_Up" );
@@ -1168,37 +1156,25 @@ static wxString GetGtkHotKey( const wxMenuItem& item )
if ( flags ) if ( flags )
hotkey << wxT("KP_Up" ); hotkey << wxT("KP_Up" );
else else
{ hotkey.clear();
wxLogDebug( wxT("The KP_Up key must have modifiers to be an accelerator key") );
hotkey.Clear();
}
break; break;
case WXK_NUMPAD_DOWN: case WXK_NUMPAD_DOWN:
if ( flags ) if ( flags )
hotkey << wxT("KP_Down" ); hotkey << wxT("KP_Down" );
else else
{ hotkey.clear();
wxLogDebug( wxT("The KP_Down key must have modifiers to be an accelerator key") );
hotkey.Clear();
}
break; break;
case WXK_NUMPAD_LEFT: case WXK_NUMPAD_LEFT:
if ( flags ) if ( flags )
hotkey << wxT("KP_Left" ); hotkey << wxT("KP_Left" );
else else
{ hotkey.clear();
wxLogDebug( wxT("The KP_Left key must have modifiers to be an accelerator key") );
hotkey.Clear();
}
break; break;
case WXK_NUMPAD_RIGHT: case WXK_NUMPAD_RIGHT:
if ( flags ) if ( flags )
hotkey << wxT("KP_Right" ); hotkey << wxT("KP_Right" );
else else
{ hotkey.clear();
wxLogDebug( wxT("The KP_Right key must have modifiers to be an accelerator key") );
hotkey.Clear();
}
break; break;
case WXK_NUMPAD_PAGEUP: case WXK_NUMPAD_PAGEUP:
hotkey << wxT("KP_Page_Up" ); hotkey << wxT("KP_Page_Up" );
@@ -1282,9 +1258,7 @@ static wxString GetGtkHotKey( const wxMenuItem& item )
case WXK_SPECIAL13: case WXK_SPECIAL14: case WXK_SPECIAL15: case WXK_SPECIAL13: case WXK_SPECIAL14: case WXK_SPECIAL15:
case WXK_SPECIAL16: case WXK_SPECIAL17: case WXK_SPECIAL18: case WXK_SPECIAL16: case WXK_SPECIAL17: case WXK_SPECIAL18:
case WXK_SPECIAL19: case WXK_SPECIAL20: case WXK_SPECIAL19: case WXK_SPECIAL20:
wxLogDebug( wxString::Format( wxT("Unsupported keyboard accelerator key: %s"), hotkey.clear();
accel->ToString() ) );
hotkey.Clear();
break; break;
// if there are any other keys wxAcceleratorEntry::Create() may // if there are any other keys wxAcceleratorEntry::Create() may
@@ -1302,9 +1276,8 @@ static wxString GetGtkHotKey( const wxMenuItem& item )
} }
} }
wxLogDebug( wxString::Format( wxT("unknown keyboard accelerator key code: %i"), wxLogDebug( "Unknown keyboard accelerator key code: %i", code );
code ) ); hotkey.clear();
hotkey.Clear();
} }
delete accel; delete accel;