// Modified by:
// Created: 11.09.00
// RCS-ID: $Id$
-// Copyright: (c) 2000 Vadim Zeitlin
-// Licence: wxWindows license
+// Copyright: (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// ============================================================================
// headers
// ----------------------------------------------------------------------------
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "univradiobox.h"
#endif
#include "wx/radiobox.h"
#include "wx/radiobut.h"
#include "wx/validate.h"
+ #include "wx/arrstr.h"
#endif
+#include "wx/tooltip.h"
+
#include "wx/univ/theme.h"
#include "wx/univ/renderer.h"
#include "wx/univ/inphand.h"
{
if ( m_radio->OnKeyDown((wxKeyEvent &)event) )
{
- return TRUE;
+ return true;
}
}
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,
wxWindowID id,
const wxString& title,
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);
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()
size_t count = m_buttons.GetCount();
for ( size_t n = 0; n < count; n++ )
{
- m_buttons[n]->PopEventHandler(TRUE /* delete it */);
+ m_buttons[n]->PopEventHandler(true /* delete it */);
delete m_buttons[n];
}
{
// 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
wxString wxRadioBox::GetString(int n) const
{
- wxCHECK_MSG( IsValid(n), _T(""),
+ wxCHECK_MSG( IsValid(n), wxEmptyString,
_T("invalid index in wxRadioBox::GetString") );
return m_buttons[n]->GetLabel();
m_buttons[n]->SetLabel(label);
}
-void wxRadioBox::Enable(int n, bool enable)
+bool wxRadioBox::Enable(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::Show(int n, bool show)
{
- wxCHECK_RET( IsValid(n), _T("invalid index in wxRadioBox::Show") );
+ wxCHECK_MSG( IsValid(n), false, _T("invalid index in wxRadioBox::Show") );
- m_buttons[n]->Show(show);
+ return m_buttons[n]->Show(show);
}
// ----------------------------------------------------------------------------
bool wxRadioBox::Enable(bool enable)
{
- return wxStaticBox::Enable(enable);
+ if ( !wxStaticBox::Enable(enable) )
+ return false;
+
+ // also enable/disable the buttons
+ size_t count = m_buttons.GetCount();
+ for ( size_t n = 0; n < count; n++ )
+ {
+ Enable(n, enable);
+ }
+
+ return true;
}
bool wxRadioBox::Show(bool show)
{
- return wxStaticBox::Show(show);
+ if ( !wxStaticBox::Show(show) )
+ return false;
+
+ // also show/hide the buttons
+ size_t count = m_buttons.GetCount();
+ for ( size_t n = 0; n < count; n++ )
+ {
+ Show(n, show);
+ }
+
+ return true;
}
wxString wxRadioBox::GetLabel() const
wxStaticBox::SetLabel(label);
}
+#if wxUSE_TOOLTIPS
+void wxRadioBox::DoSetToolTip(wxToolTip *tooltip)
+{
+ wxControl::DoSetToolTip(tooltip);
+
+ // Also set them for all Radio Buttons
+ size_t count = m_buttons.GetCount();
+ for ( size_t n = 0; n < count; n++ )
+ {
+ if (tooltip)
+ m_buttons[n]->SetToolTip(tooltip->GetTip());
+ else
+ m_buttons[n]->SetToolTip(NULL);
+ }
+}
+#endif // wxUSE_TOOLTIPS
+
// ----------------------------------------------------------------------------
// buttons positioning
// ----------------------------------------------------------------------------
wxSize sizeBtn = GetMaxButtonSize();
wxPoint ptOrigin = GetBoxAreaOrigin();
+ wxPoint clientOrigin = GetParent() ? GetParent()->GetClientAreaOrigin() : wxPoint(0,0);
- x0 += ptOrigin.x + BOX_BORDER_X;
- y0 += ptOrigin.y + BOX_BORDER_Y;
+ x0 += ptOrigin.x + BOX_BORDER_X - clientOrigin.x;
+ y0 += ptOrigin.y + BOX_BORDER_Y - clientOrigin.y;
int x = x0,
y = y0;
break;
default:
- return FALSE;
+ return false;
}
int selOld = GetSelection();
SendRadioEvent();
}
- return TRUE;
+ return true;
}
#endif // wxUSE_RADIOBOX
projects / wxWidgets.git / blobdiff