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

Stop using Fn keys as accelerators in the widgets sample

Browse Source 
This prevented them from being used for their usual purposes, e.g. F4
didn't open the combobox dropdown under MSW, which was annoying as it
made testing more difficult.

Just stop using the accelerators, especially as they could be only used
for less than half of pages anyhow.
This commit is contained in:
Vadim Zeitlin
2018-02-17 14:49:54 +01:00
parent 4179375f3e
commit 1dc1d66fe1
1 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
samples/widgets/widgets.cpp
View File

@@ -541,7 +541,7 @@ void WidgetsFrame::InitBook()
wxArrayString labels[MAX_PAGES]; wxArrayString labels[MAX_PAGES];
wxMenu *menuPages = new wxMenu; wxMenu *menuPages = new wxMenu;
unsigned int nPage = 0, nFKey = 0; unsigned int nPage = 0;
int cat, imageId = 1; int cat, imageId = 1;
// we need to first create all pages and only then add them to the book // we need to first create all pages and only then add them to the book
@@ -579,16 +579,9 @@ void WidgetsFrame::InitBook()
labels[cat].Add(info->GetLabel()); labels[cat].Add(info->GetLabel());
if ( cat == ALL_PAGE ) if ( cat == ALL_PAGE )
{ {
wxString radioLabel(info->GetLabel());
nFKey++;
if ( nFKey <= 12 )
{
radioLabel << wxT("\tF" ) << nFKey;
}
menuPages->AppendRadioItem( menuPages->AppendRadioItem(
Widgets_GoToPage + nPage, Widgets_GoToPage + nPage,
radioLabel info->GetLabel()
); );
#if !USE_TREEBOOK #if !USE_TREEBOOK
// consider only for book in book architecture // consider only for book in book architecture