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

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

diff --git a/samples/listctrl/listtest.cpp b/samples/listctrl/listtest.cpp
index 4a23f885dd0f3a630e66416e5fdf2d162e7c7c82..f7c3851ba41c6523cbc1c8b627a62fc737d79f0e 100644 (file)
--- a/samples/listctrl/listtest.cpp
+++ b/samples/listctrl/listtest.cpp
@@ -133,16 +133,16 @@ bool MyApp::OnInit()
   MyFrame *frame = new MyFrame(wxT("wxListCtrl Test"), 50, 50, 450, 340);
 
   // Show the frame
   MyFrame *frame = new MyFrame(wxT("wxListCtrl Test"), 50, 50, 450, 340);
 
   // Show the frame

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

 
   SetTopWindow(frame);
 
 
   SetTopWindow(frame);
 

-  return TRUE;
+  return true;

 }
 
 // My frame constructor
 MyFrame::MyFrame(const wxChar *title, int x, int y, int w, int h)
 }
 
 // My frame constructor
 MyFrame::MyFrame(const wxChar *title, int x, int y, int w, int h)

-       : wxFrame((wxFrame *)NULL, -1, title, wxPoint(x, y), wxSize(w, h))
+       : wxFrame((wxFrame *)NULL, wxID_ANY, title, wxPoint(x, y), wxSize(w, h))

 {
     m_listCtrl = (MyListCtrl *) NULL;
     m_logWindow = (wxTextCtrl *) NULL;
 {
     m_listCtrl = (MyListCtrl *) NULL;
     m_logWindow = (wxTextCtrl *) NULL;


@@ -151,8 +151,8 @@ MyFrame::MyFrame(const wxChar *title, int x, int y, int w, int h)
     SetIcon( wxICON(mondrian) );
 
     // Make an image list containing large icons
     SetIcon( wxICON(mondrian) );
 
     // Make an image list containing large icons

-    m_imageListNormal = new wxImageList(32, 32, TRUE);
-    m_imageListSmall = new wxImageList(16, 16, TRUE);
+    m_imageListNormal = new wxImageList(32, 32, true);
+    m_imageListSmall = new wxImageList(16, 16, true);

 
 #ifdef __WXMSW__
     m_imageListNormal->Add( wxIcon(_T("icon1"), wxBITMAP_TYPE_ICO_RESOURCE) );
 
 #ifdef __WXMSW__
     m_imageListNormal->Add( wxIcon(_T("icon1"), wxBITMAP_TYPE_ICO_RESOURCE) );


@@ -216,7 +216,7 @@ MyFrame::MyFrame(const wxChar *title, int x, int y, int w, int h)
     menuList->Append(LIST_THAW, _T("Tha&w\tCtrl-W"));
     menuList->AppendSeparator();
     menuList->Append(LIST_TOGGLE_MULTI_SEL, _T("&Multiple selection\tCtrl-M"),
     menuList->Append(LIST_THAW, _T("Tha&w\tCtrl-W"));
     menuList->AppendSeparator();
     menuList->Append(LIST_TOGGLE_MULTI_SEL, _T("&Multiple selection\tCtrl-M"),

-            _T("Toggle multiple selection"), TRUE);
+            _T("Toggle multiple selection"), true);

 
     wxMenu *menuCol = new wxMenu;
     menuCol->Append(LIST_SET_FG_COL, _T("&Foreground colour..."));
 
     wxMenu *menuCol = new wxMenu;
     menuCol->Append(LIST_SET_FG_COL, _T("&Foreground colour..."));


@@ -229,8 +229,8 @@ MyFrame::MyFrame(const wxChar *title, int x, int y, int w, int h)
     menubar->Append(menuCol, _T("&Colour"));
     SetMenuBar(menubar);
 
     menubar->Append(menuCol, _T("&Colour"));
     SetMenuBar(menubar);
 

-    m_panel = new wxPanel(this, -1);
-    m_logWindow = new wxTextCtrl(m_panel, -1, wxEmptyString,
+    m_panel = new wxPanel(this, wxID_ANY);
+    m_logWindow = new wxTextCtrl(m_panel, wxID_ANY, wxEmptyString,

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


@@ -280,7 +280,7 @@ bool MyFrame::CheckNonVirtual() const
 
 void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 {
 
 void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 {

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

 }
 
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 }
 
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))


@@ -373,7 +373,7 @@ void MyFrame::RecreateList(long flags, bool withText)
                 break;
 
             case wxLC_SMALL_ICON:
                 break;
 
             case wxLC_SMALL_ICON:

-                InitWithIconItems(withText, TRUE);
+                InitWithIconItems(withText, true);

                 break;
 
             case wxLC_REPORT:
                 break;
 
             case wxLC_REPORT:


@@ -490,7 +490,7 @@ void MyFrame::InitWithIconItems(bool withText, bool sameIcon)
 
 void MyFrame::OnIconView(wxCommandEvent& WXUNUSED(event))
 {
 
 void MyFrame::OnIconView(wxCommandEvent& WXUNUSED(event))
 {

-    RecreateList(wxLC_ICON, FALSE);
+    RecreateList(wxLC_ICON, false);

 }
 
 void MyFrame::OnIconTextView(wxCommandEvent& WXUNUSED(event))
 }
 
 void MyFrame::OnIconTextView(wxCommandEvent& WXUNUSED(event))


@@ -500,7 +500,7 @@ void MyFrame::OnIconTextView(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnSmallIconView(wxCommandEvent& WXUNUSED(event))
 {
 
 void MyFrame::OnSmallIconView(wxCommandEvent& WXUNUSED(event))
 {

-    RecreateList(wxLC_SMALL_ICON, FALSE);
+    RecreateList(wxLC_SMALL_ICON, false);

 }
 
 void MyFrame::OnSmallIconTextView(wxCommandEvent& WXUNUSED(event))
 }
 
 void MyFrame::OnSmallIconTextView(wxCommandEvent& WXUNUSED(event))

diff --git a/samples/listctrl/listtest.h b/samples/listctrl/listtest.h
index fb09e68cfd8dba17b8502aee0d7da357f747207f..a8e29bddf47a48e71f53d010106415dd0791fe55 100644 (file)
--- a/samples/listctrl/listtest.h
+++ b/samples/listctrl/listtest.h
@@ -126,12 +126,12 @@ protected:
 
 private:
     // recreate the list control with the new flags
 
 private:
     // recreate the list control with the new flags

-    void RecreateList(long flags, bool withText = TRUE);
+    void RecreateList(long flags, bool withText = true);

 
     // fill the control with items depending on the view
     void InitWithListItems();
     void InitWithReportItems();
 
     // fill the control with items depending on the view
     void InitWithListItems();
     void InitWithReportItems();

-    void InitWithIconItems(bool withText, bool sameIcon = FALSE);
+    void InitWithIconItems(bool withText, bool sameIcon = false);

     void InitWithVirtualItems();
 
     // return true if the control is not in virtual view, give an error message
     void InitWithVirtualItems();
 
     // return true if the control is not in virtual view, give an error message