correcting dangling refs / reuse

[wxWidgets.git] / src / common / sizer.cpp

diff --git a/src/common/sizer.cpp b/src/common/sizer.cpp
index 9f73688a00f897e2287d6c6343207ca280f67e48..93f988572eb338ac246e4937a3d04889b3d3fa8f 100644 (file)
--- a/src/common/sizer.cpp
+++ b/src/common/sizer.cpp
@@ -89,6 +89,7 @@ void wxSizerItem::Init()
     m_sizer = NULL;
     m_show = true;
     m_userData = NULL;
     m_sizer = NULL;
     m_show = true;
     m_userData = NULL;

+    m_zoneRect = wxRect( 0, 0, 0, 0 );

 }
 
 void wxSizerItem::Init(const wxSizerFlags& flags)
 }
 
 void wxSizerItem::Init(const wxSizerFlags& flags)


@@ -108,6 +109,7 @@ wxSizerItem::wxSizerItem( int width, int height, int proportion, int flag, int b
     , m_proportion( proportion )
     , m_border( border )
     , m_flag( flag )
     , m_proportion( proportion )
     , m_border( border )
     , m_flag( flag )

+    , m_zoneRect( 0, 0, 0, 0 )

     , m_show( true )
     , m_userData( userData )
 {
     , m_show( true )
     , m_userData( userData )
 {


@@ -120,6 +122,7 @@ wxSizerItem::wxSizerItem( wxWindow *window, int proportion, int flag, int border
     , m_proportion( proportion )
     , m_border( border )
     , m_flag( flag )
     , m_proportion( proportion )
     , m_border( border )
     , m_flag( flag )

+    , m_zoneRect( 0, 0, 0, 0 )

     , m_show( true )
     , m_userData( userData )
 {
     , m_show( true )
     , m_userData( userData )
 {


@@ -139,6 +142,7 @@ wxSizerItem::wxSizerItem( wxSizer *sizer, int proportion, int flag, int border,
     , m_proportion( proportion )
     , m_border( border )
     , m_flag( flag )
     , m_proportion( proportion )
     , m_border( border )
     , m_flag( flag )

+    , m_zoneRect( 0, 0, 0, 0 )

     , m_show( true )
     , m_ratio( 0.0 )
     , m_userData( userData )
     , m_show( true )
     , m_ratio( 0.0 )
     , m_userData( userData )


@@ -287,6 +291,7 @@ void wxSizerItem::SetDimension( wxPoint pos, wxSize size )
     if (IsSizer())
         m_sizer->SetDimension( pos.x, pos.y, size.x, size.y );
 
     if (IsSizer())
         m_sizer->SetDimension( pos.x, pos.y, size.x, size.y );
 

+    m_zoneRect = wxRect(pos, size);

     if (IsWindow())
         m_window->SetSize( pos.x, pos.y, size.x, size.y, wxSIZE_ALLOW_MINUS_ONE );
 
     if (IsWindow())
         m_window->SetSize( pos.x, pos.y, size.x, size.y, wxSIZE_ALLOW_MINUS_ONE );
 


@@ -357,12 +362,14 @@ wxSizer::~wxSizer()
     WX_CLEAR_LIST(wxSizerItemList, m_children);
 }
 
     WX_CLEAR_LIST(wxSizerItemList, m_children);
 }
 

-void wxSizer::Insert( size_t index, wxSizerItem *item )
+wxSizerItem* wxSizer::Insert( size_t index, wxSizerItem *item )

 {
     m_children.Insert( index, item );
 
     if( item->GetWindow() )
         item->GetWindow()->SetContainingSizer( this );
 {
     m_children.Insert( index, item );
 
     if( item->GetWindow() )
         item->GetWindow()->SetContainingSizer( this );

+
+    return item;

 }
 
 bool wxSizer::Remove( wxWindow *window )
 }
 
 bool wxSizer::Remove( wxWindow *window )


@@ -760,9 +767,9 @@ bool wxSizer::DoSetItemMinSize( size_t index, int width, int height )
     return true;
 }
 
     return true;
 }
 

-bool wxSizer::Show( wxWindow *window, bool show, bool recursive )
+wxSizerItem* wxSizer::GetItem( wxWindow *window, bool recursive )

 {
 {

-    wxASSERT_MSG( window, _T("Show for NULL window") );
+    wxASSERT_MSG( window, _T("GetItem for NULL window") );

 
     wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
     while (node)
 
     wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
     while (node)


@@ -771,58 +778,93 @@ bool wxSizer::Show( wxWindow *window, bool show, bool recursive )
 
         if (item->GetWindow() == window)
         {
 
         if (item->GetWindow() == window)
         {

-            item->Show( show );
-
-            return true;
+            return item;

         }
         else if (recursive && item->IsSizer())
         {
         }
         else if (recursive && item->IsSizer())
         {

-            if (item->GetSizer()->Show(window, show, recursive))
-                return true;
+            wxSizerItem *subitem = item->GetSizer()->GetItem( window, true );
+            if (subitem)
+                return subitem;

         }
 
         node = node->GetNext();
     }
 
         }
 
         node = node->GetNext();
     }
 

-    return false;
+    return NULL;

 }
 
 }
 

-bool wxSizer::Show( wxSizer *sizer, bool show, bool recursive )
+wxSizerItem* wxSizer::GetItem( wxSizer *sizer, bool recursive )

 {
 {

-    wxASSERT_MSG( sizer, _T("Show for NULL sizer") );
+    wxASSERT_MSG( sizer, _T("GetItem for NULL sizer") );

 
     wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
     while (node)
     {
 
     wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
     while (node)
     {

-        wxSizerItem     *item = node->GetData();
+        wxSizerItem *item = node->GetData();

 
         if (item->GetSizer() == sizer)
         {
 
         if (item->GetSizer() == sizer)
         {

-            item->Show( show );
-
-            return true;
+            return item;

         }
         else if (recursive && item->IsSizer())
         {
         }
         else if (recursive && item->IsSizer())
         {

-            if (item->GetSizer()->Show(sizer, show, recursive))
-                return true;
+            wxSizerItem *subitem = item->GetSizer()->GetItem( sizer, true );
+            if (subitem)
+                return subitem;

         }
 
         node = node->GetNext();
     }
 
         }
 
         node = node->GetNext();
     }
 

+    return NULL;
+}
+
+wxSizerItem* wxSizer::GetItem( size_t index )
+{
+    wxCHECK_MSG( index < m_children.GetCount(),
+                 NULL,
+                 _T("GetItem index is out of range") );
+
+    return m_children.Item( index )->GetData();
+}
+
+bool wxSizer::Show( wxWindow *window, bool show, bool recursive )
+{
+    wxSizerItem *item = GetItem( window, recursive );
+
+    if ( item )
+    {
+         item->Show( show );
+         return true;
+    }
+
+    return false;
+}
+
+bool wxSizer::Show( wxSizer *sizer, bool show, bool recursive )
+{
+    wxSizerItem *item = GetItem( sizer, recursive );
+
+    if ( item )
+    {
+         item->Show( show );
+         return true;
+    }
+

     return false;
 }
 
 bool wxSizer::Show( size_t index, bool show)
 {
     return false;
 }
 
 bool wxSizer::Show( size_t index, bool show)
 {

-    wxCHECK_MSG( index < m_children.GetCount(),
-                 false,
-                 _T("Show index is out of range") );
+    wxSizerItem *item = GetItem( index );

 
 

-    m_children.Item( index )->GetData()->Show( show );
+    if ( item )
+    {
+         item->Show( show );
+         return true;
+    }

 
 

-    return true;
+    return false;

 }
 
 void wxSizer::ShowItems( bool show )
 }
 
 void wxSizer::ShowItems( bool show )


@@ -1547,7 +1589,7 @@ static void GetStaticBoxBorders( wxStaticBox *box,
 
 #else
 #ifdef __WXGTK__
 
 #else
 #ifdef __WXGTK__

-    if ( box->GetLabel().IsEmpty() )
+    if ( box->GetLabel().empty() )

         *borderTop = 5;
     else
 #endif // __WXGTK__
         *borderTop = 5;
     else
 #endif // __WXGTK__


@@ -1613,7 +1655,7 @@ IMPLEMENT_CLASS(wxNotebookSizer, wxBookCtrlSizer)
 
 #if wxUSE_BOOKCTRL
 
 
 #if wxUSE_BOOKCTRL
 

-wxBookCtrlSizer::wxBookCtrlSizer(wxBookCtrl *bookctrl)
+wxBookCtrlSizer::wxBookCtrlSizer(wxBookCtrlBase *bookctrl)

                : m_bookctrl(bookctrl)
 {
     wxASSERT_MSG( bookctrl, wxT("wxBookCtrlSizer needs a control") );
                : m_bookctrl(bookctrl)
 {
     wxASSERT_MSG( bookctrl, wxT("wxBookCtrlSizer needs a control") );