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

Add test of accelerators using both ASCII and non-ASCII keys to the sample.

Browse Source 
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
This commit is contained in:
Vadim Zeitlin
2009-12-17 16:44:22 +00:00
parent 4f04a4fd78
commit a30305f8b0
1 changed files with 26 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
samples/keyboard/keyboard.cpp
View File

@@ -32,8 +32,17 @@ private:
// event handlers // event handlers
void OnQuit(wxCommandEvent& WXUNUSED(event)) { Close(true); } void OnQuit(wxCommandEvent& WXUNUSED(event)) { Close(true); }
void OnAbout(wxCommandEvent& event); 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 OnClear(wxCommandEvent& WXUNUSED(event)) { m_logText->Clear(); }
void OnSkip(wxCommandEvent& event) { m_skip = event.IsChecked(); } void OnSkip(wxCommandEvent& event) { m_skip = event.IsChecked(); }
void OnKeyDown(wxKeyEvent& event) { LogEvent("KeyDown", event); } void OnKeyDown(wxKeyEvent& event) { LogEvent("KeyDown", event); }
void OnKeyUp(wxKeyEvent& event) { LogEvent("KeyUp", event); } void OnKeyUp(wxKeyEvent& event) { LogEvent("KeyUp", event); }
void OnChar(wxKeyEvent& event) { LogEvent("Char", event); } void OnChar(wxKeyEvent& event) { LogEvent("Char", event); }
@@ -88,6 +97,9 @@ MyFrame::MyFrame(const wxString& title)
QuitID = wxID_EXIT, QuitID = wxID_EXIT,
ClearID = wxID_CLEAR, ClearID = wxID_CLEAR,
SkipID = 100, SkipID = 100,
TestAccelA,
TestAccelCtrlA,
TestAccelEsc
}; };
// create a menu bar // create a menu bar
@@ -96,6 +108,11 @@ MyFrame::MyFrame(const wxString& title)
menuFile->Append(ClearID, "&Clear log\tCtrl-L"); menuFile->Append(ClearID, "&Clear log\tCtrl-L");
menuFile->AppendSeparator(); 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->AppendCheckItem(SkipID, "Call event.&Skip()\tCtrl-S");
menuFile->Check(SkipID, true); menuFile->Check(SkipID, true);
menuFile->AppendSeparator(); menuFile->AppendSeparator();
@@ -161,6 +178,15 @@ MyFrame::MyFrame(const wxString& title)
Connect(SkipID, wxEVT_COMMAND_MENU_SELECTED, Connect(SkipID, wxEVT_COMMAND_MENU_SELECTED,
wxCommandEventHandler(MyFrame::OnSkip)); 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 // connect event handlers for the blue input window
m_inputWin->Connect(wxEVT_KEY_DOWN, wxKeyEventHandler(MyFrame::OnKeyDown), m_inputWin->Connect(wxEVT_KEY_DOWN, wxKeyEventHandler(MyFrame::OnKeyDown),
NULL, this); NULL, this);