Build fix after recent changes in wxRendererNative class.

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

diff --git a/src/common/sizer.cpp b/src/common/sizer.cpp
index 83aa3483aa21f742240539ffdc556a5d89482422..1d9e4c216b56d2a7379f45e8fa53acab16494d07 100644 (file)
--- a/src/common/sizer.cpp
+++ b/src/common/sizer.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        sizer.cpp
+// Name:        src/common/sizer.cpp

 // Purpose:     provide new wxSizer class for layout
 // Author:      Robert Roebling and Robin Dunn, contributions by
 //              Dirk Holtwick, Ron Lee
 // Purpose:     provide new wxSizer class for layout
 // Author:      Robert Roebling and Robin Dunn, contributions by
 //              Dirk Holtwick, Ron Lee


@@ -20,6 +20,7 @@
 #ifndef WX_PRECOMP
     #include "wx/string.h"
     #include "wx/intl.h"
 #ifndef WX_PRECOMP
     #include "wx/string.h"
     #include "wx/intl.h"

+    #include "wx/math.h"

 #endif // WX_PRECOMP
 
 #include "wx/sizer.h"
 #endif // WX_PRECOMP
 
 #include "wx/sizer.h"


@@ -46,7 +47,7 @@ IMPLEMENT_CLASS(wxStaticBoxSizer, wxBoxSizer)
 IMPLEMENT_CLASS(wxStdDialogButtonSizer, wxBoxSizer)
 #endif
 
 IMPLEMENT_CLASS(wxStdDialogButtonSizer, wxBoxSizer)
 #endif
 

-WX_DEFINE_EXPORTED_LIST( wxSizerItemList );
+WX_DEFINE_EXPORTED_LIST( wxSizerItemList )

 
 /*
     TODO PROPERTIES
 
 /*
     TODO PROPERTIES


@@ -265,7 +266,7 @@ wxSize wxSizerItem::CalcMin()
 
         // if we have to preserve aspect ratio _AND_ this is
         // the first-time calculation, consider ret to be initial size
 
         // 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 ( (m_flag & wxSHAPED) && wxIsNullDouble(m_ratio) )

             SetRatio(m_minSize);
     }
     else if ( IsWindow() )
             SetRatio(m_minSize);
     }
     else if ( IsWindow() )


@@ -295,8 +296,10 @@ wxSize wxSizerItem::GetMinSizeWithBorder() const
 }
 
 
 }
 
 

-void wxSizerItem::SetDimension( wxPoint pos, wxSize size )
+void wxSizerItem::SetDimension( const wxPoint& pos_, const wxSize& size_ )

 {
 {

+    wxPoint pos = pos_;
+    wxSize size = size_;

     if (m_flag & wxSHAPED)
     {
         // adjust aspect ratio
     if (m_flag & wxSHAPED)
     {
         // adjust aspect ratio


@@ -444,7 +447,20 @@ bool wxSizerItem::IsShown() const
             return m_window->IsShown();
 
         case Item_Sizer:
             return m_window->IsShown();
 
         case Item_Sizer:

-            return m_sizer->IsShown();
+            // arbitrarily decide that if at least one of our elements is
+            // shown, so are we (this arbitrariness is the reason for
+            // deprecating this function)
+            {
+                for ( wxSizerItemList::compatibility_iterator
+                        node = m_sizer->GetChildren().GetFirst();
+                      node;
+                      node = node->GetNext() )
+                {
+                    if ( node->GetData()->IsShown() )
+                        return true;
+                }
+            }
+            return false;

 
         case Item_Spacer:
             return m_spacer->IsShown();
 
         case Item_Spacer:
             return m_spacer->IsShown();


@@ -457,6 +473,7 @@ bool wxSizerItem::IsShown() const
     return false;
 }
 
     return false;
 }
 

+#if WXWIN_COMPATIBILITY_2_6

 void wxSizerItem::SetOption( int option )
 {
     SetProportion( option );
 void wxSizerItem::SetOption( int option )
 {
     SetProportion( option );


@@ -466,17 +483,13 @@ int wxSizerItem::GetOption() const
 {
     return GetProportion();
 }
 {
     return GetProportion();
 }

+#endif // WXWIN_COMPATIBILITY_2_6

 
 
 //---------------------------------------------------------------------------
 // wxSizer
 //---------------------------------------------------------------------------
 
 
 
 //---------------------------------------------------------------------------
 // wxSizer
 //---------------------------------------------------------------------------
 

-wxSizer::wxSizer()
-{
-    m_isShown = true;
-}
-

 wxSizer::~wxSizer()
 {
     WX_CLEAR_LIST(wxSizerItemList, m_children);
 wxSizer::~wxSizer()
 {
     WX_CLEAR_LIST(wxSizerItemList, m_children);


@@ -492,10 +505,12 @@ wxSizerItem* wxSizer::Insert( size_t index, wxSizerItem *item )
     return item;
 }
 
     return item;
 }
 

+#if WXWIN_COMPATIBILITY_2_6

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

+#endif // WXWIN_COMPATIBILITY_2_6

 
 bool wxSizer::Remove( wxSizer *sizer )
 {
 
 bool wxSizer::Remove( wxSizer *sizer )
 {


@@ -1321,10 +1336,12 @@ void wxFlexGridSizer::AdjustForFlexDirection()
         wxArrayInt& array = m_flexDirection == wxVERTICAL ? m_colWidths
                                                           : m_rowHeights;
 
         wxArrayInt& array = m_flexDirection == wxVERTICAL ? m_colWidths
                                                           : m_rowHeights;
 

-        const int count = array.GetCount();
+        const size_t count = array.GetCount();

 
         // find the largest value in this array
 
         // find the largest value in this array

-        int n, largest = 0;
+        size_t n;
+        int largest = 0;
+

         for ( n = 0; n < count; ++n )
         {
             if ( array[n] > largest )
         for ( n = 0; n < count; ++n )
         {
             if ( array[n] > largest )


@@ -1930,12 +1947,16 @@ IMPLEMENT_CLASS(wxNotebookSizer, wxBookCtrlSizer)
 
 #if wxUSE_BOOKCTRL
 
 
 #if wxUSE_BOOKCTRL
 

+#if WXWIN_COMPATIBILITY_2_6
+

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

+#endif // WXWIN_COMPATIBILITY_2_6
+

 void wxBookCtrlSizer::RecalcSizes()
 {
     m_bookctrl->SetSize( m_position.x, m_position.y, m_size.x, m_size.y );
 void wxBookCtrlSizer::RecalcSizes()
 {
     m_bookctrl->SetSize( m_position.x, m_position.y, m_size.x, m_size.y );


@@ -1981,12 +2002,16 @@ wxSize wxBookCtrlSizer::CalcMin()
 
 #if wxUSE_NOTEBOOK
 
 
 #if wxUSE_NOTEBOOK
 

+#if WXWIN_COMPATIBILITY_2_6
+

 wxNotebookSizer::wxNotebookSizer(wxNotebook *nb)
 {
     wxASSERT_MSG( nb, wxT("wxNotebookSizer needs a control") );
     m_bookctrl = nb;
 }
 
 wxNotebookSizer::wxNotebookSizer(wxNotebook *nb)
 {
     wxASSERT_MSG( nb, wxT("wxNotebookSizer needs a control") );
     m_bookctrl = nb;
 }
 

+#endif // WXWIN_COMPATIBILITY_2_6
+

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