restored int (instea of size_t) in Remove() and Detach(); TRUE/FALSE -> true/false

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

diff --git a/include/wx/sizer.h b/include/wx/sizer.h
index b46b5ec1b730352216629ced26b8ccb264b1f855..913d9131a2b651f9872d921281557012594eb32a 100644 (file)
--- a/include/wx/sizer.h
+++ b/include/wx/sizer.h
@@ -141,7 +141,7 @@ protected:
     int          m_border;
     int          m_flag;
 
-    // If TRUE, then this item is considered in the layout
+    // If true, then this item is considered in the layout
     // calculation.  Otherwise, it is skipped over.
     bool         m_show;
 
@@ -233,13 +233,13 @@ public:
     // use Detach instead.
     wxDEPRECATED( virtual bool Remove( wxWindow *window ) );
     virtual bool Remove( wxSizer *sizer );
-    virtual bool Remove( size_t index );
+    virtual bool Remove( int index );
 
     virtual bool Detach( wxWindow *window );
     virtual bool Detach( wxSizer *sizer );
-    virtual bool Detach( size_t index );
+    virtual bool Detach( int index );
 
-    virtual void Clear( bool delete_windows=FALSE );
+    virtual void Clear( bool delete_windows = false );
     virtual void DeleteWindows();
 
     void SetMinSize( int width, int height )
@@ -289,16 +289,16 @@ public:
 
     // Manage whether individual scene items are considered
     // in the layout calculations or not.
-    void Show( wxWindow *window, bool show = TRUE );
-    void Show( wxSizer *sizer, bool show = TRUE );
-    void Show( size_t index, bool show = TRUE );
+    void Show( wxWindow *window, bool show = true );
+    void Show( wxSizer *sizer, bool show = true );
+    void Show( size_t index, bool show = true );
 
     void Hide( wxSizer *sizer )
-        { Show( sizer, FALSE ); }
+        { Show( sizer, false ); }
     void Hide( wxWindow *window )
-        { Show( window, FALSE ); }
+        { Show( window, false ); }
     void Hide( size_t index )
-        { Show( index, FALSE ); }
+        { Show( index, false ); }
 
     bool IsShown( wxWindow *window ) const;
     bool IsShown( wxSizer *sizer ) const;

