fixing forced link of quicktime backend on osx_cocoa

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

diff --git a/src/common/gbsizer.cpp b/src/common/gbsizer.cpp
index 7369b1b1453ddbe7935d59777ea3acb64ab7354a..7f91a1c40d123b1ae3aedcba7729a95af44a1715 100644 (file)
--- a/src/common/gbsizer.cpp
+++ b/src/common/gbsizer.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     wxGridBagSizer:  A sizer that can lay out items in a grid,
 //              with items at specified cells, and with the option of row
 //              and/or column spanning
 // Purpose:     wxGridBagSizer:  A sizer that can lay out items in a grid,
 //              with items at specified cells, and with the option of row
 //              and/or column spanning


@@ -76,7 +76,6 @@ wxGBSizerItem::wxGBSizerItem( wxSizer *sizer,
 wxGBSizerItem::wxGBSizerItem()
     : wxSizerItem(),
       m_pos(-1,-1),
 wxGBSizerItem::wxGBSizerItem()
     : wxSizerItem(),
       m_pos(-1,-1),

-      m_span(-1,-1),

       m_gbsizer(NULL)
 {
 }
       m_gbsizer(NULL)
 {
 }


@@ -313,27 +312,24 @@ bool wxGridBagSizer::SetItemPosition(size_t index, const wxGBPosition& pos)
 
 wxGBSpan wxGridBagSizer::GetItemSpan(wxWindow *window)
 {
 
 wxGBSpan wxGridBagSizer::GetItemSpan(wxWindow *window)
 {

-    wxGBSpan badspan(-1,-1);

     wxGBSizerItem* item = FindItem(window);
     wxGBSizerItem* item = FindItem(window);

-    wxCHECK_MSG( item, badspan, wxT("Failed to find item.") );
+    wxCHECK_MSG( item, wxGBSpan::Invalid(), wxT("Failed to find item.") );

     return item->GetSpan();
 }
 
 
 wxGBSpan wxGridBagSizer::GetItemSpan(wxSizer *sizer)
 {
     return item->GetSpan();
 }
 
 
 wxGBSpan wxGridBagSizer::GetItemSpan(wxSizer *sizer)
 {

-    wxGBSpan badspan(-1,-1);

     wxGBSizerItem* item = FindItem(sizer);
     wxGBSizerItem* item = FindItem(sizer);

-    wxCHECK_MSG( item, badspan, wxT("Failed to find item.") );
+    wxCHECK_MSG( item, wxGBSpan::Invalid(), wxT("Failed to find item.") );

     return item->GetSpan();
 }
 
 
 wxGBSpan wxGridBagSizer::GetItemSpan(size_t index)
 {
     return item->GetSpan();
 }
 
 
 wxGBSpan wxGridBagSizer::GetItemSpan(size_t index)
 {

-    wxGBSpan badspan(-1,-1);

     wxSizerItemList::compatibility_iterator node = m_children.Item( index );
     wxSizerItemList::compatibility_iterator node = m_children.Item( index );

-    wxCHECK_MSG( node, badspan, wxT("Failed to find item.") );
+    wxCHECK_MSG( node, wxGBSpan::Invalid(), wxT("Failed to find item.") );

     wxGBSizerItem* item = (wxGBSizerItem*)node->GetData();
     return item->GetSpan();
 }
     wxGBSizerItem* item = (wxGBSizerItem*)node->GetData();
     return item->GetSpan();
 }


@@ -472,10 +468,10 @@ wxSize wxGridBagSizer::CalcMin()
             item->GetPos(row, col);
             item->GetEndPos(endrow, endcol);
 
             item->GetPos(row, col);
             item->GetEndPos(endrow, endcol);
 

-            // fill heights and widths upto this item if needed
-            while ( m_rowHeights.GetCount() <= (size_t)endrow )
+            // fill heights and widths up to this item if needed
+            while ( (int)m_rowHeights.GetCount() <= endrow )

                 m_rowHeights.Add(m_emptyCellSize.GetHeight());
                 m_rowHeights.Add(m_emptyCellSize.GetHeight());

-            while ( m_colWidths.GetCount() <= (size_t)endcol )
+            while ( (int)m_colWidths.GetCount() <= endcol )

                 m_colWidths.Add(m_emptyCellSize.GetWidth());
 
             // See if this item increases the size of its row(s) or col(s)
                 m_colWidths.Add(m_emptyCellSize.GetWidth());
 
             // See if this item increases the size of its row(s) or col(s)


@@ -583,7 +579,7 @@ void wxGridBagSizer::RecalcSizes()
 void wxGridBagSizer::AdjustForOverflow()
 {
     int row, col;
 void wxGridBagSizer::AdjustForOverflow()
 {
     int row, col;

-    
+

     for (row=0; row<(int)m_rowHeights.GetCount(); row++)
     {
         int rowExtra=INT_MAX;
     for (row=0; row<(int)m_rowHeights.GetCount(); row++)
     {
         int rowExtra=INT_MAX;


@@ -597,7 +593,7 @@ void wxGridBagSizer::AdjustForOverflow()
 
             int endrow, endcol;
             item->GetEndPos(endrow, endcol);
 
             int endrow, endcol;
             item->GetEndPos(endrow, endcol);

-            
+

             // If the item starts in this position and doesn't span rows, then
             // just look at the whole item height
             if ( item->GetPos() == pos && endrow == row )
             // If the item starts in this position and doesn't span rows, then
             // just look at the whole item height
             if ( item->GetPos() == pos && endrow == row )


@@ -617,7 +613,7 @@ void wxGridBagSizer::AdjustForOverflow()
 
                 if ( itemHeight < 0 )
                     itemHeight = 0;
 
                 if ( itemHeight < 0 )
                     itemHeight = 0;

-                
+

                 // and check how much is left
                 rowExtra = wxMin(rowExtra, rowHeight - itemHeight);
             }
                 // and check how much is left
                 rowExtra = wxMin(rowExtra, rowHeight - itemHeight);
             }


@@ -640,7 +636,7 @@ void wxGridBagSizer::AdjustForOverflow()
 
             int endrow, endcol;
             item->GetEndPos(endrow, endcol);
 
             int endrow, endcol;
             item->GetEndPos(endrow, endcol);

-            
+

             if ( item->GetPos() == pos && endcol == col )
             {
                 int itemWidth = item->CalcMin().GetWidth();
             if ( item->GetPos() == pos && endcol == col )
             {
                 int itemWidth = item->CalcMin().GetWidth();


@@ -656,7 +652,7 @@ void wxGridBagSizer::AdjustForOverflow()
 
                 if ( itemWidth < 0 )
                     itemWidth = 0;
 
                 if ( itemWidth < 0 )
                     itemWidth = 0;

-                
+

                 colExtra = wxMin(colExtra, colWidth - itemWidth);
             }
         }
                 colExtra = wxMin(colExtra, colWidth - itemWidth);
             }
         }


@@ -664,7 +660,7 @@ void wxGridBagSizer::AdjustForOverflow()
             m_colWidths[col] -= colExtra;
     }
 
             m_colWidths[col] -= colExtra;
     }
 

-    
+

 }
 
 //---------------------------------------------------------------------------
 }
 
 //---------------------------------------------------------------------------