X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/be5a51fb592f3fa2ba38ac6cd1e488d6d806058c..508d12b2242e0d96c6fb5dc7d9c3ea2aac553603:/samples/keyboard/keyboard.cpp?ds=sidebyside diff --git a/samples/keyboard/keyboard.cpp b/samples/keyboard/keyboard.cpp index 3b7a8060aa..b922d4dc3e 100644 --- a/samples/keyboard/keyboard.cpp +++ b/samples/keyboard/keyboard.cpp @@ -30,6 +30,10 @@ #include "wx/wx.h" #endif +#if !wxUSE_LOG +# error You must set wxUSE_LOG to 1 in setup.h +#endif + // ---------------------------------------------------------------------------- // private classes // ---------------------------------------------------------------------------- @@ -236,6 +240,9 @@ IMPLEMENT_APP(MyApp) // 'Main program' equivalent: the program execution "starts" here bool MyApp::OnInit() { + if ( !wxApp::OnInit() ) + return false; + // create the main application window MyFrame *frame = new MyFrame(_T("Keyboard wxWidgets App"), wxPoint(50, 50), wxSize(450, 340)); @@ -315,7 +322,7 @@ void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event)) void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event)) { wxString msg = _T("Demonstrates keyboard event processing in wxWidgets\n") - _T("© 2002 Vadim Zeitlin"); + _T("(c) 2002 Vadim Zeitlin"); wxMessageBox(msg, _T("About wxKeyboard"), wxOK | wxICON_INFORMATION, this); } @@ -373,8 +380,6 @@ void TextWindow::LogEvent(const wxChar *name, wxKeyEvent& event) case WXK_MENU: key = _T("MENU"); break; case WXK_PAUSE: key = _T("PAUSE"); break; case WXK_CAPITAL: key = _T("CAPITAL"); break; - case WXK_PRIOR: key = _T("PRIOR"); break; - case WXK_NEXT: key = _T("NEXT"); break; case WXK_END: key = _T("END"); break; case WXK_HOME: key = _T("HOME"); break; case WXK_LEFT: key = _T("LEFT"); break; @@ -443,7 +448,6 @@ void TextWindow::LogEvent(const wxChar *name, wxKeyEvent& event) case WXK_NUMPAD_UP: key = _T("NUMPAD_UP"); break; case WXK_NUMPAD_RIGHT: key = _T("NUMPAD_RIGHT"); break; case WXK_NUMPAD_DOWN: key = _T("NUMPAD_DOWN"); break; - case WXK_NUMPAD_PRIOR: key = _T("NUMPAD_PRIOR"); break; case WXK_NUMPAD_PAGEUP: key = _T("NUMPAD_PAGEUP"); break; case WXK_NUMPAD_PAGEDOWN: key = _T("NUMPAD_PAGEDOWN"); break; case WXK_NUMPAD_END: key = _T("NUMPAD_END"); break;