Use the best instead of current page size in OS X preferences dialog.

[wxWidgets.git] / src / osx / radiobox_osx.cpp

diff --git a/src/osx/radiobox_osx.cpp b/src/osx/radiobox_osx.cpp
index 4ba2abf0193eb5d43041369849709ccf4d25e9f1..e4ebe931bedc3ebbbc7c5515febec3231dfa5a83 100644 (file)
--- a/src/osx/radiobox_osx.cpp
+++ b/src/osx/radiobox_osx.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        src/osx/radiobox.cpp
+// Name:        src/osx/radiobox_osx.cpp
 // Purpose:     wxRadioBox
 // Author:      Stefan Csomor
 // Modified by: JS Lair (99/11/15) first implementation
@@ -22,6 +22,10 @@
 
 #include "wx/osx/private.h"
 
+// regarding layout: note that there are differences in inter-control
+// spacing between InterfaceBuild and the Human Interface Guidelines, we stick
+// to the latter, as those are also used eg in the System Preferences Dialogs
+
 IMPLEMENT_DYNAMIC_CLASS(wxRadioBox, wxControl)
 
 
@@ -34,7 +38,7 @@ void wxRadioBox::OnRadioButton( wxCommandEvent &outer )
 {
     if ( outer.IsChecked() )
     {
-        wxCommandEvent event( wxEVT_COMMAND_RADIOBOX_SELECTED, m_windowId );
+        wxCommandEvent event( wxEVT_RADIOBOX, m_windowId );
         int i = GetSelection() ;
         event.SetInt(i);
         event.SetString(GetString(i));
@@ -93,15 +97,14 @@ bool wxRadioBox::Create( wxWindow *parent,
     int n, const wxString choices[],
     int majorDim, long style,
     const wxValidator& val, const wxString& name )
-{
-    m_macIsUserPane = false ;
-
+{    
+    DontCreatePeer();
+    
     if ( !wxControl::Create( parent, id, pos, size, style, val, name ) )
         return false;
 
-    int i;
-
-    m_noItems = (unsigned int)n;
+    // during construction we must keep this at 0, otherwise GetBestSize fails
+    m_noItems = 0;
     m_noRowsOrCols = majorDim;
     m_radioButtonCycle = NULL;
 
@@ -109,9 +112,9 @@ bool wxRadioBox::Create( wxWindow *parent,
 
     m_labelOrig = m_label = label;
 
-    m_peer = wxWidgetImpl::CreateGroupBox( this, parent, id, label, pos, size, style, GetExtraStyle() );
+    SetPeer(wxWidgetImpl::CreateGroupBox( this, parent, id, label, pos, size, style, GetExtraStyle() ));
 
-    for (i = 0; i < n; i++)
+    for (int i = 0; i < n; i++)
     {
         wxRadioButton *radBtn = new wxRadioButton(
             this,
@@ -126,7 +129,13 @@ bool wxRadioBox::Create( wxWindow *parent,
 //        m_radioButtonCycle = radBtn->AddInCycle( m_radioButtonCycle );
     }
 
+    // as all radiobuttons have been set-up, set the correct dimensions
+    m_noItems = (unsigned int)n;
+    SetMajorDim( majorDim == 0 ? n : majorDim, style );
+
     SetSelection( 0 );
+    InvalidateBestSize();
+    SetInitialSize( size );
     MacPostControlCreate( pos, size );
 
     return true;
@@ -256,7 +265,7 @@ void wxRadioBox::SetString(unsigned int item,const wxString& label)
 }
 
 // Sets a button by passing the desired position. This does not cause
-// wxEVT_COMMAND_RADIOBOX_SELECTED event to get emitted
+// wxEVT_RADIOBOX event to get emitted
 //
 void wxRadioBox::SetSelection(int item)
 {
@@ -355,7 +364,12 @@ void wxRadioBox::SetFocus()
 
 // Simulates the effect of the user issuing a command to the item
 //
-#define RADIO_SIZE 20
+#if wxOSX_USE_CARBON
+    #define RADIO_SIZE 20
+#else
+    // Cocoa has an additional border are of about 3 pixels
+    #define RADIO_SIZE 23
+#endif
 
 void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
 {
@@ -395,11 +409,15 @@ void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
 
     maxWidth = -1;
     maxHeight = -1;
+    wxSize bestSizeRadio ;
+    if ( m_radioButtonCycle )
+        bestSizeRadio = m_radioButtonCycle->GetBestSize();
+
     for (unsigned int i = 0 ; i < m_noItems; i++)
     {
         GetTextExtent(GetString(i), &eachWidth[i], &eachHeight[i] );
-        eachWidth[i] = (int)(eachWidth[i] + RADIO_SIZE);
-        eachHeight[i] = (int) eachHeight[i];
+        eachWidth[i] = eachWidth[i] + RADIO_SIZE;
+        eachHeight[i] = wxMax( eachHeight[i], bestSizeRadio.y );
 
         if (maxWidth < eachWidth[i])
             maxWidth = eachWidth[i];
@@ -407,7 +425,12 @@ void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
             maxHeight = eachHeight[i];
     }
 
-    totHeight = GetRowCount() * maxHeight + (GetRowCount() - 1) * maxHeight / 2;
+    // according to HIG (official space - 3 Pixels Diff between Frame and Layout size)
+    int space = 3;
+    if ( GetWindowVariant() == wxWINDOW_VARIANT_MINI )
+        space = 2;
+
+    totHeight = GetRowCount() * maxHeight + (GetRowCount() - 1) * space;
     totWidth  = GetColumnCount() * (maxWidth + charWidth);
 
     wxSize sz = DoGetSizeFromClientSize( wxSize( totWidth, totHeight ) ) ;
@@ -454,15 +477,15 @@ void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
             else
             {
                 x_offset = x_start;
-                y_offset += 3 * maxHeight / 2 ; //+ charHeight / 2
+                y_offset += maxHeight + space;
             }
         }
 
-        current->SetSize( x_offset, y_offset, eachWidth[i], eachHeight[i]);
+        current->SetSize( x_offset, y_offset, eachWidth[i], eachHeight[i] );
         current = current->NextInCycle();
 
         if (m_windowStyle & wxRA_SPECIFY_ROWS)
-            y_offset += 3 * maxHeight / 2 ; // + charHeight / 2
+            y_offset += maxHeight + space;
         else
             x_offset += maxWidth + charWidth;
     }
@@ -485,18 +508,27 @@ wxSize wxRadioBox::DoGetBestSize() const
     maxWidth = -1;
     maxHeight = -1;
 
+    wxSize bestSizeRadio ;
+    if ( m_radioButtonCycle )
+        bestSizeRadio = m_radioButtonCycle->GetBestSize();
+
     for (unsigned int i = 0 ; i < m_noItems; i++)
     {
         GetTextExtent(GetString(i), &eachWidth, &eachHeight, NULL, NULL, &font );
-        eachWidth  = (int)(eachWidth + RADIO_SIZE);
-        eachHeight = (int)eachHeight;
+        eachWidth  = (eachWidth + RADIO_SIZE);
+        eachHeight = wxMax(eachHeight, bestSizeRadio.y );
         if (maxWidth < eachWidth)
             maxWidth = eachWidth;
         if (maxHeight < eachHeight)
             maxHeight = eachHeight;
     }
 
-    totHeight = GetRowCount() * maxHeight + (GetRowCount() - 1) * maxHeight / 2;
+    // according to HIG (official space - 3 Pixels Diff between Frame and Layout size)
+    int space = 3;
+    if ( GetWindowVariant() == wxWINDOW_VARIANT_MINI )
+        space = 2;
+
+    totHeight = GetRowCount() * maxHeight + (GetRowCount() - 1) * space;
     totWidth  = GetColumnCount() * (maxWidth + charWidth);
 
     wxSize sz = DoGetSizeFromClientSize( wxSize( totWidth, totHeight ) );
@@ -522,6 +554,8 @@ bool wxRadioBox::SetFont(const wxFont& font)
 
     // dont' update the native control, it has its own small font
 
+    // should we iterate over the children ?
+
     return retval;
 }