fixed bug with not NUL-terminating the string in GAddress_UNIX_SetPath

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

diff --git a/src/common/sizer.cpp b/src/common/sizer.cpp
index 8735020e9bcc7672e57e457de0a8fee312f04441..f20410f51de6ce34bf9bac91ff69ce19f6f957d7 100644 (file)
--- a/src/common/sizer.cpp
+++ b/src/common/sizer.cpp
@@ -27,14 +27,16 @@
 
 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------
 

-IMPLEMENT_ABSTRACT_CLASS(wxSizerItem, wxObject);
-IMPLEMENT_ABSTRACT_CLASS(wxSizer, wxObject);
-IMPLEMENT_ABSTRACT_CLASS(wxGridSizer, wxSizer);
-IMPLEMENT_ABSTRACT_CLASS(wxFlexGridSizer, wxGridSizer);
-IMPLEMENT_ABSTRACT_CLASS(wxBoxSizer, wxSizer);
-IMPLEMENT_ABSTRACT_CLASS(wxStaticBoxSizer, wxBoxSizer);
+IMPLEMENT_ABSTRACT_CLASS(wxSizerItem, wxObject)
+IMPLEMENT_ABSTRACT_CLASS(wxSizer, wxObject)
+IMPLEMENT_ABSTRACT_CLASS(wxGridSizer, wxSizer)
+IMPLEMENT_ABSTRACT_CLASS(wxFlexGridSizer, wxGridSizer)
+IMPLEMENT_ABSTRACT_CLASS(wxBoxSizer, wxSizer)
+#if wxUSE_STATBOX
+IMPLEMENT_ABSTRACT_CLASS(wxStaticBoxSizer, wxBoxSizer)
+#endif

 #if wxUSE_NOTEBOOK
 #if wxUSE_NOTEBOOK

-IMPLEMENT_ABSTRACT_CLASS(wxNotebookSizer, wxSizer);
+IMPLEMENT_ABSTRACT_CLASS(wxNotebookSizer, wxSizer)

 #endif
 
 //---------------------------------------------------------------------------
 #endif
 
 //---------------------------------------------------------------------------


@@ -230,6 +232,15 @@ void wxSizerItem::SetDimension( wxPoint pos, wxSize size )
     m_size = size;
 }
 
     m_size = size;
 }
 

