In wxComboCtrlBase::OnTextCtrlEvent(), make sure to call event.StopPropagation()...

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

diff --git a/src/osx/radiobox_osx.cpp b/src/osx/radiobox_osx.cpp
index 6ad4a138f9503895b6a90eab239ff5cec2a287a9..bc209286cb6f00a005c4ce8dd49a0df05d69ed30 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
 // Purpose:     wxRadioBox
 // Author:      Stefan Csomor
 // Modified by: JS Lair (99/11/15) first implementation


@@ -22,6 +22,10 @@
 
 #include "wx/osx/private.h"
 
 
 #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)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxRadioBox, wxControl)
 
 


@@ -52,7 +56,7 @@ wxRadioBox::wxRadioBox()
 
 wxRadioBox::~wxRadioBox()
 {
 
 wxRadioBox::~wxRadioBox()
 {

-    m_isBeingDeleted = true;
+    SendDestroyEvent();

 
     wxRadioButton *next, *current;
 
 
     wxRadioButton *next, *current;
 


@@ -93,15 +97,14 @@ bool wxRadioBox::Create( wxWindow *parent,
     int n, const wxString choices[],
     int majorDim, long style,
     const wxValidator& val, const wxString& name )
     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;
 
     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;
 
     m_noRowsOrCols = majorDim;
     m_radioButtonCycle = NULL;
 


@@ -109,9 +112,9 @@ bool wxRadioBox::Create( wxWindow *parent,
 
     m_labelOrig = m_label = label;
 
 
     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,
     {
         wxRadioButton *radBtn = new wxRadioButton(
             this,


@@ -126,7 +129,13 @@ bool wxRadioBox::Create( wxWindow *parent,
 //        m_radioButtonCycle = radBtn->AddInCycle( m_radioButtonCycle );
     }
 
 //        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 );
     SetSelection( 0 );

+    InvalidateBestSize();
+    SetInitialSize( size );

     MacPostControlCreate( pos, size );
 
     return true;
     MacPostControlCreate( pos, size );
 
     return true;


@@ -355,7 +364,12 @@ void wxRadioBox::SetFocus()
 
 // Simulates the effect of the user issuing a command to the item
 //
 
 // 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)
 {
 
 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;
 
     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] );
     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)((3 * eachHeight[i]) / 2);
+        eachWidth[i] = eachWidth[i] + RADIO_SIZE;
+        eachHeight[i] = wxMax( eachHeight[i], bestSizeRadio.y );

 
         if (maxWidth < eachWidth[i])
             maxWidth = eachWidth[i];
 
         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];
     }
 
             maxHeight = eachHeight[i];
     }
 

-    totHeight = GetRowCount() * maxHeight;
+    // 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 ) ) ;
     totWidth  = GetColumnCount() * (maxWidth + charWidth);
 
     wxSize sz = DoGetSizeFromClientSize( wxSize( totWidth, totHeight ) ) ;


@@ -434,8 +457,8 @@ void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
     // arrange radio buttons
     int x_start, y_start;
 
     // arrange radio buttons
     int x_start, y_start;
 

-    x_start = 0;
-    y_start = 0;
+    x_start = ( width - sz.x ) / 2;
+    y_start = ( height - sz.y ) / 2;

 
     x_offset = x_start;
     y_offset = y_start;
 
     x_offset = x_start;
     y_offset = y_start;


@@ -454,15 +477,15 @@ void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
             else
             {
                 x_offset = x_start;
             else
             {
                 x_offset = x_start;

-                y_offset += maxHeight ; //+ 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)
         current = current->NextInCycle();
 
         if (m_windowStyle & wxRA_SPECIFY_ROWS)

-            y_offset += maxHeight ; // + charHeight / 2
+            y_offset += maxHeight + space;

         else
             x_offset += maxWidth + charWidth;
     }
         else
             x_offset += maxWidth + charWidth;
     }


@@ -485,24 +508,37 @@ wxSize wxRadioBox::DoGetBestSize() const
     maxWidth = -1;
     maxHeight = -1;
 
     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 );
     for (unsigned int i = 0 ; i < m_noItems; i++)
     {
         GetTextExtent(GetString(i), &eachWidth, &eachHeight, NULL, NULL, &font );

-        eachWidth  = (int)(eachWidth + RADIO_SIZE);
-        eachHeight = (int)((3 * eachHeight) / 2);
+        eachWidth  = (eachWidth + RADIO_SIZE);
+        eachHeight = wxMax(eachHeight, bestSizeRadio.y );

         if (maxWidth < eachWidth)
             maxWidth = eachWidth;
         if (maxHeight < eachHeight)
             maxHeight = eachHeight;
     }
 
         if (maxWidth < eachWidth)
             maxWidth = eachWidth;
         if (maxHeight < eachHeight)
             maxHeight = eachHeight;
     }
 

-    totHeight = GetRowCount() * maxHeight;
+    // 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 ) );
     totWidth = sz.x;
     totHeight = sz.y;
 
     totWidth  = GetColumnCount() * (maxWidth + charWidth);
 
     wxSize sz = DoGetSizeFromClientSize( wxSize( totWidth, totHeight ) );
     totWidth = sz.x;
     totHeight = sz.y;
 

+    // optimum size is an additional 5 pt border to all sides
+    totWidth += 10;
+    totHeight += 10;
+

     // handle radio box title as well
     GetTextExtent( GetLabel(), &eachWidth, NULL );
     eachWidth  = (int)(eachWidth + RADIO_SIZE) +  3 * charWidth;
     // handle radio box title as well
     GetTextExtent( GetLabel(), &eachWidth, NULL );
     eachWidth  = (int)(eachWidth + RADIO_SIZE) +  3 * charWidth;


@@ -512,4 +548,15 @@ wxSize wxRadioBox::DoGetBestSize() const
     return wxSize( totWidth, totHeight );
 }
 
     return wxSize( totWidth, totHeight );
 }
 

+bool wxRadioBox::SetFont(const wxFont& font)
+{
+    bool retval = wxWindowBase::SetFont( font );
+
+    // dont' update the native control, it has its own small font
+
+    // should we iterate over the children ?
+
+    return retval;
+}
+

 #endif // wxUSE_RADIOBOX
 #endif // wxUSE_RADIOBOX