/////////////////////////////////////////////////////////////////////////////
-// Name: univ/radiobox.cpp
+// Name: src/univ/radiobox.cpp
// Purpose: wxRadioBox implementation
// Author: Vadim Zeitlin
// Modified by:
// headers
// ----------------------------------------------------------------------------
-#ifdef __GNUG__
- #pragma implementation "univradiobox.h"
-#endif
-
#include "wx/wxprec.h"
#ifdef __BORLANDC__
#include "wx/radiobox.h"
#include "wx/radiobut.h"
#include "wx/validate.h"
+ #include "wx/arrstr.h"
#endif
#include "wx/tooltip.h"
{
if ( m_radio->OnKeyDown((wxKeyEvent &)event) )
{
- return TRUE;
+ return true;
}
}
void wxRadioBox::Init()
{
m_selection = -1;
- m_majorDim = 0;
+}
+
+wxRadioBox::wxRadioBox(wxWindow *parent, wxWindowID id, const wxString& title,
+ const wxPoint& pos, const wxSize& size,
+ const wxArrayString& choices,
+ int majorDim, long style,
+ const wxValidator& val, const wxString& name)
+{
+ wxCArrayString chs(choices);
+
+ Init();
+
+ (void)Create(parent, id, title, pos, size, chs.GetCount(),
+ chs.GetStrings(), majorDim, style, val, name);
+}
+
+bool wxRadioBox::Create(wxWindow *parent,
+ wxWindowID id,
+ const wxString& title,
+ const wxPoint& pos,
+ const wxSize& size,
+ const wxArrayString& choices,
+ int majorDim,
+ long style,
+ const wxValidator& val,
+ const wxString& name)
+{
+ wxCArrayString chs(choices);
+
+ return Create(parent, id, title, pos, size, chs.GetCount(),
+ chs.GetStrings(), majorDim, style, val, name);
}
bool wxRadioBox::Create(wxWindow *parent,
const wxString *choices,
int majorDim,
long style,
- const wxValidator& val,
+ const wxValidator& wxVALIDATOR_PARAM(val),
const wxString& name)
{
// for compatibility with the other ports which don't handle (yet?)
}
if ( !wxStaticBox::Create(parent, id, title, pos, size, style, name) )
- return FALSE;
+ return false;
#if wxUSE_VALIDATORS
SetValidator(val);
Append(n, choices);
// majorDim default value is 0 which means make one row/column
- SetMajorDim(majorDim == 0 ? n : majorDim);
+ SetMajorDim(majorDim == 0 ? n : majorDim, style);
if ( size == wxDefaultSize )
{
SetClientSize(DoGetBestClientSize());
}
+ // Need to move the radiobox in order to move the radio buttons
+ wxPoint actualPos = GetPosition();
+ wxSize actualSize = GetSize();
+ DoMoveWindow(actualPos.x, actualPos.y, actualSize.x, actualSize.y);
+
// radiobox should already have selection so select at least one item
SetSelection(0);
- return TRUE;
+ return true;
}
wxRadioBox::~wxRadioBox()
// the buttons themselves: this must be done as the user code expects them
// to disappear now and not some time later when they will be deleted by
// our (common) parent
- size_t count = m_buttons.GetCount();
- for ( size_t n = 0; n < count; n++ )
+ unsigned int count = m_buttons.GetCount();
+ for ( unsigned int n = 0; n < count; n++ )
{
- m_buttons[n]->PopEventHandler(TRUE /* delete it */);
+ m_buttons[n]->PopEventHandler(true /* delete it */);
delete m_buttons[n];
}
// wxRadioBox init
// ----------------------------------------------------------------------------
-void wxRadioBox::SetMajorDim(int majorDim)
-{
- wxCHECK_RET( majorDim != 0, _T("major radiobox dimension can't be 0") );
-
- m_majorDim = majorDim;
-
- int minorDim = (GetCount() + m_majorDim - 1) / m_majorDim;
-
- if ( GetWindowStyle() & wxRA_SPECIFY_COLS )
- {
- m_numCols = majorDim;
- m_numRows = minorDim;
- }
- else // wxRA_SPECIFY_ROWS
- {
- m_numCols = minorDim;
- m_numRows = majorDim;
- }
-}
-
void wxRadioBox::Append(int count, const wxString *choices)
{
if ( !count )
{
// make the first button in the box the start of new group by giving it
// wxRB_GROUP style
- wxRadioButton *btn = new wxRadioButton(parent, -1, choices[n],
+ wxRadioButton *btn = new wxRadioButton(parent, wxID_ANY, choices[n],
wxDefaultPosition,
wxDefaultSize,
n == 0 ? wxRB_GROUP : 0);
btn->SetFocus();
// this will also unselect the previously selected button in our group
- btn->SetValue(TRUE);
+ btn->SetValue(true);
}
int wxRadioBox::GetSelection() const
// methods forwarded to the buttons
// ----------------------------------------------------------------------------
-wxString wxRadioBox::GetString(int n) const
+wxString wxRadioBox::GetString(unsigned int n) const
{
- wxCHECK_MSG( IsValid(n), _T(""),
+ wxCHECK_MSG( IsValid(n), wxEmptyString,
_T("invalid index in wxRadioBox::GetString") );
return m_buttons[n]->GetLabel();
}
-void wxRadioBox::SetString(int n, const wxString& label)
+void wxRadioBox::SetString(unsigned int n, const wxString& label)
{
wxCHECK_RET( IsValid(n), _T("invalid index in wxRadioBox::SetString") );
m_buttons[n]->SetLabel(label);
}
-void wxRadioBox::Enable(int n, bool enable)
+bool wxRadioBox::Enable(unsigned int n, bool enable)
{
- wxCHECK_RET( IsValid(n), _T("invalid index in wxRadioBox::Enable") );
+ wxCHECK_MSG( IsValid(n), false, _T("invalid index in wxRadioBox::Enable") );
- m_buttons[n]->Enable(enable);
+ return m_buttons[n]->Enable(enable);
}
-void wxRadioBox::Show(int n, bool show)
+bool wxRadioBox::IsItemEnabled(unsigned int n) const
{
- wxCHECK_RET( IsValid(n), _T("invalid index in wxRadioBox::Show") );
+ wxCHECK_MSG( IsValid(n), false, _T("invalid index in wxRadioBox::IsItemEnabled") );
- m_buttons[n]->Show(show);
+ return m_buttons[n]->IsEnabled();
+}
+
+bool wxRadioBox::Show(unsigned int n, bool show)
+{
+ wxCHECK_MSG( IsValid(n), false, _T("invalid index in wxRadioBox::Show") );
+
+ return m_buttons[n]->Show(show);
+}
+
+bool wxRadioBox::IsItemShown(unsigned int n) const
+{
+ wxCHECK_MSG( IsValid(n), false, _T("invalid index in wxRadioBox::IsItemShown") );
+
+ return m_buttons[n]->IsShown();
}
// ----------------------------------------------------------------------------
bool wxRadioBox::Enable(bool enable)
{
if ( !wxStaticBox::Enable(enable) )
- return FALSE;
+ return false;
// also enable/disable the buttons
- size_t count = m_buttons.GetCount();
- for ( size_t n = 0; n < count; n++ )
+ const unsigned int count = m_buttons.GetCount();
+ for ( unsigned int n = 0; n < count; n++ )
{
Enable(n, enable);
}
- return TRUE;
+ return true;
}
bool wxRadioBox::Show(bool show)
{
if ( !wxStaticBox::Show(show) )
- return FALSE;
+ return false;
// also show/hide the buttons
- size_t count = m_buttons.GetCount();
- for ( size_t n = 0; n < count; n++ )
+ const unsigned int count = m_buttons.GetCount();
+ for ( unsigned int n = 0; n < count; n++ )
{
Show(n, show);
}
- return TRUE;
+ return true;
}
wxString wxRadioBox::GetLabel() const
wxControl::DoSetToolTip(tooltip);
// Also set them for all Radio Buttons
- size_t count = m_buttons.GetCount();
- for ( size_t n = 0; n < count; n++ )
+ const unsigned int count = m_buttons.GetCount();
+ for ( unsigned int n = 0; n < count; n++ )
{
if (tooltip)
m_buttons[n]->SetToolTip(tooltip->GetTip());
wxSize wxRadioBox::GetMaxButtonSize() const
{
- int widthMax, heightMax, width, height;
+ int widthMax, heightMax, width = 0, height = 0;
widthMax = heightMax = 0;
- int count = GetCount();
- for ( int n = 0; n < count; n++ )
+ const unsigned int count = GetCount();
+ for ( unsigned int n = 0; n < count; n++ )
{
m_buttons[n]->GetBestSize(&width, &height);
{
wxSize sizeBtn = GetMaxButtonSize();
- sizeBtn.x *= m_numCols;
- sizeBtn.y *= m_numRows;
+ sizeBtn.x *= GetColumnCount();
+ sizeBtn.y *= GetRowCount();
// add a border around all buttons
sizeBtn.x += 2*BOX_BORDER_X;
int x = x0,
y = y0;
- int count = GetCount();
- for ( int n = 0; n < count; n++ )
+ const unsigned int count = GetCount();
+ for ( unsigned int n = 0; n < count; n++ )
{
m_buttons[n]->SetSize(x, y, sizeBtn.x, sizeBtn.y);
if ( GetWindowStyle() & wxRA_TOPTOBOTTOM )
{
// from top to bottom
- if ( (n + 1) % m_numRows )
+ if ( (n + 1) % GetRowCount() )
{
// continue in this column
y += sizeBtn.y;
else // wxRA_LEFTTORIGHT: mirror the code above
{
// from left to right
- if ( (n + 1) % m_numCols )
+ if ( (n + 1) % GetColumnCount() )
{
// continue in this row
x += sizeBtn.x;
break;
default:
- return FALSE;
+ return false;
}
int selOld = GetSelection();
SendRadioEvent();
}
- return TRUE;
+ return true;
}
#endif // wxUSE_RADIOBOX
-
projects / wxWidgets.git / blobdiff