diff --git a/src/common/sizer.cpp b/src/common/sizer.cpp
index c83a90caa1c34df0b853dfdfee8998df54720de1..1d7ed91c2c0b79e3a1c9f45616680f409613dc61 100644 (file)
--- a/src/common/sizer.cpp
+++ b/src/common/sizer.cpp
@@ -56,7 +56,7 @@ wxSizerItem::wxSizerItem( int width, int height, int proportion, int flag, int b
     , m_proportion( proportion )
     , m_border( border )
     , m_flag( flag )
-    , m_show( TRUE )
+    , m_show( true )
     , m_userData( userData )
 {
     SetRatio( m_size );
@@ -69,7 +69,7 @@ wxSizerItem::wxSizerItem( wxWindow *window, int proportion, int flag, int border
     , m_proportion( proportion )
     , m_border( border )
     , m_flag( flag )
-    , m_show( TRUE )
+    , m_show( true )
     , m_userData( userData )
 {
     // aspect ratio calculated from initial size
@@ -84,7 +84,7 @@ wxSizerItem::wxSizerItem( wxSizer *sizer, int proportion, int flag, int border,
     , m_proportion( proportion )
     , m_border( border )
     , m_flag( flag )
-    , m_show( TRUE )
+    , m_show( true )
     , m_ratio( 0.0 )
     , m_userData( userData )
 {
@@ -277,7 +277,7 @@ int wxSizerItem::GetOption() const
 wxSizer::wxSizer()
     : m_minSize( wxSize( 0, 0 ) )
 {
-    m_children.DeleteContents( TRUE );
+    m_children.DeleteContents( true );
 }
 
 wxSizer::~wxSizer()
@@ -396,20 +396,20 @@ bool wxSizer::Remove( wxSizer *sizer )
         node = node->GetNext();
     }
 
-    return FALSE;
+    return false;
 }
 
-bool wxSizer::Remove( size_t index )
+bool wxSizer::Remove( int index )
 {
-    wxCHECK_MSG( index < m_children.GetCount(),
-                 FALSE,
+    wxCHECK_MSG( index >= 0 && (size_t)index < m_children.GetCount(),
+                 false,
                  _T("Remove index is out of range") );
 
-    wxSizerItemList::Node   *node = m_children.Item( index );
+    wxSizerItemList::Node *node = m_children.Item( index );
 
-    wxCHECK_MSG( node, FALSE, _T("Failed to find child node") );
+    wxCHECK_MSG( node, false, _T("Failed to find child node") );
 
-    wxSizerItem     *item = node->GetData();
+    wxSizerItem *item = node->GetData();
 
     if( item->IsWindow() )
         item->GetWindow()->SetContainingSizer( NULL );
@@ -434,7 +434,7 @@ bool wxSizer::Detach( wxSizer *sizer )
         node = node->GetNext();
     }
 
-    return FALSE;
+    return false;
 }
 
 bool wxSizer::Detach( wxWindow *window )
@@ -454,20 +454,20 @@ bool wxSizer::Detach( wxWindow *window )
         node = node->GetNext();
     }
 
-    return FALSE;
+    return false;
 }
 
-bool wxSizer::Detach( size_t index )
+bool wxSizer::Detach( int index )
 {
-    wxCHECK_MSG( index < m_children.GetCount(),
-                 FALSE,
+    wxCHECK_MSG( index >= 0 && (size_t)index < m_children.GetCount(),
+                 false,
                  _T("Detach index is out of range") );
 
-    wxSizerItemList::Node   *node = m_children.Item( index );
+    wxSizerItemList::Node *node = m_children.Item( index );
 
-    wxCHECK_MSG( node, FALSE, _T("Failed to find child node") );
+    wxCHECK_MSG( node, false, _T("Failed to find child node") );
 
-    wxSizerItem     *item = node->GetData();
+    wxSizerItem *item = node->GetData();
 
     if( item->IsSizer() )
         item->DetachSizer();
@@ -670,7 +670,7 @@ bool wxSizer::DoSetItemMinSize( wxWindow *window, int width, int height )
         if (item->GetWindow() == window)
         {
             item->SetInitSize( width, height );
-            return TRUE;
+            return true;
         }
         node = node->GetNext();
     }
@@ -686,12 +686,12 @@ bool wxSizer::DoSetItemMinSize( wxWindow *window, int width, int height )
              item->GetSizer()->DoSetItemMinSize( window, width, height ) )
         {
             // A child sizer found the requested windw, exit.
-            return TRUE;
+            return true;
         }
         node = node->GetNext();
     }
 
-    return FALSE;
+    return false;
 }
 
 bool wxSizer::DoSetItemMinSize( wxSizer *sizer, int width, int height )
@@ -708,7 +708,7 @@ bool wxSizer::DoSetItemMinSize( wxSizer *sizer, int width, int height )
         if (item->GetSizer() == sizer)
         {
             item->GetSizer()->DoSetMinSize( width, height );
-            return TRUE;
+            return true;
         }
         node = node->GetNext();
     }
@@ -724,19 +724,19 @@ bool wxSizer::DoSetItemMinSize( wxSizer *sizer, int width, int height )
              item->GetSizer()->DoSetItemMinSize( sizer, width, height ) )
         {
             // A child found the requested sizer, exit.
-            return TRUE;
+            return true;
         }
         node = node->GetNext();
     }
 
-    return FALSE;
+    return false;
 }
 
 bool wxSizer::DoSetItemMinSize( size_t index, int width, int height )
 {
     wxSizerItemList::Node   *node = m_children.Item( index );
 
-    wxCHECK_MSG( node, FALSE, _T("Failed to find child node") );
+    wxCHECK_MSG( node, false, _T("Failed to find child node") );
 
     wxSizerItem     *item = node->GetData();
 
@@ -751,7 +751,7 @@ bool wxSizer::DoSetItemMinSize( size_t index, int width, int height )
         item->SetInitSize( width, height );
     }
 
-    return TRUE;
+    return true;
 }
 
 void wxSizer::Show( wxWindow *window, bool show )
@@ -824,7 +824,7 @@ bool wxSizer::IsShown( wxWindow *window ) const
 
     wxFAIL_MSG( _T("IsShown failed to find sizer item") );
 
-    return FALSE;
+    return false;
 }
 
 bool wxSizer::IsShown( wxSizer *sizer ) const
@@ -843,13 +843,13 @@ bool wxSizer::IsShown( wxSizer *sizer ) const
 
     wxFAIL_MSG( _T("IsShown failed to find sizer item") );
 
-    return FALSE;
+    return false;
 }
 
 bool wxSizer::IsShown( size_t index ) const
 {
     wxCHECK_MSG( index < m_children.GetCount(),
-                 FALSE,
+                 false,
                  _T("IsShown index is out of range") );
 
     return m_children.Item( index )->GetData()->IsShown();