X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2b5f62a0b2db198609b45dec622a018dae37008e..33971536c5f047ee95ec7376fd84b5f7054c05e1:/samples/erase/erase.cpp

diff --git a/samples/erase/erase.cpp b/samples/erase/erase.cpp
index 307035e068..cd9c9f8ac2 100644
--- a/samples/erase/erase.cpp
+++ b/samples/erase/erase.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        erase.cpp
-// Purpose:     Erase wxWindows sample
+// Purpose:     Erase wxWidgets sample
 // Author:      Robert Roebling
 // Modified by:
 // Created:     04/01/98
@@ -30,7 +30,7 @@
 #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
@@ -105,9 +105,9 @@ bool MyApp::OnInit()
     MyFrame *frame = new MyFrame(_T("Erase sample"),
                                  wxPoint(50, 50), wxSize(450, 340));
 
-    frame->Show(TRUE);
+    frame->Show(true);
 
-    return TRUE;
+    return true;
 }
 
 // ----------------------------------------------------------------------------
@@ -121,11 +121,11 @@ END_EVENT_TABLE()
 
 // frame constructor
 MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
-       : wxFrame((wxFrame *)NULL, -1, title, pos, size)
+       : wxFrame((wxFrame *)NULL, wxID_ANY, title, pos, size)
 {
     SetIcon(wxICON(mondrian));
 
-    wxMenu *menuFile = new wxMenu("", wxMENU_TEAROFF);
+    wxMenu *menuFile = new wxMenu(_T(""), wxMENU_TEAROFF);
 
     wxMenu *helpMenu = new wxMenu;
     helpMenu->Append(wxID_ABOUT, _T("&About...\tCtrl-A"), _T("Show about dialog"));
@@ -141,7 +141,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 erase sample!"));
+    SetStatusText(_T("Welcome to wxWidgets erase sample!"));
 #endif // wxUSE_STATUSBAR
 
     (void)new MyCanvas( this );
@@ -150,7 +150,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
 
 void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 {
-    Close(TRUE);
+    Close(true);
 }
 
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
@@ -167,7 +167,7 @@ BEGIN_EVENT_TABLE(MyCanvas, wxScrolledWindow)
 END_EVENT_TABLE()
 
 MyCanvas::MyCanvas( MyFrame *parent )
-        : wxScrolledWindow( parent, -1, wxDefaultPosition, wxDefaultSize,
+        : wxScrolledWindow( parent, wxID_ANY, wxDefaultPosition, wxDefaultSize,
                             wxScrolledWindowStyle |
                             wxNO_FULL_REPAINT_ON_RESIZE|
                             wxSUNKEN_BORDER )
@@ -176,7 +176,7 @@ MyCanvas::MyCanvas( MyFrame *parent )
 
     m_bitmap = wxBitmap( wxICON(mondrian) );
 
-    new wxStaticBitmap( this, -1, m_bitmap, wxPoint(80,20) );
+    new wxStaticBitmap( this, wxID_ANY, m_bitmap, wxPoint(80,20) );
 }
 
 void MyCanvas::OnChar( wxKeyEvent &event )
@@ -198,12 +198,12 @@ void MyCanvas::OnChar( wxKeyEvent &event )
         case WXK_RIGHT: m_text += wxT( "<RIGHT>" ); break;
         case WXK_DOWN: m_text += wxT( "<DOWN>" ); break;
         case WXK_RETURN: m_text += wxT( "<ENTER>" ); break;
-        default: m_text += event.m_keyCode; break;
+        default: m_text += (wxChar)event.m_keyCode; break;
     }
-    
+
 }
 
-void MyCanvas::OnPaint( wxPaintEvent &event )
+void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
 {
     wxPaintDC dc(this);
     PrepareDC( dc );
@@ -211,11 +211,11 @@ void MyCanvas::OnPaint( wxPaintEvent &event )
     dc.SetBrush( *wxBLACK_BRUSH );
     dc.DrawRectangle( 0,0,200,50 );
 
-    dc.DrawBitmap( m_bitmap, 10, 20, TRUE );
+    dc.DrawBitmap( m_bitmap, 10, 20, true );
 
     dc.SetTextForeground(*wxBLUE);
     dc.DrawText(_T("This text is drawn from OnPaint"), 65, 65);
-    
+
     wxString tmp;
     tmp.Printf( _T("Hit any key to display more text: %s"), m_text.c_str() );
     int w,h;
@@ -228,7 +228,7 @@ void MyCanvas::OnPaint( wxPaintEvent &event )
     wxRegionIterator upd( GetUpdateRegion() );
     while (upd)
     {
-        wxLogDebug( "Paint: %d %d %d %d", upd.GetX(), upd.GetY(), upd.GetWidth(), upd.GetHeight() );
+        wxLogDebug( _T("Paint: %d %d %d %d"), upd.GetX(), upd.GetY(), upd.GetWidth(), upd.GetHeight() );
         upd ++;
     }
 #endif
@@ -236,7 +236,7 @@ void MyCanvas::OnPaint( wxPaintEvent &event )
 #if 0
     wxSize size = GetSize();
     wxSize client_size = GetClientSize();
-    wxLogDebug( "size %d %d client_size %d %d", size.x, size.y, client_size.x, client_size.y );
+    wxLogDebug( _T("size %d %d client_size %d %d"), size.x, size.y, client_size.x, client_size.y );
 #endif
 
 #if 0