Forgot header with OSX prefix

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

diff --git a/src/common/sizer.cpp b/src/common/sizer.cpp
index 939150a121ff2dae7636abf5ea88941f7fc0db47..375f5c282496db1794aa40089a415a9e6fc64ed1 100644 (file)
--- a/src/common/sizer.cpp
+++ b/src/common/sizer.cpp
@@ -1333,7 +1333,7 @@ int wxGridSizer::CalcRowsCols(int& nrows, int& ncols) const
         ncols = m_cols;
         nrows = m_rows;
 
         ncols = m_cols;
         nrows = m_rows;
 

-        wxASSERT_MSG( ncols*nrows <= nitems, "too many items in grid sizer" );
+        wxASSERT_MSG( ncols*nrows >= nitems, "too many items in grid sizer" );

     }
     else if ( m_cols )
     {
     }
     else if ( m_cols )
     {


@@ -1987,7 +1987,7 @@ void wxBoxSizer::RecalcSizes()
         }
         // NB: wxCENTRE is used here only for backwards compatibility,
         //     wxALIGN_CENTRE should be used in new code
         }
         // NB: wxCENTRE is used here only for backwards compatibility,
         //     wxALIGN_CENTRE should be used in new code

-        else if ( flag & (wxCENTER | wxALIGN_CENTRE) )
+        else if ( flag & (wxCENTER | (IsVertical() ? wxALIGN_CENTRE_HORIZONTAL : wxALIGN_CENTRE_VERTICAL)))

         {
             PosInMinorDir(posChild) += (totalMinorSize - minorSize) / 2;
         }
         {
             PosInMinorDir(posChild) += (totalMinorSize - minorSize) / 2;
         }