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

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

diff --git a/samples/mdi/mdi.cpp b/samples/mdi/mdi.cpp
index 2494bb82348565c82c8a820f74cfe323c4cc45b4..d80dbd294a2b4292dd2cddc36e15079010c453b5 100644 (file)
--- a/samples/mdi/mdi.cpp
+++ b/samples/mdi/mdi.cpp
@@ -109,8 +109,8 @@ bool MyApp::OnInit()
 {
     // Create the main frame window
 
 {
     // Create the main frame window
 

-    frame = new MyFrame((wxFrame *)NULL, -1, _T("MDI Demo"),
-                        wxPoint(-1, -1), wxSize(500, 400),
+    frame = new MyFrame((wxFrame *)NULL, wxID_ANY, _T("MDI Demo"),
+                        wxDefaultPosition, wxSize(500, 400),

                         wxDEFAULT_FRAME_STYLE | wxHSCROLL | wxVSCROLL);
 #ifdef __WXMSW__
 #if 0
                         wxDEFAULT_FRAME_STYLE | wxHSCROLL | wxVSCROLL);
 #ifdef __WXMSW__
 #if 0


@@ -147,11 +147,11 @@ bool MyApp::OnInit()
 
     frame->CreateStatusBar();
 
 
     frame->CreateStatusBar();
 

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

 
     SetTopWindow(frame);
 
 
     SetTopWindow(frame);
 

-    return TRUE;
+    return true;

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


@@ -168,7 +168,7 @@ MyFrame::MyFrame(wxWindow *parent,
        : wxMDIParentFrame(parent, id, title, pos, size,
                           style | wxNO_FULL_REPAINT_ON_RESIZE)
 {
        : wxMDIParentFrame(parent, id, title, pos, size,
                           style | wxNO_FULL_REPAINT_ON_RESIZE)
 {

-    textWindow = new wxTextCtrl(this, -1, _T("A help window"),
+    textWindow = new wxTextCtrl(this, wxID_ANY, _T("A help window"),

                                 wxDefaultPosition, wxDefaultSize,
                                 wxTE_MULTILINE | wxSUNKEN_BORDER);
 
                                 wxDefaultPosition, wxDefaultSize,
                                 wxTE_MULTILINE | wxSUNKEN_BORDER);
 


@@ -219,9 +219,7 @@ void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event) )
 void MyFrame::OnNewWindow(wxCommandEvent& WXUNUSED(event) )
 {
     // Make another frame, containing a canvas
 void MyFrame::OnNewWindow(wxCommandEvent& WXUNUSED(event) )
 {
     // Make another frame, containing a canvas

-    MyChild *subframe = new MyChild(frame, _T("Canvas Frame"),
-                                    wxPoint(-1, -1), wxSize(-1, -1),
-                                    wxDEFAULT_FRAME_STYLE);
+    MyChild *subframe = new MyChild(frame, _T("Canvas Frame"));

 
     wxString title;
     title.Printf(_T("Canvas Frame %d"), ++gs_nFrames);
 
     wxString title;
     title.Printf(_T("Canvas Frame %d"), ++gs_nFrames);


@@ -274,7 +272,7 @@ void MyFrame::OnNewWindow(wxCommandEvent& WXUNUSED(event) )
     // Give it scrollbars
     canvas->SetScrollbars(20, 20, 50, 50);
 
     // Give it scrollbars
     canvas->SetScrollbars(20, 20, 50, 50);
 

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

 }
 
 void MyFrame::OnSize(wxSizeEvent& 
 }
 
 void MyFrame::OnSize(wxSizeEvent& 


@@ -316,24 +314,24 @@ void MyFrame::InitToolBar(wxToolBar* toolBar)
     int width = 24;
     int currentX = 5;
 
     int width = 24;
     int currentX = 5;
 

-    toolBar->AddTool( MDI_NEW_WINDOW, *(bitmaps[0]), wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, _T("New file"));
+    toolBar->AddTool( MDI_NEW_WINDOW, *(bitmaps[0]), wxNullBitmap, false, currentX, wxDefaultPosition.y, (wxObject *) NULL, _T("New file"));

     currentX += width + 5;
     currentX += width + 5;

-    toolBar->AddTool(1, *bitmaps[1], wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, _T("Open file"));
+    toolBar->AddTool(1, *bitmaps[1], wxNullBitmap, false, currentX, wxDefaultPosition.y, (wxObject *) NULL, _T("Open file"));

     currentX += width + 5;
     currentX += width + 5;

-    toolBar->AddTool(2, *bitmaps[2], wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, _T("Save file"));
+    toolBar->AddTool(2, *bitmaps[2], wxNullBitmap, false, currentX, wxDefaultPosition.y, (wxObject *) NULL, _T("Save file"));

     currentX += width + 5;
     toolBar->AddSeparator();
     currentX += width + 5;
     toolBar->AddSeparator();

-    toolBar->AddTool(3, *bitmaps[3], wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, _T("Copy"));
+    toolBar->AddTool(3, *bitmaps[3], wxNullBitmap, false, currentX, wxDefaultPosition.y, (wxObject *) NULL, _T("Copy"));

     currentX += width + 5;
     currentX += width + 5;

-    toolBar->AddTool(4, *bitmaps[4], wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, _T("Cut"));
+    toolBar->AddTool(4, *bitmaps[4], wxNullBitmap, false, currentX, wxDefaultPosition.y, (wxObject *) NULL, _T("Cut"));

     currentX += width + 5;
     currentX += width + 5;

-    toolBar->AddTool(5, *bitmaps[5], wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, _T("Paste"));
+    toolBar->AddTool(5, *bitmaps[5], wxNullBitmap, false, currentX, wxDefaultPosition.y, (wxObject *) NULL, _T("Paste"));

     currentX += width + 5;
     toolBar->AddSeparator();
     currentX += width + 5;
     toolBar->AddSeparator();

-    toolBar->AddTool(6, *bitmaps[6], wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, _T("Print"));
+    toolBar->AddTool(6, *bitmaps[6], wxNullBitmap, false, currentX, wxDefaultPosition.y, (wxObject *) NULL, _T("Print"));

     currentX += width + 5;
     toolBar->AddSeparator();
     currentX += width + 5;
     toolBar->AddSeparator();

-    toolBar->AddTool(7, *bitmaps[7], wxNullBitmap, TRUE, currentX, -1, (wxObject *) NULL, _T("Help"));
+    toolBar->AddTool(7, *bitmaps[7], wxNullBitmap, true, currentX, wxDefaultPosition.y, (wxObject *) NULL, _T("Help"));

 
     toolBar->Realize();
 
 
     toolBar->Realize();
 


@@ -349,14 +347,14 @@ void MyFrame::InitToolBar(wxToolBar* toolBar)
 
 // Define a constructor for my canvas
 MyCanvas::MyCanvas(wxWindow *parent, const wxPoint& pos, const wxSize& size)
 
 // Define a constructor for my canvas
 MyCanvas::MyCanvas(wxWindow *parent, const wxPoint& pos, const wxSize& size)

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

                            wxSUNKEN_BORDER |
                            wxNO_FULL_REPAINT_ON_RESIZE |
                            wxVSCROLL | wxHSCROLL)
 {
     SetBackgroundColour(wxColour(_T("WHITE")));
 
                            wxSUNKEN_BORDER |
                            wxNO_FULL_REPAINT_ON_RESIZE |
                            wxVSCROLL | wxHSCROLL)
 {
     SetBackgroundColour(wxColour(_T("WHITE")));
 

-    m_dirty = FALSE;
+    m_dirty = false;

 }
 
 // Define the repainting behaviour
 }
 
 // Define the repainting behaviour


@@ -401,7 +399,7 @@ void MyCanvas::OnEvent(wxMouseEvent& event)
         dc.SetPen(*wxBLACK_PEN);
         dc.DrawLine(xpos, ypos, pt.x, pt.y);
 
         dc.SetPen(*wxBLACK_PEN);
         dc.DrawLine(xpos, ypos, pt.x, pt.y);
 

-        m_dirty = TRUE;
+        m_dirty = true;

     }
 
     xpos = pt.x;
     }
 
     xpos = pt.x;


@@ -412,11 +410,9 @@ void MyCanvas::OnEvent(wxMouseEvent& event)
 // MyChild
 // ---------------------------------------------------------------------------
 
 // MyChild
 // ---------------------------------------------------------------------------
 

-MyChild::MyChild(wxMDIParentFrame *parent, const wxString& title,
-                 const wxPoint& pos, const wxSize& size,
-                 const long style)
-       : wxMDIChildFrame(parent, -1, title, pos, size,
-                         style | wxNO_FULL_REPAINT_ON_RESIZE)
+MyChild::MyChild(wxMDIParentFrame *parent, const wxString& title)
+       : wxMDIChildFrame(parent, wxID_ANY, title, wxDefaultPosition, wxDefaultSize,
+                         wxDEFAULT_FRAME_STYLE | wxNO_FULL_REPAINT_ON_RESIZE)

 {
     canvas = (MyCanvas *) NULL;
     my_children.Append(this);
 {
     canvas = (MyCanvas *) NULL;
     my_children.Append(this);


@@ -432,7 +428,7 @@ MyChild::~MyChild()
 
 void MyChild::OnQuit(wxCommandEvent& WXUNUSED(event))
 {
 
 void MyChild::OnQuit(wxCommandEvent& WXUNUSED(event))
 {

-    Close(TRUE);
+    Close(true);

 }
 
 void MyChild::OnRefresh(wxCommandEvent& WXUNUSED(event))
 }
 
 void MyChild::OnRefresh(wxCommandEvent& WXUNUSED(event))

diff --git a/samples/mdi/mdi.h b/samples/mdi/mdi.h
index 89490a2af863b7bccb34d02076062dd715d623c7..796f40bbd0740d7f76c28f25b3329cf5e764e1c3 100644 (file)
--- a/samples/mdi/mdi.h
+++ b/samples/mdi/mdi.h
@@ -58,7 +58,7 @@ class MyChild: public wxMDIChildFrame
 {
 public:
     MyCanvas *canvas;
 {
 public:
     MyCanvas *canvas;

-    MyChild(wxMDIParentFrame *parent, const wxString& title, const wxPoint& pos, const wxSize& size, const long style);
+    MyChild(wxMDIParentFrame *parent, const wxString& title);

     ~MyChild();
 
     void OnActivate(wxActivateEvent& event);
     ~MyChild();
 
     void OnActivate(wxActivateEvent& event);