extracted MSW-specific setup.h options to their own wx/msw/setup_inc.h file which...

[wxWidgets.git] / samples / keyboard / keyboard.cpp

diff --git a/samples/keyboard/keyboard.cpp b/samples/keyboard/keyboard.cpp
index d1cb5cf0f5befc0ffddeb562c0e9b3e50e8ea102..b922d4dc3eaa381c20a713b67f95682a2238dc99 100644 (file)
--- a/samples/keyboard/keyboard.cpp
+++ b/samples/keyboard/keyboard.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        keyboard.cpp
-// Purpose:     Keyboard wxWindows sample
+// Purpose:     Keyboard wxWidgets sample
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     07.04.02
@@ -25,11 +25,15 @@
 #endif
 
 // for all others, include the necessary headers (this file is usually all you
-// need because it includes almost all "standard" wxWindows headers)
+// need because it includes almost all "standard" wxWidgets headers)
 #ifndef WX_PRECOMP
     #include "wx/wx.h"
 #endif
 
+#if !wxUSE_LOG
+#   error You must set wxUSE_LOG to 1 in setup.h
+#endif
+
 // ----------------------------------------------------------------------------
 // private classes
 // ----------------------------------------------------------------------------
@@ -72,7 +76,7 @@ private:
     class TextWindow *m_winText;
     wxListBox *m_lboxLog;
 
-    // any class wishing to process wxWindows events must use this macro
+    // any class wishing to process wxWidgets events must use this macro
     DECLARE_EVENT_TABLE()
 };
 
@@ -201,10 +205,10 @@ enum
 };
 
 // ----------------------------------------------------------------------------
-// event tables and other macros for wxWindows
+// event tables and other macros for wxWidgets
 // ----------------------------------------------------------------------------
 
-// the event tables connect the wxWindows events with the functions (event
+// the event tables connect the wxWidgets events with the functions (event
 // handlers) which process them. It can be also done at run-time, but for the
 // simple menu events like this the static method is much simpler.
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
@@ -218,7 +222,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_SIZE(MyFrame::OnSize)
 END_EVENT_TABLE()
 
-// Create a new application object: this macro will allow wxWindows to create
+// Create a new application object: this macro will allow wxWidgets to create
 // the application object during program execution (it's better than using a
 // static object for many reasons) and also declares the accessor function
 // wxGetApp() which will return the reference of the right type (i.e. MyApp and
@@ -236,8 +240,11 @@ 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 wxWindows App"),
+    MyFrame *frame = new MyFrame(_T("Keyboard wxWidgets App"),
                                  wxPoint(50, 50), wxSize(450, 340));
 
     // and show it (the frames, unlike simple controls, are not shown when
@@ -300,7 +307,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size,
 #if wxUSE_STATUSBAR
     // create a status bar just for fun (by default with 1 pane only)
     CreateStatusBar(2);
-    SetStatusText(_T("Welcome to wxWindows!"));
+    SetStatusText(_T("Welcome to wxWidgets!"));
 #endif // wxUSE_STATUSBAR
 }
 
@@ -314,8 +321,8 @@ void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 {
-    wxString msg = _T("Demonstrates keyboard event processing in wxWindows\n")
-                   _T("© 2002 Vadim Zeitlin");
+    wxString msg = _T("Demonstrates keyboard event processing in wxWidgets\n")
+                   _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;