Artwork replacement (c) Julian Smart

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

diff --git a/samples/keyboard/keyboard.cpp b/samples/keyboard/keyboard.cpp
index ae4b8022e5eeaa33171da6b6788695e058d1a0c1..ecece468d08c175e05cf28acbc35246309d4f3e5 100644 (file)
--- a/samples/keyboard/keyboard.cpp
+++ b/samples/keyboard/keyboard.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        keyboard.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        keyboard.cpp

-// Purpose:     Keyboard wxWindows sample
+// Purpose:     Keyboard wxWidgets sample

 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     07.04.02
 // 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
 #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
 
 #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
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // private classes
 // ----------------------------------------------------------------------------


@@ -72,7 +76,7 @@ private:
     class TextWindow *m_winText;
     wxListBox *m_lboxLog;
 
     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()
 };
 
     DECLARE_EVENT_TABLE()
 };
 


@@ -112,7 +116,7 @@ private:
         }
     }
 
         }
     }
 

-    virtual void DoLogString(const wxChar *szString, time_t t)
+    virtual void DoLogString(const wxChar *szString, time_t WXUNUSED(t))

     {
         wxString msg;
         TimeStamp(&msg);
     {
         wxString msg;
         TimeStamp(&msg);


@@ -137,11 +141,11 @@ class TextWindow : public wxWindow
 {
 public:
     TextWindow(wxWindow *parent)
 {
 public:
     TextWindow(wxWindow *parent)

-        : wxWindow(parent, -1, wxDefaultPosition, wxDefaultSize,
+        : wxWindow(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize,

                    wxRAISED_BORDER)
     {
                    wxRAISED_BORDER)
     {

-        m_skip = TRUE;
-        m_showRaw = FALSE;
+        m_skip = true;
+        m_showRaw = false;

 
         SetBackgroundColour(*wxBLUE);
     }
 
         SetBackgroundColour(*wxBLUE);
     }


@@ -154,7 +158,7 @@ protected:
     void OnKeyUp(wxKeyEvent& event) { LogEvent(_T("Key up"), event); }
     void OnChar(wxKeyEvent& event) { LogEvent(_T("Char"), event); }
 
     void OnKeyUp(wxKeyEvent& event) { LogEvent(_T("Key up"), event); }
     void OnChar(wxKeyEvent& event) { LogEvent(_T("Char"), event); }
 

-    void OnPaint(wxPaintEvent& event)
+    void OnPaint(wxPaintEvent& WXUNUSED(event))

     {
         wxPaintDC dc(this);
         dc.SetTextForeground(*wxWHITE);
     {
         wxPaintDC dc(this);
         dc.SetTextForeground(*wxWHITE);


@@ -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)
 // 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()
 
     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
 // 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


@@ -237,17 +241,17 @@ IMPLEMENT_APP(MyApp)
 bool MyApp::OnInit()
 {
     // create the main application window
 bool MyApp::OnInit()
 {
     // 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
     // created initially)
                                  wxPoint(50, 50), wxSize(450, 340));
 
     // and show it (the frames, unlike simple controls, are not shown when
     // created initially)

-    frame->Show(TRUE);
+    frame->Show(true);

 
     // success: wxApp::OnRun() will be called which will enter the main message
 
     // success: wxApp::OnRun() will be called which will enter the main message

-    // loop and the application will run. If we returned FALSE here, the
+    // loop and the application will run. If we returned false here, the

     // application would exit immediately.
     // application would exit immediately.

-    return TRUE;
+    return true;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -256,7 +260,7 @@ bool MyApp::OnInit()
 
 // frame constructor
 MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size, long style)
 
 // frame constructor
 MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size, long style)

-       : wxFrame(NULL, -1, title, pos, size, style),
+       : wxFrame(NULL, wxID_ANY, title, pos, size, style),

          m_winText(NULL)
 {
 #if wxUSE_MENUS
          m_winText(NULL)
 {
 #if wxUSE_MENUS


@@ -284,15 +288,15 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size,
     // ... and attach this menu bar to the frame
     SetMenuBar(menuBar);
 
     // ... and attach this menu bar to the frame
     SetMenuBar(menuBar);
 

-    menuBar->Check(Keyboard_Skip, TRUE);
+    menuBar->Check(Keyboard_Skip, true);

 
 #ifndef wxHAS_RAW_KEY_CODES
 
 #ifndef wxHAS_RAW_KEY_CODES

-    menuBar->Enable(Keyboard_ShowRaw, FALSE);
+    menuBar->Enable(Keyboard_ShowRaw, false);

 #endif // !wxHAS_RAW_KEY_CODES
 #endif // wxUSE_MENUS
 
     m_winText = new TextWindow(this);
 #endif // !wxHAS_RAW_KEY_CODES
 #endif // wxUSE_MENUS
 
     m_winText = new TextWindow(this);

-    m_lboxLog = new wxListBox(this, -1);
+    m_lboxLog = new wxListBox(this, wxID_ANY);

 
     m_logTarget = new LboxLogger(m_lboxLog, wxLog::GetActiveTarget());
     wxLog::SetActiveTarget(m_logTarget);
 
     m_logTarget = new LboxLogger(m_lboxLog, wxLog::GetActiveTarget());
     wxLog::SetActiveTarget(m_logTarget);


@@ -300,7 +304,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);
 #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
 }
 
 #endif // wxUSE_STATUSBAR
 }
 


@@ -308,14 +312,14 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size,
 
 void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 {
 
 void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 {

-    // TRUE is to force the frame to close
-    Close(TRUE);
+    // true is to force the frame to close
+    Close(true);

 }
 
 void MyFrame::OnAbout(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);
 }
 
     wxMessageBox(msg, _T("About wxKeyboard"), wxOK | wxICON_INFORMATION, this);
 }