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

9
src/gtk/menu.cpp
View File

@@ -810,6 +810,10 @@ 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();
// but if the hotkey is empty don't do anything
if ( label.length() > 1 )
{
wxAcceleratorEntry *accel = wxGetAccelFromString(label); wxAcceleratorEntry *accel = wxGetAccelFromString(label);
if ( accel ) if ( accel )
{ {
@@ -852,9 +856,10 @@ static wxString GetHotKey( const wxMenuItem& item )
wxFAIL_MSG( wxT("unknown keyboard accel") ); wxFAIL_MSG( wxT("unknown keyboard accel") );
} }
}
if (accel)
delete accel; delete accel;
}
}
return hotkey; return hotkey;
} }

9
src/gtk1/menu.cpp
View File

@@ -810,6 +810,10 @@ 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();
// but if the hotkey is empty don't do anything
if ( label.length() > 1 )
{
wxAcceleratorEntry *accel = wxGetAccelFromString(label); wxAcceleratorEntry *accel = wxGetAccelFromString(label);
if ( accel ) if ( accel )
{ {
@@ -852,9 +856,10 @@ static wxString GetHotKey( const wxMenuItem& item )
wxFAIL_MSG( wxT("unknown keyboard accel") ); wxFAIL_MSG( wxT("unknown keyboard accel") );
} }
}
if (accel)
delete accel; delete accel;
}
}
return hotkey; return hotkey;
} }