/////////////////////////////////////////////////////////////////////////////
-// 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
// Created: 1998-01-01
-// RCS-ID: $Id$
// Copyright: (c) Stefan Csomor
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#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)
{
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));
wxRadioBox::~wxRadioBox()
{
- m_isBeingDeleted = true;
+ SendDestroyEvent();
wxRadioButton *next, *current;
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;
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,
// 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;
}
// 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)
{
// 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)
{
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)((3 * eachHeight[i]) / 2);
+ eachWidth[i] = eachWidth[i] + RADIO_SIZE;
+ eachHeight[i] = wxMax( eachHeight[i], bestSizeRadio.y );
if (maxWidth < eachWidth[i])
maxWidth = eachWidth[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 ) ) ;
// 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;
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)
- y_offset += maxHeight ; // + charHeight / 2
+ y_offset += maxHeight + space;
else
x_offset += maxWidth + charWidth;
}
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)((3 * eachHeight) / 2);
+ eachWidth = (eachWidth + RADIO_SIZE);
+ eachHeight = wxMax(eachHeight, bestSizeRadio.y );
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;
+ // 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;
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
projects / wxWidgets.git / blobdiff