generate key events for Space/Enter in addition to the activate events, as wxMSW...

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

diff --git a/src/common/sizer.cpp b/src/common/sizer.cpp
index 125f342b327d6d9775a568ec0c1d02987d24229a..b4f6dc23d16e58ecc39ec92215138ec91977ac24 100644 (file)
--- a/src/common/sizer.cpp
+++ b/src/common/sizer.cpp
@@ -568,10 +568,10 @@ bool wxSizer::DoSetItemMinSize( wxWindow *window, int width, int height )
         wxSizerItem *item = (wxSizerItem*)node->Data();
         if (item->GetSizer())
         {
         wxSizerItem *item = (wxSizerItem*)node->Data();
         if (item->GetSizer())
         {

-            /* It's a sizer, so lets search recursively. */
+            // It's a sizer, so lets search recursively.

             if (item->GetSizer()->DoSetItemMinSize( window, width, height ))
             {
             if (item->GetSizer()->DoSetItemMinSize( window, width, height ))
             {

-                /* A child sizer found the requested windw, exit. */
+                // A child sizer found the requested windw, exit.

                 return TRUE;
             }
         }
                 return TRUE;
             }
         }


@@ -603,10 +603,10 @@ bool wxSizer::DoSetItemMinSize( wxSizer *sizer, int width, int height )
         wxSizerItem *item = (wxSizerItem*)node->Data();
         if (item->GetSizer())
         {
         wxSizerItem *item = (wxSizerItem*)node->Data();
         if (item->GetSizer())
         {

-            /* It's a sizer, so lets search recursively. */
+            // It's a sizer, so lets search recursively.

             if (item->GetSizer()->DoSetItemMinSize( sizer, width, height ))
             {
             if (item->GetSizer()->DoSetItemMinSize( sizer, width, height ))
             {

-                /* A child sizer found the requested windw, exit. */
+                // A child sizer found the requested windw, exit.

                 return TRUE;
             }
         }
                 return TRUE;
             }
         }


@@ -624,13 +624,12 @@ bool wxSizer::DoSetItemMinSize( int pos, int width, int height )
     wxSizerItem *item = (wxSizerItem*) node->Data();
     if (item->GetSizer())
     {
     wxSizerItem *item = (wxSizerItem*) node->Data();
     if (item->GetSizer())
     {

-        /* Sizers contains the minimal size in them, if not calculated ... */
+        // Sizers contains the minimal size in them, if not calculated ...

         item->GetSizer()->DoSetMinSize( width, height );
     }
     else
     {
         item->GetSizer()->DoSetMinSize( width, height );
     }
     else
     {

-        /* ... whereas the minimal size of spacers and windows in stored
-           in the item */
+        // ... but the minimal size of spacers and windows in stored in them

         item->SetInitSize( width, height );
     }
 
         item->SetInitSize( width, height );
     }
 


@@ -657,19 +656,37 @@ wxGridSizer::wxGridSizer( int cols, int vgap, int hgap )
     m_hgap = hgap;
 }
 
     m_hgap = hgap;
 }
 

