wxDataViewCtrl WIP.

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

diff --git a/src/common/sizer.cpp b/src/common/sizer.cpp
index 85be8ac5249c10beaa6a66b9dd85fd0bcf9c067f..b250c0c04853a12bad57b0bcc61498cd08771e0b 100644 (file)
--- a/src/common/sizer.cpp
+++ b/src/common/sizer.cpp
@@ -10,10 +10,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "sizer.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -24,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"


@@ -50,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


@@ -269,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() )


@@ -299,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


@@ -440,14 +439,28 @@ bool wxSizerItem::IsShown() const
     switch ( m_kind )
     {
         case Item_None:
     switch ( m_kind )
     {
         case Item_None:

-            wxFAIL_MSG( _T("uninitialized sizer item") );
+            // we may be called from CalcMin(), just return false so that we're
+            // not used

             break;
 
         case Item_Window:
             return m_window->IsShown();
 
         case Item_Sizer:
             break;
 
         case Item_Window:
             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();


@@ -475,11 +488,6 @@ int wxSizerItem::GetOption() const
 // wxSizer
 //---------------------------------------------------------------------------
 
 // wxSizer
 //---------------------------------------------------------------------------
 

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

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


@@ -1324,10 +1332,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 )