wxFLAGS_MEMBER(wxHSCROLL)
wxFLAGS_MEMBER(wxRA_SPECIFY_COLS)
- wxFLAGS_MEMBER(wxRA_HORIZONTAL)
wxFLAGS_MEMBER(wxRA_SPECIFY_ROWS)
- wxFLAGS_MEMBER(wxRA_VERTICAL)
-
wxEND_FLAGS( wxRadioBoxStyle )
IMPLEMENT_DYNAMIC_CLASS_XTI(wxRadioBox, wxControl,"wx/radiobox.h")
{
m_selectedButton = wxNOT_FOUND;
m_radioButtons = NULL;
+ m_dummyHwnd = NULL;
m_radioWidth = NULL;
m_radioHeight = NULL;
}
if ( !wxStaticBox::Create(parent, id, title, pos, size, style, name) )
return false;
+ // the code elsewhere in this file supposes that either wxRA_SPECIFY_COLS
+ // or wxRA_SPECIFY_ROWS is set, ensure that this is indeed the case
+ if ( !(style & (wxRA_SPECIFY_ROWS | wxRA_SPECIFY_COLS)) )
+ style |= wxRA_SPECIFY_COLS;
+
#if wxUSE_VALIDATORS
SetValidator(val);
#else
wxUnusedVar(val);
#endif // wxUSE_VALIDATORS/!wxUSE_VALIDATORS
+ // We need an extra one to keep track of the 'dummy' item we
+ // create to end the radio group, so it will be destroyed and
+ // it's id will be released. But we want it separate from the
+ // other buttons since the wxSubwindows will operate on it as
+ // well and we just want to ignore it until destroying it.
+ // For instance, we don't want the bounding box of the radio
+ // buttons to include the dummy button
m_radioButtons = new wxSubwindows(n);
+
m_radioWidth = new int[n];
m_radioHeight = new int[n];
if ( i == 0 )
styleBtn |= WS_GROUP;
- long newId = NewControlId();
+ wxWindowIDRef subid = NewControlId();
- HWND hwndBtn = ::CreateWindow(_T("BUTTON"),
- choices[i],
+ HWND hwndBtn = ::CreateWindow(wxT("BUTTON"),
+ choices[i].wx_str(),
styleBtn,
0, 0, 0, 0, // will be set in SetSize()
GetHwndOf(parent),
- (HMENU)newId,
+ (HMENU)wxUIntToPtr(subid.GetValue()),
wxGetInstance(),
NULL);
return false;
}
- (*m_radioButtons)[i] = hwndBtn;
+ // Keep track of the subwindow
+ m_radioButtons->Set(i, hwndBtn, subid);
SubclassRadioButton((WXHWND)hwndBtn);
- m_subControls.Add(newId);
+ // Also, make it a subcontrol of this control
+ m_subControls.Add(subid);
}
// Create a dummy radio control to end the group.
- (void)::CreateWindow(_T("BUTTON"),
+ m_dummyId = NewControlId();
+
+ m_dummyHwnd = (WXHWND)::CreateWindow(wxT("BUTTON"),
wxEmptyString,
WS_GROUP | BS_AUTORADIOBUTTON | WS_CHILD,
0, 0, 0, 0, GetHwndOf(parent),
- (HMENU)NewControlId(), wxGetInstance(), NULL);
+ (HMENU)wxUIntToPtr(m_dummyId.GetValue()),
+ wxGetInstance(), NULL);
+
m_radioButtons->SetFont(GetFont());
wxRadioBox::~wxRadioBox()
{
- m_isBeingDeleted = true;
+ SendDestroyEvent();
delete m_radioButtons;
+ if ( m_dummyHwnd )
+ DestroyWindow((HWND)m_dummyHwnd);
delete[] m_radioWidth;
delete[] m_radioHeight;
}
// events generation
// ----------------------------------------------------------------------------
-bool wxRadioBox::MSWCommand(WXUINT cmd, WXWORD id)
+bool wxRadioBox::MSWCommand(WXUINT cmd, WXWORD id_)
{
+ const int id = (signed short)id_;
+
if ( cmd == BN_CLICKED )
{
if (id == GetId())
const unsigned int count = GetCount();
for ( unsigned int i = 0; i < count; i++ )
{
- if ( id == wxGetWindowId((*m_radioButtons)[i]) )
+ const HWND hwndBtn = (*m_radioButtons)[i];
+ if ( id == wxGetWindowId(hwndBtn) )
{
- selectedButton = i;
+ // we can get BN_CLICKED for a button which just became focused
+ // but it may not be checked, in which case we shouldn't
+ // generate a radiobox selection changed event for it
+ if ( ::SendMessage(hwndBtn, BM_GETCHECK, 0, 0) == BST_CHECKED )
+ selectedButton = i;
break;
}
if ( tooltip != NULL )
tooltip->Add(hwndRbtn);
else // unset the tooltip
- wxToolTip::Remove(hwndRbtn);
+ wxToolTip::Remove(hwndRbtn, 0, wxRect(0,0,0,0));
+ // the second parameter can be zero since it's ignored by Remove()
+ // as we pass a rect for which wxRect::IsEmpty()==true...
}
#endif // wxUSE_TOOLTIPS
+bool wxRadioBox::Reparent(wxWindowBase *newParent)
+{
+ if ( !wxStaticBox::Reparent(newParent) )
+ {
+ return false;
+ }
+
+ HWND hwndParent = GetHwndOf(GetParent());
+ for ( size_t item = 0; item < m_radioButtons->GetCount(); item++ )
+ {
+ ::SetParent((*m_radioButtons)[item], hwndParent);
+ }
+#ifdef __WXWINCE__
+ // put static box under the buttons in the Z-order
+ SetWindowPos(GetHwnd(), HWND_BOTTOM, 0, 0, 0, 0, SWP_NOMOVE|SWP_NOSIZE);
+#endif
+ return true;
+}
+
WX_FORWARD_STD_METHODS_TO_SUBWINDOWS(wxRadioBox, wxStaticBox, m_radioButtons)
// ----------------------------------------------------------------------------
return best;
}
-// Restored old code.
void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
{
- int currentX, currentY;
- GetPosition(¤tX, ¤tY);
- int widthOld, heightOld;
- GetSize(&widthOld, &heightOld);
+ if ( (width == wxDefaultCoord && (sizeFlags & wxSIZE_AUTO_WIDTH)) ||
+ (height == wxDefaultCoord && (sizeFlags & wxSIZE_AUTO_HEIGHT)) )
+ {
+ // Attempt to have a look coherent with other platforms: We compute the
+ // biggest toggle dim, then we align all items according this value.
+ const wxSize totSize = GetTotalButtonSize(GetMaxButtonSize());
- int xx = x;
- int yy = y;
+ // only change our width/height if asked for
+ if ( width == wxDefaultCoord && (sizeFlags & wxSIZE_AUTO_WIDTH) )
+ width = totSize.x;
- if (x == wxDefaultCoord && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
- xx = currentX;
- if (y == wxDefaultCoord && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
- yy = currentY;
+ if ( height == wxDefaultCoord && (sizeFlags & wxSIZE_AUTO_HEIGHT) )
+ height = totSize.y;
+ }
- int y_offset = yy;
- int x_offset = xx;
+ wxStaticBox::DoSetSize(x, y, width, height);
+}
- int cx1, cy1;
- wxGetCharSize(m_hWnd, &cx1, &cy1, GetFont());
+void wxRadioBox::DoMoveWindow(int x, int y, int width, int height)
+{
+ wxStaticBox::DoMoveWindow(x, y, width, height);
- // Attempt to have a look coherent with other platforms: We compute the
- // biggest toggle dim, then we align all items according this value.
wxSize maxSize = GetMaxButtonSize();
int maxWidth = maxSize.x,
maxHeight = maxSize.y;
- wxSize totSize = GetTotalButtonSize(maxSize);
- int totWidth = totSize.x,
- totHeight = totSize.y;
-
- // only change our width/height if asked for
- if ( width == wxDefaultCoord )
- {
- if ( sizeFlags & wxSIZE_AUTO_WIDTH )
- width = totWidth;
- else
- width = widthOld;
- }
-
- if ( height == wxDefaultCoord )
- {
- if ( sizeFlags & wxSIZE_AUTO_HEIGHT )
- height = totHeight;
- else
- height = heightOld;
- }
-
- DoMoveWindow(xx, yy, width, height);
-
// Now position all the buttons: the current button will be put at
// wxPoint(x_offset, y_offset) and the new row/column will start at
// startX/startY. The size of all buttons will be the same wxSize(maxWidth,
// wxRA_SPECIFY_ROWS means that the buttons are arranged top to bottom and
// GetMajorDim() is the number of rows.
- x_offset += cx1;
- y_offset += cy1;
+ int cx1, cy1;
+ wxGetCharSize(m_hWnd, &cx1, &cy1, GetFont());
+
+ int x_offset = x + cx1;
+ int y_offset = y + cy1;
// Add extra space under the label, if it exists.
if (!wxControl::GetLabel().empty())
projects / wxWidgets.git / blobdiff