From a30305f8b0413a7df8a49d669e64502cdd46a345 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 17 Dec 2009 16:44:22 +0000 Subject: [PATCH] Add test of accelerators using both ASCII and non-ASCII keys to the sample. Test using 'Ctrl-A', just 'A' and 'Esc' as accelerators as all of them except the first one were reported not to work in some cases. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62914 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- samples/keyboard/keyboard.cpp | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/samples/keyboard/keyboard.cpp b/samples/keyboard/keyboard.cpp index eb45da0..9a98028 100644 --- a/samples/keyboard/keyboard.cpp +++ b/samples/keyboard/keyboard.cpp @@ -32,8 +32,17 @@ private: // event handlers void OnQuit(wxCommandEvent& WXUNUSED(event)) { Close(true); } void OnAbout(wxCommandEvent& event); + + void OnTestAccelA(wxCommandEvent& WXUNUSED(event)) + { m_logText->AppendText("Test accelerator \"A\" used.\n"); } + void OnTestAccelCtrlA(wxCommandEvent& WXUNUSED(event)) + { m_logText->AppendText("Test accelerator \"Ctrl-A\" used.\n"); } + void OnTestAccelEsc(wxCommandEvent& WXUNUSED(event)) + { m_logText->AppendText("Test accelerator \"Esc\" used.\n"); } + void OnClear(wxCommandEvent& WXUNUSED(event)) { m_logText->Clear(); } void OnSkip(wxCommandEvent& event) { m_skip = event.IsChecked(); } + void OnKeyDown(wxKeyEvent& event) { LogEvent("KeyDown", event); } void OnKeyUp(wxKeyEvent& event) { LogEvent("KeyUp", event); } void OnChar(wxKeyEvent& event) { LogEvent("Char", event); } @@ -88,6 +97,9 @@ MyFrame::MyFrame(const wxString& title) QuitID = wxID_EXIT, ClearID = wxID_CLEAR, SkipID = 100, + TestAccelA, + TestAccelCtrlA, + TestAccelEsc }; // create a menu bar @@ -96,6 +108,11 @@ MyFrame::MyFrame(const wxString& title) menuFile->Append(ClearID, "&Clear log\tCtrl-L"); menuFile->AppendSeparator(); + menuFile->Append(TestAccelA, "Test accelerator &1\tA"); + menuFile->Append(TestAccelCtrlA, "Test accelerator &2\tCtrl-A"); + menuFile->Append(TestAccelEsc, "Test accelerator &3\tEsc"); + menuFile->AppendSeparator(); + menuFile->AppendCheckItem(SkipID, "Call event.&Skip()\tCtrl-S"); menuFile->Check(SkipID, true); menuFile->AppendSeparator(); @@ -161,6 +178,15 @@ MyFrame::MyFrame(const wxString& title) Connect(SkipID, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MyFrame::OnSkip)); + Connect(TestAccelA, wxEVT_COMMAND_MENU_SELECTED, + wxCommandEventHandler(MyFrame::OnTestAccelA)); + + Connect(TestAccelCtrlA, wxEVT_COMMAND_MENU_SELECTED, + wxCommandEventHandler(MyFrame::OnTestAccelCtrlA)); + + Connect(TestAccelEsc, wxEVT_COMMAND_MENU_SELECTED, + wxCommandEventHandler(MyFrame::OnTestAccelEsc)); + // connect event handlers for the blue input window m_inputWin->Connect(wxEVT_KEY_DOWN, wxKeyEventHandler(MyFrame::OnKeyDown), NULL, this); -- 2.7.4