-void wxGridSizer::RecalcSizes()
+int wxGridSizer::CalcRowsCols(int& nrows, int& ncols) const

 {
 {

-    if (m_children.GetCount() == 0)
-        return;
-

     int nitems = m_children.GetCount();
     int nitems = m_children.GetCount();

-    int nrows = m_rows;
-    int ncols = m_cols;
+    if ( nitems) 
+    {
+        if ( m_cols )
+        {
+            ncols = m_cols;
+            nrows = (nitems + m_cols - 1) / m_cols;
+        }
+        else if ( m_rows )
+        {
+            ncols = (nitems + m_rows - 1) / m_rows;
+            nrows = m_rows;
+        }
+        else // 0 columns, 0 rows?
+        {
+            wxFAIL_MSG( _T("grid sizer must have either rows or columns fixed") );

 
 

-    if (ncols > 0)
-        nrows = (nitems + ncols-1) / ncols;
-    else
-        ncols = (nitems + nrows-1) / nrows;
+            nrows = ncols = 0;
+        }
+    }
+
+    return nitems;
+}
+
+void wxGridSizer::RecalcSizes()
+{
+    int nitems, nrows, ncols;
+    if ( (nitems = CalcRowsCols(nrows, ncols)) == 0 )
+        return;

 
     wxSize sz( GetSize() );
     wxPoint pt( GetPosition() );
 
     wxSize sz( GetSize() );
     wxPoint pt( GetPosition() );


@@ -699,19 +716,11 @@ void wxGridSizer::RecalcSizes()
 
 wxSize wxGridSizer::CalcMin()
 {
 
 wxSize wxGridSizer::CalcMin()
 {

-    if (m_children.GetCount() == 0)
-        return wxSize(10,10);
-
-    int nitems = m_children.GetCount();
-    int nrows = m_rows;
-    int ncols = m_cols;
-
-    if (ncols > 0)
-        nrows = (nitems + ncols-1) / ncols;
-    else
-        ncols = (nitems + nrows-1) / nrows;
+    int nitems, nrows, ncols;
+    if ( (nitems = CalcRowsCols(nrows, ncols)) == 0 )
+        return wxSize(10, 10);

 
 

-    /* Find the max width and height for any component */
+    // Find the max width and height for any component

     int w = 0;
     int h = 0;
 
     int w = 0;
     int h = 0;
 


@@ -797,17 +806,12 @@ void wxFlexGridSizer::CreateArrays()
     if (m_colWidths)
         delete[] m_colWidths;
 
     if (m_colWidths)
         delete[] m_colWidths;
 

-    if (m_children.GetCount() == 0)
-        return;
-
-    int nitems = m_children.GetCount();
-    int nrows = m_rows;
-    int ncols = m_cols;
-
-    if (ncols > 0)
-        nrows = (nitems + ncols-1) / ncols;
-    else
-        ncols = (nitems + nrows-1) / nrows;
+    int nitems, nrows, ncols;
+    if ( (nitems = CalcRowsCols(nrows, ncols)) == 0 )
+    {
+        m_rowHeights =
+        m_colWidths = NULL;
+    }

 
     m_rowHeights = new int[nrows];
     m_colWidths = new int[ncols];
 
     m_rowHeights = new int[nrows];
     m_colWidths = new int[ncols];


@@ -820,36 +824,44 @@ void wxFlexGridSizer::CreateArrays()
 
 void wxFlexGridSizer::RecalcSizes()
 {
 
 void wxFlexGridSizer::RecalcSizes()
 {

-    if (m_children.GetCount() == 0)
+    int nitems, nrows, ncols;
+    if ( (nitems = CalcRowsCols(nrows, ncols)) == 0 )

         return;
 
         return;
 

-    int nitems = m_children.GetCount();
-    int nrows = m_rows;
-    int ncols = m_cols;
-
-    if (ncols > 0)
-        nrows = (nitems + ncols-1) / ncols;
-    else
-        ncols = (nitems + nrows-1) / nrows;
-

     wxSize sz( GetSize() );
     wxSize minsz( CalcMin() );
     wxPoint pt( GetPosition() );
     int    delta;
     wxSize sz( GetSize() );
     wxSize minsz( CalcMin() );
     wxPoint pt( GetPosition() );
     int    delta;

-    size_t idx;
-
-    if ((m_growableRows.GetCount() > 0) && (sz.y > minsz.y))
+    size_t idx,num;
+    wxArrayInt temp;
+
+    // Transfer only those rows into temp which exist in the sizer
+    // ignoring the superflouus ones. This prevents a segfault when
+    // calling AddGrowableRow( 3 ) if the sizer only has 2 rows.
+    for (idx = 0; idx < m_growableRows.GetCount(); idx++)
+        if (m_growableRows[idx] < nrows)
+            temp.Add( m_growableRows[idx] );
+    num = temp.GetCount();
+
+    if ((num > 0) && (sz.y > minsz.y))

     {
     {

-        delta = (sz.y - minsz.y) / m_growableRows.GetCount();
-        for (idx = 0; idx < m_growableRows.GetCount(); idx++)
-            m_rowHeights[ m_growableRows[idx] ] += delta;
+        delta = (sz.y - minsz.y) / num;
+        for (idx = 0; idx < num; idx++)
+            m_rowHeights[ temp[idx] ] += delta;

     }
 
     }
 

-    if ((m_growableCols.GetCount() > 0) && (sz.x > minsz.x))
+    temp.Empty();
+    // See above
+    for (idx = 0; idx < m_growableCols.GetCount(); idx++)
+        if (m_growableCols[idx] < ncols)
+            temp.Add( m_growableCols[idx] );
+    num = temp.GetCount();
+
+    if ((num > 0) && (sz.x > minsz.x))

     {
     {

-        delta = (sz.x - minsz.x) / m_growableCols.GetCount();
-        for (idx = 0; idx < m_growableCols.GetCount(); idx++)
-            m_colWidths[ m_growableCols[idx] ] += delta;
+        delta = (sz.x - minsz.x) / num;
+        for (idx = 0; idx < num; idx++)
+            m_colWidths[ temp[idx] ] += delta;

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


@@ -879,31 +891,20 @@ void wxFlexGridSizer::RecalcSizes()
 
 wxSize wxFlexGridSizer::CalcMin()
 {
 
 wxSize wxFlexGridSizer::CalcMin()
 {

-    if (m_children.GetCount() == 0)
+    int nitems, nrows, ncols;
+    if ( (nitems = CalcRowsCols(nrows, ncols)) == 0 )

         return wxSize(10,10);
 
         return wxSize(10,10);
 

-    int nitems = m_children.GetCount();
-    int nrows = m_rows;
-    int ncols = m_cols;
-
-    if (ncols > 0)
-        nrows = (nitems + ncols-1) / ncols;
-    else
-        ncols = (nitems + nrows-1) / nrows;
-

     CreateArrays();
 
     CreateArrays();
 

-    int col;
-    int row;
-

     int i = 0;
     wxNode *node = m_children.First();
     while (node)
     {
         wxSizerItem *item = (wxSizerItem*)node->Data();
         wxSize sz( item->CalcMin() );
     int i = 0;
     wxNode *node = m_children.First();
     while (node)
     {
         wxSizerItem *item = (wxSizerItem*)node->Data();
         wxSize sz( item->CalcMin() );

-        row = i / ncols;
-        col = i % ncols;
+        int row = i / ncols;
+        int col = i % ncols;

         m_rowHeights[ row ] = wxMax( sz.y, m_rowHeights[ row ] );
         m_colWidths[ col ] = wxMax( sz.x, m_colWidths[ col ] );
 
         m_rowHeights[ row ] = wxMax( sz.y, m_rowHeights[ row ] );
         m_colWidths[ col ] = wxMax( sz.x, m_colWidths[ col ] );
 


@@ -912,11 +913,11 @@ wxSize wxFlexGridSizer::CalcMin()
     }
 
     int width = 0;
     }
 
     int width = 0;

-    for (col = 0; col < ncols; col++)
+    for (int col = 0; col < ncols; col++)

         width += m_colWidths[ col ];
 
     int height = 0;
         width += m_colWidths[ col ];
 
     int height = 0;

-    for (row = 0; row < nrows; row++)
+    for (int row = 0; row < nrows; row++)

         height += m_rowHeights[ row ];
 
     return wxSize( width +  (ncols-1) * m_hgap,
         height += m_rowHeights[ row ];
 
     return wxSize( width +  (ncols-1) * m_hgap,


@@ -1071,8 +1072,8 @@ wxSize wxBoxSizer::CalcMin()
         }
         node = node->Next();
     }
         }
         node = node->Next();
     }

-       // Calculate overall minimum size
-       node = m_children.GetFirst();
+    // Calculate overall minimum size
+    node = m_children.GetFirst();

     while (node)
     {
         wxSizerItem *item = (wxSizerItem*) node->Data();
     while (node)
     {
         wxSizerItem *item = (wxSizerItem*) node->Data();


@@ -1144,7 +1145,7 @@ static void GetStaticBoxBorders(wxStaticBox *box,
     else
 #endif // __WXGTK__
         *borderTop = 15;
     else
 #endif // __WXGTK__
         *borderTop = 15;

-       (void)box;
+    (void)box;

     *borderOther = 5;
 }
 
     *borderOther = 5;
 }