-1->wxID_ANY, TRUE->true, FALSE->false, wxDefaultPosition & wxDefaultSize replacements

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27474 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

samples/docvwmdi/doc.cpp

@@ -248,7 +248,7 @@ void DoodleSegment::Draw(wxDC *dc)
  */
 
 DrawingCommand::DrawingCommand(const wxString& name, int command, DrawingDocument *ddoc, DoodleSegment *seg):
-  wxCommand(TRUE, name)
+  wxCommand(true, name)
 {
   doc = ddoc;
   segment = seg;
@@ -277,7 +277,7 @@ bool DrawingCommand::Do(void)
         segment = (DoodleSegment *)node->GetData();
         doc->GetDoodleSegments().Erase(node);
 
-        doc->Modify(TRUE);
+        doc->Modify(true);
         doc->UpdateAllViews();
       }
       break;
@@ -285,12 +285,12 @@ bool DrawingCommand::Do(void)
     case DOODLE_ADD:
     {
       doc->GetDoodleSegments().Append(new DoodleSegment(*segment));
-      doc->Modify(TRUE);
+      doc->Modify(true);
       doc->UpdateAllViews();
       break;
     }
   }
-  return TRUE;
+  return true;
 }
 
 bool DrawingCommand::Undo(void)
@@ -303,11 +303,11 @@ bool DrawingCommand::Undo(void)
       if (segment)
       {
         doc->GetDoodleSegments().Append(segment);
-        doc->Modify(TRUE);
+        doc->Modify(true);
         doc->UpdateAllViews();
         segment = (DoodleSegment *) NULL;
       }
-      doc->Modify(TRUE);
+      doc->Modify(true);
       doc->UpdateAllViews();
       break;
     }
@@ -321,12 +321,12 @@ bool DrawingCommand::Undo(void)
         delete seg;
         doc->GetDoodleSegments().Erase(node);
 
-        doc->Modify(TRUE);
+        doc->Modify(true);
         doc->UpdateAllViews();
       }
     }
   }
-  return TRUE;
+  return true;
 }
 
 IMPLEMENT_DYNAMIC_CLASS(TextEditDocument, wxDocument)
@@ -338,21 +338,21 @@ bool TextEditDocument::OnSaveDocument(const wxString& filename)
     TextEditView *view = (TextEditView *)GetFirstView();
 
     if (!view->textsw->SaveFile(filename))
-        return FALSE;
+        return false;
-    Modify(FALSE);
+    Modify(false);
-    return TRUE;
+    return true;
 }
 
 bool TextEditDocument::OnOpenDocument(const wxString& filename)
 {
     TextEditView *view = (TextEditView *)GetFirstView();
     if (!view->textsw->LoadFile(filename))
-        return FALSE;
+        return false;
 
-    SetFilename(filename, TRUE);
+    SetFilename(filename, true);
-    Modify(FALSE);
+    Modify(false);
     UpdateAllViews();
-    return TRUE;
+    return true;
 }
 
 bool TextEditDocument::IsModified(void) const

samples/docvwmdi/docview.cpp

@@ -107,11 +107,11 @@ bool MyApp::OnInit(void)
 
   frame->Centre(wxBOTH);
 #ifndef __WXMAC__
-  frame->Show(TRUE);
+  frame->Show(true);
 #endif //ndef __WXMAC__
 
   SetTopWindow(frame);
-  return TRUE;
+  return true;
 }
 
 int MyApp::OnExit(void)
