Give wxListBox a GetClassDefaultAttributes so wxCalendarCtrl (and

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

diff --git a/src/common/sizer.cpp b/src/common/sizer.cpp
index 06c64979b4a19500ca650d89189c1a5e6c133426..b171d66ae5e5d3b6d5e937d1ebd465c6d218dac8 100644 (file)
--- a/src/common/sizer.cpp
+++ b/src/common/sizer.cpp
@@ -24,8 +24,10 @@
 #include "wx/sizer.h"
 #include "wx/utils.h"
 #include "wx/statbox.h"
 #include "wx/sizer.h"
 #include "wx/utils.h"
 #include "wx/statbox.h"

-#include "wx/notebook.h"

 #include "wx/listimpl.cpp"
 #include "wx/listimpl.cpp"

+#if WXWIN_COMPATIBILITY_2_4
+    #include "wx/notebook.h"
+#endif

 
 #ifdef __WXMAC__
 #   include "wx/mac/uma.h"
 
 #ifdef __WXMAC__
 #   include "wx/mac/uma.h"


@@ -41,12 +43,6 @@ IMPLEMENT_CLASS(wxBoxSizer, wxSizer)
 #if wxUSE_STATBOX
 IMPLEMENT_CLASS(wxStaticBoxSizer, wxBoxSizer)
 #endif
 #if wxUSE_STATBOX
 IMPLEMENT_CLASS(wxStaticBoxSizer, wxBoxSizer)
 #endif

-#if wxUSE_BOOKCTRL
-IMPLEMENT_CLASS(wxBookCtrlSizer, wxSizer)
-#if wxUSE_NOTEBOOK
-IMPLEMENT_CLASS(wxNotebookSizer, wxBookCtrlSizer)
-#endif // wxUSE_NOTEBOOK
-#endif // wxUSE_BOOKCTRL

 
 WX_DEFINE_EXPORTED_LIST( wxSizerItemList );
 
 
 WX_DEFINE_EXPORTED_LIST( wxSizerItemList );
 


@@ -103,13 +99,16 @@ wxSizerItem::wxSizerItem( int width, int height, int proportion, int flag, int b
 wxSizerItem::wxSizerItem( wxWindow *window, int proportion, int flag, int border, wxObject* userData )
     : m_window( window )
     , m_sizer( NULL )
 wxSizerItem::wxSizerItem( wxWindow *window, int proportion, int flag, int border, wxObject* userData )
     : m_window( window )
     , m_sizer( NULL )

-    , m_minSize( window->GetSize() )    // minimal size is the initial size

     , m_proportion( proportion )
     , m_border( border )
     , m_flag( flag )
     , m_show( true )
     , m_userData( userData )
 {
     , m_proportion( proportion )
     , m_border( border )
     , m_flag( flag )
     , m_show( true )
     , m_userData( userData )
 {

+    if (flag & wxFIXED_MINSIZE)
+        window->SetMinSize(window->GetSize());
+    m_minSize = window->GetSize();
+    

     // aspect ratio calculated from initial size
     SetRatio( m_minSize );
 
     // aspect ratio calculated from initial size
     SetRatio( m_minSize );
 


@@ -181,28 +180,29 @@ wxSize wxSizerItem::GetSize() const
 
 wxSize wxSizerItem::CalcMin()
 {
 
 wxSize wxSizerItem::CalcMin()
 {

-    wxSize ret;

     if (IsSizer())
     {
     if (IsSizer())
     {

-        ret = m_sizer->GetMinSize();
+        m_minSize = m_sizer->GetMinSize();

 
         // if we have to preserve aspect ratio _AND_ this is
         // the first-time calculation, consider ret to be initial size
         if ((m_flag & wxSHAPED) && !m_ratio)
 
         // if we have to preserve aspect ratio _AND_ this is
         // the first-time calculation, consider ret to be initial size
         if ((m_flag & wxSHAPED) && !m_ratio)

-            SetRatio(ret);
+            SetRatio(m_minSize);

     }
     }

-    else
+    else if ( IsWindow() )

     {
     {

-        if ( IsWindow() && !(m_flag & wxFIXED_SIZE) )
-        {
-            // the size of the window may change during run-time, we should
-            // use the current minimal size
-            m_minSize = m_window->GetAdjustedBestSize();
-        }
-
-        ret = m_minSize;
+        // Since the size of the window may change during runtime, we
+        // should use the current minimal/best size.
+        m_minSize = m_window->GetBestFittingSize();

     }
 
     }
 

+    return GetMinSizeWithBorder();
+}
+
+wxSize wxSizerItem::GetMinSizeWithBorder() const
+{
+    wxSize ret = m_minSize;
+

     if (m_flag & wxWEST)
         ret.x += m_border;
     if (m_flag & wxEAST)
     if (m_flag & wxWEST)
         ret.x += m_border;
     if (m_flag & wxEAST)


@@ -211,10 +211,11 @@ wxSize wxSizerItem::CalcMin()
         ret.y += m_border;
     if (m_flag & wxSOUTH)
         ret.y += m_border;
         ret.y += m_border;
     if (m_flag & wxSOUTH)
         ret.y += m_border;

-
+    

     return ret;
 }
 
     return ret;
 }
 

+

 void wxSizerItem::SetDimension( wxPoint pos, wxSize size )
 {
     if (m_flag & wxSHAPED)
 void wxSizerItem::SetDimension( wxPoint pos, wxSize size )
 {
     if (m_flag & wxSHAPED)


@@ -280,7 +281,10 @@ void wxSizerItem::SetDimension( wxPoint pos, wxSize size )
 void wxSizerItem::DeleteWindows()
 {
     if (m_window)
 void wxSizerItem::DeleteWindows()
 {
     if (m_window)

+    {

          m_window->Destroy();
          m_window->Destroy();

+         m_window = NULL;
+    }

 
     if (m_sizer)
         m_sizer->DeleteWindows();
 
     if (m_sizer)
         m_sizer->DeleteWindows();


@@ -362,6 +366,16 @@ void wxSizer::Add( wxSizerItem *item )
         item->GetWindow()->SetContainingSizer( this );
 }
 
         item->GetWindow()->SetContainingSizer( this );
 }
 

+void wxSizer::AddSpacer(int size)
+{
+    Add(size, size);
+}
+
+void wxSizer::AddStretchSpacer(int prop)
+{
+    Add(0, 0, prop);
+}
+

 void wxSizer::Prepend( wxWindow *window, int proportion, int flag, int border, wxObject* userData )
 {
     m_children.Insert( new wxSizerItem( window, proportion, flag, border, userData ) );
 void wxSizer::Prepend( wxWindow *window, int proportion, int flag, int border, wxObject* userData )
 {
     m_children.Insert( new wxSizerItem( window, proportion, flag, border, userData ) );


@@ -386,6 +400,16 @@ void wxSizer::Prepend( wxSizerItem *item )
         item->GetWindow()->SetContainingSizer( this );
 }
 
         item->GetWindow()->SetContainingSizer( this );
 }
 

+void wxSizer::PrependSpacer(int size)
+{
+    Prepend(size, size);
+}
+
+void wxSizer::PrependStretchSpacer(int prop)
+{
+    Prepend(0, 0, prop);
+}
+

 void wxSizer::Insert( size_t index,
                       wxWindow *window,
                       int proportion,
 void wxSizer::Insert( size_t index,
                       wxWindow *window,
                       int proportion,


@@ -429,6 +453,16 @@ void wxSizer::Insert( size_t index, wxSizerItem *item )
         item->GetWindow()->SetContainingSizer( this );
 }
 
         item->GetWindow()->SetContainingSizer( this );
 }
 

+void wxSizer::InsertSpacer(size_t index, int size)
+{
+    Insert(index, size, size);
+}
+
+void wxSizer::InsertStretchSpacer(size_t index, int prop)
+{
+    Insert(index, 0, 0, prop);
+}
+

 bool wxSizer::Remove( wxWindow *window )
 {
     return Detach( window );
 bool wxSizer::Remove( wxWindow *window )
 {
     return Detach( window );


@@ -598,7 +632,11 @@ void wxSizer::FitInside( wxWindow *window )
 
 void wxSizer::Layout()
 {
 
 void wxSizer::Layout()
 {

+    // (re)calculates minimums needed for each item and other preparations
+    // for layout

     CalcMin();
     CalcMin();

+
+    // Applies the layout and repositions/resizes the items

     RecalcSizes();
 }
 
     RecalcSizes();
 }
 


@@ -735,8 +773,7 @@ bool wxSizer::DoSetItemMinSize( wxWindow *window, int width, int height )
 
         if (item->GetWindow() == window)
         {
 
         if (item->GetWindow() == window)
         {

-            item->SetInitSize( width, height );
-            item->GetWindow()->SetSizeHints(width, height);
+            item->SetMinSize( width, height );

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


@@ -814,10 +851,8 @@ bool wxSizer::DoSetItemMinSize( size_t index, int width, int height )
     }
     else
     {
     }
     else
     {

-        // ... but the minimal size of spacers and windows in stored in them
-        item->SetInitSize( width, height );
-        if (item->GetWindow())
-            item->GetWindow()->SetSizeHints(width, height);
+        // ... but the minimal size of spacers and windows is stored via the item
+        item->SetMinSize( width, height );

     }
 
     return true;
     }
 
     return true;


@@ -1037,7 +1072,7 @@ wxSize wxGridSizer::CalcMin()
 void wxGridSizer::SetItemBounds( wxSizerItem *item, int x, int y, int w, int h )
 {
     wxPoint pt( x,y );
 void wxGridSizer::SetItemBounds( wxSizerItem *item, int x, int y, int w, int h )
 {
     wxPoint pt( x,y );

-    wxSize sz( item->CalcMin() );
+    wxSize sz( item->GetMinSizeWithBorder() ); 

     int flag = item->GetFlag();
 
     if ((flag & wxEXPAND) || (flag & wxSHAPED))
     int flag = item->GetFlag();
 
     if ((flag & wxEXPAND) || (flag & wxSHAPED))


@@ -1098,9 +1133,8 @@ void wxFlexGridSizer::RecalcSizes()
 
     wxPoint pt( GetPosition() );
     wxSize sz( GetSize() );
 
     wxPoint pt( GetPosition() );
     wxSize sz( GetSize() );

-    wxSize minsz( CalcMin() );

 
 

-    AdjustForGrowables(sz, minsz, nrows, ncols);
+    AdjustForGrowables(sz, m_calculatedMinSize, nrows, ncols);

 
     sz = wxSize( pt.x + sz.x, pt.y + sz.y );
 
 
     sz = wxSize( pt.x + sz.x, pt.y + sz.y );
 


@@ -1185,7 +1219,8 @@ wxSize wxFlexGridSizer::CalcMin()
         if ( m_rowHeights[ row ] != -1 )
             height += m_rowHeights[ row ] + ( row == nrows-1 ? 0 : m_vgap );
 
         if ( m_rowHeights[ row ] != -1 )
             height += m_rowHeights[ row ] + ( row == nrows-1 ? 0 : m_vgap );
 

-    return wxSize( width, height );
+    m_calculatedMinSize = wxSize( width, height );
+    return m_calculatedMinSize;

 }
 
 void wxFlexGridSizer::AdjustForFlexDirection()
 }
 
 void wxFlexGridSizer::AdjustForFlexDirection()


@@ -1380,7 +1415,7 @@ void wxBoxSizer::RecalcSizes()
 
         if (item->IsShown())
         {
 
         if (item->IsShown())
         {

-            wxSize size( item->CalcMin() );
+            wxSize size( item->GetMinSizeWithBorder() );

 
             if (m_orient == wxVERTICAL)
             {
 
             if (m_orient == wxVERTICAL)
             {


@@ -1451,11 +1486,15 @@ wxSize wxBoxSizer::CalcMin()
     m_fixedWidth = 0;
     m_fixedHeight = 0;
 
     m_fixedWidth = 0;
     m_fixedHeight = 0;
 

+    // precalc item minsizes and count proportions

     wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
     while (node)
     {
         wxSizerItem *item = node->GetData();
 
     wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
     while (node)
     {
         wxSizerItem *item = node->GetData();
 

+        if (item->IsShown())
+            item->CalcMin();  // result is stored in the item
+        

         if (item->IsShown() && item->GetProportion() != 0)
             m_stretchable += item->GetProportion();
 
         if (item->IsShown() && item->GetProportion() != 0)
             m_stretchable += item->GetProportion();
 


@@ -1473,7 +1512,7 @@ wxSize wxBoxSizer::CalcMin()
         if (item->IsShown() && item->GetProportion() != 0)
         {
             int stretch = item->GetProportion();
         if (item->IsShown() && item->GetProportion() != 0)
         {
             int stretch = item->GetProportion();

-            wxSize size( item->CalcMin() );
+            wxSize size( item->GetMinSizeWithBorder() );

             int minSize;
             
             // Integer division rounded up is (a + b - 1) / b
             int minSize;
             
             // Integer division rounded up is (a + b - 1) / b


@@ -1498,7 +1537,7 @@ wxSize wxBoxSizer::CalcMin()
 
         if (item->IsShown())
         {
 
         if (item->IsShown())
         {

-            wxSize size( item->CalcMin() );
+            wxSize size( item->GetMinSizeWithBorder() );

             if (item->GetProportion() != 0)
             {
                 if (m_orient == wxHORIZONTAL)
             if (item->GetProportion() != 0)
             {
                 if (m_orient == wxHORIZONTAL)


@@ -1627,12 +1666,28 @@ wxSize wxStaticBoxSizer::CalcMin()
     return ret;
 }
 
     return ret;
 }
 

+void wxStaticBoxSizer::ShowItems( bool show )
+{
+    m_staticBox->Show( show );
+    wxBoxSizer::ShowItems( show );
+}
+

 #endif // wxUSE_STATBOX
 
 #endif // wxUSE_STATBOX
 

+
+#if WXWIN_COMPATIBILITY_2_4
+

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

+#if wxUSE_BOOKCTRL
+IMPLEMENT_CLASS(wxBookCtrlSizer, wxSizer)
+#if wxUSE_NOTEBOOK
+IMPLEMENT_CLASS(wxNotebookSizer, wxBookCtrlSizer)
+#endif // wxUSE_NOTEBOOK
+#endif // wxUSE_BOOKCTRL
+

 #if wxUSE_BOOKCTRL
 
 wxBookCtrlSizer::wxBookCtrlSizer(wxBookCtrl *bookctrl)
 #if wxUSE_BOOKCTRL
 
 wxBookCtrlSizer::wxBookCtrlSizer(wxBookCtrl *bookctrl)


@@ -1684,14 +1739,15 @@ wxSize wxBookCtrlSizer::CalcMin()
     return wxSize( maxX, maxY ) + sizeBorder;
 }
 
     return wxSize( maxX, maxY ) + sizeBorder;
 }
 

-

 #if wxUSE_NOTEBOOK
 
 wxNotebookSizer::wxNotebookSizer(wxNotebook *nb)
 #if wxUSE_NOTEBOOK
 
 wxNotebookSizer::wxNotebookSizer(wxNotebook *nb)

-    : wxBookCtrlSizer(nb)

 {
 {

+    wxASSERT_MSG( nb, wxT("wxNotebookSizer needs a control") );
+    m_bookctrl = nb;

 }
 
 #endif // wxUSE_NOTEBOOOK
 #endif // wxUSE_BOOKCTRL
 
 }
 
 #endif // wxUSE_NOTEBOOOK
 #endif // wxUSE_BOOKCTRL
 

+#endif // WXWIN_COMPATIBILITY_2_4