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

fix for items without accelerators

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4197 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1999-10-26 13:45:29 +00:00
parent af111fc338
commit 505928852c
2 changed files with 86 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
src/gtk/menu.cpp
View File

@@ -810,51 +810,56 @@ static wxString GetHotKey( const wxMenuItem& item )
// as wxGetAccelFromString() looks for TAB, insert a dummy one here // as wxGetAccelFromString() looks for TAB, insert a dummy one here
wxString label; wxString label;
label << wxT('\t') << item.GetHotKey(); label << wxT('\t') << item.GetHotKey();
wxAcceleratorEntry *accel = wxGetAccelFromString(label);
if ( accel ) // but if the hotkey is empty don't do anything
if ( label.length() > 1 )
{ {
int flags = accel->GetFlags(); wxAcceleratorEntry *accel = wxGetAccelFromString(label);
if ( flags & wxACCEL_ALT ) if ( accel )
hotkey += wxT("<alt>");
if ( flags & wxACCEL_CTRL )
hotkey += wxT("<control>");
if ( flags & wxACCEL_SHIFT )
hotkey += wxT("<shift>");
int code = accel->GetKeyCode();
switch ( code )
{ {
case WXK_F1: int flags = accel->GetFlags();
case WXK_F2: if ( flags & wxACCEL_ALT )
case WXK_F3: hotkey += wxT("<alt>");
case WXK_F4: if ( flags & wxACCEL_CTRL )
case WXK_F5: hotkey += wxT("<control>");
case WXK_F6: if ( flags & wxACCEL_SHIFT )
case WXK_F7: hotkey += wxT("<shift>");
case WXK_F8:
case WXK_F9:
case WXK_F10:
case WXK_F11:
case WXK_F12:
hotkey << wxT('F') << code = WXK_F1 + 1;
break;
// if there are any other keys wxGetAccelFromString() may return,
// we should process them here
default:
if ( wxIsalnum(code) )
{
hotkey << (wxChar)code;
int code = accel->GetKeyCode();
switch ( code )
{
case WXK_F1:
case WXK_F2:
case WXK_F3:
case WXK_F4:
case WXK_F5:
case WXK_F6:
case WXK_F7:
case WXK_F8:
case WXK_F9:
case WXK_F10:
case WXK_F11:
case WXK_F12:
hotkey << wxT('F') << code = WXK_F1 + 1;
break; break;
}
wxFAIL_MSG( wxT("unknown keyboard accel") ); // if there are any other keys wxGetAccelFromString() may return,
// we should process them here
default:
if ( wxIsalnum(code) )
{
hotkey << (wxChar)code;
break;
}
wxFAIL_MSG( wxT("unknown keyboard accel") );
}
delete accel;
} }
} }
if (accel)
delete accel;
return hotkey; return hotkey;
} }

81
src/gtk1/menu.cpp
View File

@@ -810,51 +810,56 @@ static wxString GetHotKey( const wxMenuItem& item )
// as wxGetAccelFromString() looks for TAB, insert a dummy one here // as wxGetAccelFromString() looks for TAB, insert a dummy one here
wxString label; wxString label;
label << wxT('\t') << item.GetHotKey(); label << wxT('\t') << item.GetHotKey();
wxAcceleratorEntry *accel = wxGetAccelFromString(label);
if ( accel ) // but if the hotkey is empty don't do anything
if ( label.length() > 1 )
{ {
int flags = accel->GetFlags(); wxAcceleratorEntry *accel = wxGetAccelFromString(label);
if ( flags & wxACCEL_ALT ) if ( accel )
hotkey += wxT("<alt>");
if ( flags & wxACCEL_CTRL )
hotkey += wxT("<control>");
if ( flags & wxACCEL_SHIFT )
hotkey += wxT("<shift>");
int code = accel->GetKeyCode();
switch ( code )
{ {
case WXK_F1: int flags = accel->GetFlags();
case WXK_F2: if ( flags & wxACCEL_ALT )
case WXK_F3: hotkey += wxT("<alt>");
case WXK_F4: if ( flags & wxACCEL_CTRL )
case WXK_F5: hotkey += wxT("<control>");
case WXK_F6: if ( flags & wxACCEL_SHIFT )
case WXK_F7: hotkey += wxT("<shift>");
case WXK_F8:
case WXK_F9:
case WXK_F10:
case WXK_F11:
case WXK_F12:
hotkey << wxT('F') << code = WXK_F1 + 1;
break;
// if there are any other keys wxGetAccelFromString() may return,
// we should process them here
default:
if ( wxIsalnum(code) )
{
hotkey << (wxChar)code;
int code = accel->GetKeyCode();
switch ( code )
{
case WXK_F1:
case WXK_F2:
case WXK_F3:
case WXK_F4:
case WXK_F5:
case WXK_F6:
case WXK_F7:
case WXK_F8:
case WXK_F9:
case WXK_F10:
case WXK_F11:
case WXK_F12:
hotkey << wxT('F') << code = WXK_F1 + 1;
break; break;
}
wxFAIL_MSG( wxT("unknown keyboard accel") ); // if there are any other keys wxGetAccelFromString() may return,
// we should process them here
default:
if ( wxIsalnum(code) )
{
hotkey << (wxChar)code;
break;
}
wxFAIL_MSG( wxT("unknown keyboard accel") );
}
delete accel;
} }
} }
if (accel)
delete accel;
return hotkey; return hotkey;
} }