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

Replace fail msg with logdebug in the GTK accelerator creation

Browse Source
This commit is contained in:
Ian McInerney
2019-08-25 15:22:15 +02:00
parent 050ca4ce3a
commit 2a08afb369
1 changed files with 38 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/gtk/menu.cpp
View File

@@ -1062,25 +1062,37 @@ static wxString GetGtkHotKey( const wxMenuItem& item )
if ( flags ) if ( flags )
hotkey << wxT("Up" ); hotkey << wxT("Up" );
else else
wxFAIL_MSG( wxT("The Up key must have modifiers to be an accelerator key") ); {
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
wxFAIL_MSG( wxT("The Down key must have modifiers to be an accelerator key") ); {
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
wxFAIL_MSG( wxT("The Left key must have modifiers to be an accelerator key") ); {
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
wxFAIL_MSG( wxT("The Right key must have modifiers to be an accelerator key") ); {
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" );
@@ -1156,25 +1168,37 @@ static wxString GetGtkHotKey( const wxMenuItem& item )
if ( flags ) if ( flags )
hotkey << wxT("KP_Up" ); hotkey << wxT("KP_Up" );
else else
wxFAIL_MSG( wxT("The KP_Up key must have modifiers to be an accelerator key") ); {
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
wxFAIL_MSG( wxT("The KP_Down key must have modifiers to be an accelerator key") ); {
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
wxFAIL_MSG( wxT("The KP_Left key must have modifiers to be an accelerator key") ); {
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
wxFAIL_MSG( wxT("The KP_Right key must have modifiers to be an accelerator key") ); {
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" );
@@ -1258,7 +1282,9 @@ 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:
wxFAIL_MSG( wxT("Unsupported keyboard accelerator key") ); wxLogDebug( wxString::Format( wxT("Unsupported keyboard accelerator key: %s"),
accel->ToString() ) );
hotkey.Clear();
break; break;
// if there are any other keys wxAcceleratorEntry::Create() may // if there are any other keys wxAcceleratorEntry::Create() may
@@ -1276,7 +1302,9 @@ static wxString GetGtkHotKey( const wxMenuItem& item )
} }
} }
wxFAIL_MSG( wxT("unknown keyboard accel") ); wxLogDebug( wxString::Format( wxT("unknown keyboard accelerator key code: %i"),
code ) );
hotkey.Clear();
} }
delete accel; delete accel;