+void wxSizerItem::DeleteWindows()
+{
+    if (m_window)
+         m_window->Destroy();
+
+    if (m_sizer)
+        m_sizer->DeleteWindows();
+}
+

 bool wxSizerItem::IsWindow()
 {
     return (m_window != NULL);
 bool wxSizerItem::IsWindow()
 {
     return (m_window != NULL);


@@ -258,11 +269,13 @@ wxSizer::wxSizer()
 
 wxSizer::~wxSizer()
 {
 
 wxSizer::~wxSizer()
 {

+    Clear();

 }
 
 void wxSizer::Add( wxWindow *window, int option, int flag, int border, wxObject* userData )
 {
     m_children.Append( new wxSizerItem( window, option, flag, border, userData ) );
 }
 
 void wxSizer::Add( wxWindow *window, int option, int flag, int border, wxObject* userData )
 {
     m_children.Append( new wxSizerItem( window, option, flag, border, userData ) );

+    window->SetContainingSizer(this);

 }
 
 void wxSizer::Add( wxSizer *sizer, int option, int flag, int border, wxObject* userData )
 }
 
 void wxSizer::Add( wxSizer *sizer, int option, int flag, int border, wxObject* userData )


@@ -278,6 +291,7 @@ void wxSizer::Add( int width, int height, int option, int flag, int border, wxOb
 void wxSizer::Prepend( wxWindow *window, int option, int flag, int border, wxObject* userData )
 {
     m_children.Insert( new wxSizerItem( window, option, flag, border, userData ) );
 void wxSizer::Prepend( wxWindow *window, int option, int flag, int border, wxObject* userData )
 {
     m_children.Insert( new wxSizerItem( window, option, flag, border, userData ) );

+    window->SetContainingSizer(this);

 }
 
 void wxSizer::Prepend( wxSizer *sizer, int option, int flag, int border, wxObject* userData )
 }
 
 void wxSizer::Prepend( wxSizer *sizer, int option, int flag, int border, wxObject* userData )


@@ -293,6 +307,7 @@ void wxSizer::Prepend( int width, int height, int option, int flag, int border,
 void wxSizer::Insert( int before, wxWindow *window, int option, int flag, int border, wxObject* userData )
 {
     m_children.Insert( before, new wxSizerItem( window, option, flag, border, userData ) );
 void wxSizer::Insert( int before, wxWindow *window, int option, int flag, int border, wxObject* userData )
 {
     m_children.Insert( before, new wxSizerItem( window, option, flag, border, userData ) );

+    window->SetContainingSizer(this);

 }
 
 void wxSizer::Insert( int before, wxSizer *sizer, int option, int flag, int border, wxObject* userData )
 }
 
 void wxSizer::Insert( int before, wxSizer *sizer, int option, int flag, int border, wxObject* userData )


@@ -315,6 +330,7 @@ bool wxSizer::Remove( wxWindow *window )
         wxSizerItem *item = (wxSizerItem*)node->Data();
         if (item->GetWindow() == window)
         {
         wxSizerItem *item = (wxSizerItem*)node->Data();
         if (item->GetWindow() == window)
         {

+            item->GetWindow()->SetContainingSizer(NULL);

             m_children.DeleteNode( node );
             return TRUE;
         }
             m_children.DeleteNode( node );
             return TRUE;
         }


@@ -353,6 +369,37 @@ bool wxSizer::Remove( int pos )
     return TRUE;
 }
 
     return TRUE;
 }
 

+void wxSizer::Clear( bool delete_windows )
+{
+    // First clear the ContainingSizer pointers
+    wxNode *node = m_children.First();
+    while (node)
+    {
+        wxSizerItem *item = (wxSizerItem*)node->Data();
+        if (item->IsWindow())
+            item->GetWindow()->SetContainingSizer(NULL);
+        node = node->Next();
+    }
+
+    // Destroy the windows if needed
+    if (delete_windows)
+        DeleteWindows();
+
+    // Now empty the list
+    m_children.Clear();
+}
+
+void wxSizer::DeleteWindows()
+{
+    wxNode *node = m_children.First();
+    while (node)
+    {
+        wxSizerItem *item = (wxSizerItem*)node->Data();
+        item->DeleteWindows();
+        node = node->Next();
+    }
+}
+

 void wxSizer::Fit( wxWindow *window )
 {
     wxSize size;
 void wxSizer::Fit( wxWindow *window )
 {
     wxSize size;


@@ -361,6 +408,7 @@ void wxSizer::Fit( wxWindow *window )
     else
         size = GetMinWindowSize( window );
 
     else
         size = GetMinWindowSize( window );
 

+    //window->SetClientSize( size );

     window->SetSize( size );
 }
 
     window->SetSize( size );
 }
 


@@ -372,25 +420,19 @@ void wxSizer::Layout()
 
 void wxSizer::SetSizeHints( wxWindow *window )
 {
 
 void wxSizer::SetSizeHints( wxWindow *window )
 {

+    // Preserve the window's max size hints, but set the
+    // lower bound according to the sizer calculations.
+

     wxSize size = FitSize( window );
     wxSize size = FitSize( window );

-    window->SetSizeHints( size.x, size.y );
+    window->SetSizeHints( size.x,
+                          size.y,
+                          window->GetMaxWidth(),
+                          window->GetMaxHeight() );

 }
 
 }
 

-wxSize wxSizer::GetMaxWindowSize( wxWindow *WXUNUSED(window) )
+wxSize wxSizer::GetMaxWindowSize( wxWindow *window )

 {
 {

-    wxRect rect = wxGetClientDisplayRect();
-    wxSize sizeMax (rect.width,rect.height);
-
-    // Make the max size a bit smaller than the visible portion of
-    // the screen.  A window which takes the entire screen doesn't
-    // look very nice either
-    sizeMax.x *= 9;
-    sizeMax.x /= 10;
-
-    sizeMax.y *= 9;
-    sizeMax.y /= 10;
-
-    return sizeMax;
+    return window->GetMaxSize();

 }
 
 wxSize wxSizer::GetMinWindowSize( wxWindow *window )
 }
 
 wxSize wxSizer::GetMinWindowSize( wxWindow *window )


@@ -408,9 +450,11 @@ wxSize wxSizer::FitSize( wxWindow *window )
     wxSize size     = GetMinWindowSize( window );
     wxSize sizeMax  = GetMaxWindowSize( window );
 
     wxSize size     = GetMinWindowSize( window );
     wxSize sizeMax  = GetMaxWindowSize( window );
 

-    if ( size.x > sizeMax.x )
+    // Limit the size if sizeMax != wxDefaultSize
+
+    if ( size.x > sizeMax.x && sizeMax.x != -1 )

         size.x = sizeMax.x;
         size.x = sizeMax.x;

-    if ( size.y > sizeMax.y )
+    if ( size.y > sizeMax.y && sizeMax.y != -1 )

         size.y = sizeMax.y;
 
     return size;
         size.y = sizeMax.y;
 
     return size;


@@ -1017,6 +1061,8 @@ wxSize wxBoxSizer::CalcMin()
 // wxStaticBoxSizer
 //---------------------------------------------------------------------------
 
 // wxStaticBoxSizer
 //---------------------------------------------------------------------------
 

+#if wxUSE_STATBOX
+

 wxStaticBoxSizer::wxStaticBoxSizer( wxStaticBox *box, int orient )
                 : wxBoxSizer( orient )
 {
 wxStaticBoxSizer::wxStaticBoxSizer( wxStaticBox *box, int orient )
                 : wxBoxSizer( orient )
 {


@@ -1072,6 +1118,8 @@ wxSize wxStaticBoxSizer::CalcMin()
     return ret;
 }
 
     return ret;
 }
 

+#endif // wxUSE_STATBOX
+

 //---------------------------------------------------------------------------
 // wxNotebookSizer
 //---------------------------------------------------------------------------
 //---------------------------------------------------------------------------
 // wxNotebookSizer
 //---------------------------------------------------------------------------


@@ -1092,24 +1140,15 @@ void wxNotebookSizer::RecalcSizes()
 
 wxSize wxNotebookSizer::CalcMin()
 {
 
 wxSize wxNotebookSizer::CalcMin()
 {

-    // This will have to be done platform by platform
-    // as there is no way to guess the thickness of
-    // the wxNotebook tabs and border.
+    wxSize sizeBorder = m_notebook->CalcSizeFromPage(wxSize(0, 0));

 
 

-    int borderX = 5;
-    int borderY = 5;
-    if ((m_notebook->HasFlag(wxNB_RIGHT)) ||
-        (m_notebook->HasFlag(wxNB_LEFT)))
-    {
-        borderX += 90; // improvements later..
-    }
-    else
-    {
-        borderY += 40; // improvements later..
-    }
+    sizeBorder.x += 5;
+    sizeBorder.y += 5;

 
     if (m_notebook->GetChildren().GetCount() == 0)
 
     if (m_notebook->GetChildren().GetCount() == 0)

-        return wxSize(borderX + 10, borderY + 10);
+    {
+        return wxSize(sizeBorder.x + 10, sizeBorder.y + 10);
+    }

 
     int maxX = 0;
     int maxY = 0;
 
     int maxX = 0;
     int maxY = 0;


@@ -1124,14 +1163,18 @@ wxSize wxNotebookSizer::CalcMin()
         {
             wxSize subsize( itemsizer->CalcMin() );
 
         {
             wxSize subsize( itemsizer->CalcMin() );
 

-            if (subsize.x > maxX) maxX = subsize.x;
-            if (subsize.y > maxY) maxY = subsize.y;
+            if (subsize.x > maxX)
+                maxX = subsize.x;
+            if (subsize.y > maxY)
+                maxY = subsize.y;

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

-    return wxSize( borderX + maxX, borderY + maxY );
+    return wxSize( maxX, maxY ) + sizeBorder;

 }
 
 #endif // wxUSE_NOTEBOOK
 }
 
 #endif // wxUSE_NOTEBOOK

+
+// vi:sts=4:sw=4:et