@@ -129,7 +129,7 @@ wxMDIChildFrame *MyApp::CreateChildFrame(wxDocument *doc, wxView *view, bool isC
 {
   //// Make a child frame
   wxDocMDIChildFrame *subframe =
-      new wxDocMDIChildFrame(doc, view, GetMainFrame(), -1, _T("Child Frame"),
+      new wxDocMDIChildFrame(doc, view, GetMainFrame(), wxID_ANY, _T("Child Frame"),
                              wxPoint(10, 10), wxSize(300, 300),
                              wxDEFAULT_FRAME_STYLE |
                              wxNO_FULL_REPAINT_ON_RESIZE);
@@ -201,7 +201,7 @@ END_EVENT_TABLE()
 
 MyFrame::MyFrame(wxDocManager *manager, wxFrame *frame, const wxString& title,
     const wxPoint& pos, const wxSize& size, long type):
-  wxDocMDIParentFrame(manager, frame, -1, title, pos, size, type, _T("myFrame"))
+  wxDocMDIParentFrame(manager, frame, wxID_ANY, title, pos, size, type, _T("myFrame"))
 {
   editMenu = (wxMenu *) NULL;
 }

samples/docvwmdi/view.cpp

@@ -46,7 +46,7 @@ END_EVENT_TABLE()
 // windows for displaying the view.
 bool DrawingView::OnCreate(wxDocument *doc, long WXUNUSED(flags) )
 {
-    frame = wxGetApp().CreateChildFrame(doc, this, TRUE);
+    frame = wxGetApp().CreateChildFrame(doc, this, true);
     frame->SetTitle(_T("DrawingView"));
 
     canvas = GetMainFrame()->CreateCanvas(this, frame);
@@ -54,12 +54,12 @@ bool DrawingView::OnCreate(wxDocument *doc, long WXUNUSED(flags) )
     // X seems to require a forced resize
     int x, y;
     frame->GetSize(&x, &y);
-    frame->SetSize(-1, -1, x, y);
+    frame->SetSize(wxDefaultPosition.x, wxDefaultPosition.y, x, y);
 #endif
-    frame->Show(TRUE);
+    frame->Show(true);
-    Activate(TRUE);
+    Activate(true);
 
-    return TRUE;
+    return true;
 }
 
 // Sneakily gets used for default print/preview
@@ -102,7 +102,7 @@ void DrawingView::OnUpdate(wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint))
 bool DrawingView::OnClose(bool deleteWindow)
 {
   if (!GetDocument()->Close())
-    return FALSE;
+    return false;
 
   // Clear the canvas in  case we're in single-window mode,
   // and the canvas stays.
@@ -116,14 +116,14 @@ bool DrawingView::OnClose(bool deleteWindow)
 
   SetFrame((wxFrame*)NULL);
 
-  Activate(FALSE);
+  Activate(false);
 
   if (deleteWindow)
   {
     delete frame;
-    return TRUE;
+    return true;
   }
-  return TRUE;
+  return true;
 }
 
 void DrawingView::OnCut(wxCommandEvent& WXUNUSED(event) )
@@ -136,7 +136,7 @@ IMPLEMENT_DYNAMIC_CLASS(TextEditView, wxView)
 
 bool TextEditView::OnCreate(wxDocument *doc, long WXUNUSED(flags) )
 {
-  frame = wxGetApp().CreateChildFrame(doc, this, FALSE);
+  frame = wxGetApp().CreateChildFrame(doc, this, false);
 
   int width, height;
   frame->GetClientSize(&width, &height);
@@ -147,13 +147,13 @@ bool TextEditView::OnCreate(wxDocument *doc, long WXUNUSED(flags) )
   // X seems to require a forced resize
   int x, y;
   frame->GetSize(&x, &y);
-  frame->SetSize(-1, -1, x, y);
+  frame->SetSize(wxDefaultPosition.x, wxDefaultPosition.y, x, y);
 #endif
 
-  frame->Show(TRUE);
+  frame->Show(true);
-  Activate(TRUE);
+  Activate(true);
 
-  return TRUE;
+  return true;
 }
 
 // Handled by wxTextWindow
@@ -168,16 +168,16 @@ void TextEditView::OnUpdate(wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) )
 bool TextEditView::OnClose(bool deleteWindow)
 {
   if (!GetDocument()->Close())
-    return FALSE;
+    return false;
 
-  Activate(FALSE);
+  Activate(false);
 
   if (deleteWindow)
   {
     delete frame;
-    return TRUE;
+    return true;
   }
-  return TRUE;
+  return true;
 }
 
 /*
@@ -190,7 +190,7 @@ END_EVENT_TABLE()
 
 // Define a constructor for my canvas
 MyCanvas::MyCanvas(wxView *v, wxMDIChildFrame *frame, const wxPoint& pos, const wxSize& size, long style):
- wxScrolledWindow(frame, -1, pos, size, style)
+ wxScrolledWindow(frame, wxID_ANY, pos, size, style)
 {
   view = v;
 }
@@ -232,7 +232,7 @@ void MyCanvas::OnMouseEvent(wxMouseEvent& event)
 
       doc->GetCommandProcessor()->Submit(new DrawingCommand(_T("Add Segment"), DOODLE_ADD, doc, currentSegment));
 
-      view->GetDocument()->Modify(TRUE);
+      view->GetDocument()->Modify(true);
       currentSegment = (DoodleSegment *) NULL;
     }
   }
@@ -257,7 +257,7 @@ void MyCanvas::OnMouseEvent(wxMouseEvent& event)
 
 // Define a constructor for my text subwindow
 MyTextWindow::MyTextWindow(wxView *v, wxMDIChildFrame *frame, const wxPoint& pos, const wxSize& size, long style):
- wxTextCtrl(frame, -1, _T(""), pos, size, style)
+ wxTextCtrl(frame, wxID_ANY, _T(""), pos, size, style)
 {
   view = v;
 }

samples/docvwmdi/view.h

@@ -51,7 +51,7 @@ public:
     bool OnCreate(wxDocument *doc, long flags);
     void OnDraw(wxDC *dc);
     void OnUpdate(wxView *sender, wxObject *hint = (wxObject *) NULL);
-    bool OnClose(bool deleteWindow = TRUE);
+    bool OnClose(bool deleteWindow = true);
 
     void OnCut(wxCommandEvent& event);
 
@@ -72,7 +72,7 @@ public:
     bool OnCreate(wxDocument *doc, long flags);
     void OnDraw(wxDC *dc);
     void OnUpdate(wxView *sender, wxObject *hint = (wxObject *) NULL);
-    bool OnClose(bool deleteWindow = TRUE);
+    bool OnClose(bool deleteWindow = true);
     
 private:
   DECLARE_DYNAMIC_CLASS(TextEditView)