Watcom repair. TRUE->true, FALSE->false and -1->wxID_ANY replacements.

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

diff --git a/samples/caret/caret.cpp b/samples/caret/caret.cpp
index 5dbfe74c9df77c07b0d4ea181fbad113f0b7d24f..2908746b32640bc6fdbfbab9cccdd0473d4757bb 100644 (file)
--- a/samples/caret/caret.cpp
+++ b/samples/caret/caret.cpp
@@ -186,12 +186,12 @@ bool MyApp::OnInit()
     MyFrame *frame = new MyFrame(_T("Caret wxWidgets sample"),
                                  wxPoint(50, 50), wxSize(450, 340));
 
     MyFrame *frame = new MyFrame(_T("Caret wxWidgets sample"),
                                  wxPoint(50, 50), wxSize(450, 340));
 

-    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;

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


@@ -200,7 +200,7 @@ bool MyApp::OnInit()
 
 // frame constructor
 MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
 
 // 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)

 {
     // set the frame icon
     SetIcon(wxICON(mondrian));
 {
     // set the frame icon
     SetIcon(wxICON(mondrian));


@@ -235,8 +235,8 @@ 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))


@@ -298,7 +298,7 @@ BEGIN_EVENT_TABLE(MyCanvas, wxScrolledWindow)
 END_EVENT_TABLE()
 
 MyCanvas::MyCanvas( wxWindow *parent )
 END_EVENT_TABLE()
 
 MyCanvas::MyCanvas( wxWindow *parent )

-        : wxScrolledWindow( parent, -1,
+        : wxScrolledWindow( parent, wxID_ANY,

                             wxDefaultPosition, wxDefaultSize,
                             wxSUNKEN_BORDER )
 {
                             wxDefaultPosition, wxDefaultSize,
                             wxSUNKEN_BORDER )
 {