From 1dc1d66fe1b4c91d965fc7e0291a3d84284095de Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 17 Feb 2018 14:49:54 +0100 Subject: [PATCH] Stop using Fn keys as accelerators in the widgets sample 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. --- samples/widgets/widgets.cpp | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/samples/widgets/widgets.cpp b/samples/widgets/widgets.cpp index 8fa5ebb5fb83..90ac92a059bf 100644 --- a/samples/widgets/widgets.cpp +++ b/samples/widgets/widgets.cpp @@ -541,7 +541,7 @@ void WidgetsFrame::InitBook() wxArrayString labels[MAX_PAGES]; wxMenu *menuPages = new wxMenu; - unsigned int nPage = 0, nFKey = 0; + unsigned int nPage = 0; int cat, imageId = 1; // 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()); if ( cat == ALL_PAGE ) { - wxString radioLabel(info->GetLabel()); - nFKey++; - if ( nFKey <= 12 ) - { - radioLabel << wxT("\tF" ) << nFKey; - } - menuPages->AppendRadioItem( Widgets_GoToPage + nPage, - radioLabel + info->GetLabel() ); #if !USE_TREEBOOK // consider only for book in book architecture