X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/aca78774b6aa0ab27dead3b4b88c0d8e40e5667a..b8d5be011d6d7e9aaf493eb8f5e21960d22b2a8f:/src/msw/radiobut.cpp?ds=sidebyside diff --git a/src/msw/radiobut.cpp b/src/msw/radiobut.cpp index f038fd099a..1919617648 100644 --- a/src/msw/radiobut.cpp +++ b/src/msw/radiobut.cpp @@ -5,8 +5,8 @@ // Modified by: // Created: 04/01/98 // RCS-ID: $Id$ -// Copyright: (c) Julian Smart and Markus Holzem -// Licence: wxWindows license +// Copyright: (c) Julian Smart +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// // ============================================================================ @@ -17,7 +17,7 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "radiobut.h" #endif @@ -47,7 +47,26 @@ // wxRadioButton creation // ---------------------------------------------------------------------------- + +#if wxUSE_EXTENDED_RTTI +IMPLEMENT_DYNAMIC_CLASS_XTI(wxRadioButton, wxControl,"wx/radiobut.h") + +WX_BEGIN_PROPERTIES_TABLE(wxRadioButton) + WX_DELEGATE( OnClick , wxEVT_COMMAND_RADIOBUTTON_SELECTED , wxCommandEvent ) + WX_PROPERTY( Font , wxFont , SetFont , GetWindowFont , ) + WX_PROPERTY( Label,wxString, SetLabel, GetLabel, wxT("") ) + WX_PROPERTY( Value ,bool, SetValue, GetValue, ) +WX_END_PROPERTIES_TABLE() + +WX_BEGIN_HANDLERS_TABLE(wxRadioButton) +WX_END_HANDLERS_TABLE() + +WX_CONSTRUCTOR_6( wxRadioButton , wxWindow* , Parent , wxWindowID , Id , wxString , Label , wxPoint , Position , wxSize , Size , long , WindowStyle ) + +#else IMPLEMENT_DYNAMIC_CLASS(wxRadioButton, wxControl) +#endif + void wxRadioButton::Init() { @@ -66,9 +85,22 @@ bool wxRadioButton::Create(wxWindow *parent, if ( !CreateControl(parent, id, pos, size, style, validator, name) ) return FALSE; - long msStyle = HasFlag(wxRB_GROUP) ? WS_GROUP : 0; + long msStyle = WS_TABSTOP; + if ( HasFlag(wxRB_GROUP) ) + msStyle |= WS_GROUP; + + /* + wxRB_SINGLE is a temporary workaround for the following problem: if you + have 2 radiobuttons in the same group but which are not consecutive in + the dialog, Windows can enter an infinite loop! The simplest way to + reproduce it is to create radio button, then a panel and then another + radio button: then checking the last button hangs the app. - msStyle |= BS_AUTORADIOBUTTON; + Ideally, we'd detect (and avoid) such situation automatically but for + now, as I don't know how to do it, just allow the user to create + BS_RADIOBUTTON buttons for such situations. + */ + msStyle |= HasFlag(wxRB_SINGLE) ? BS_RADIOBUTTON : BS_AUTORADIOBUTTON; if ( HasFlag(wxCLIP_SIBLINGS) ) msStyle |= WS_CLIPSIBLINGS; @@ -93,8 +125,62 @@ bool wxRadioButton::Create(wxWindow *parent, void wxRadioButton::SetValue(bool value) { // BST_CHECKED is defined as 1, BST_UNCHECKED as 0, so we can just pass - // value as is (we don't sue BST_XXX here as they're not defined for Win16) + // value as is (we don't use BST_XXX here as they're not defined for Win16) (void)::SendMessage(GetHwnd(), BM_SETCHECK, (WPARAM)value, 0L); + + // if we set the value of one radio button we also must clear all the other + // buttons in the same group: Windows doesn't do it automatically + if ( value ) + { + const wxWindowList& siblings = GetParent()->GetChildren(); + wxWindowList::compatibility_iterator nodeThis = siblings.Find(this); + wxCHECK_RET( nodeThis, _T("radio button not a child of its parent?") ); + + // if it's not the first item of the group ... + if ( !HasFlag(wxRB_GROUP) ) + { + // ... turn off all radio buttons before it + for ( wxWindowList::compatibility_iterator nodeBefore = nodeThis->GetPrevious(); + nodeBefore; + nodeBefore = nodeBefore->GetPrevious() ) + { + wxRadioButton *btn = wxDynamicCast(nodeBefore->GetData(), + wxRadioButton); + if ( !btn ) + { + // the radio buttons in a group must be consecutive, so + // there are no more of them + break; + } + + btn->SetValue(FALSE); + + if ( btn->HasFlag(wxRB_GROUP) ) + { + // even if there are other radio buttons before this one, + // they're not in the same group with us + break; + } + } + } + + // ... and also turn off all buttons after this one + for ( wxWindowList::compatibility_iterator nodeAfter = nodeThis->GetNext(); + nodeAfter; + nodeAfter = nodeAfter->GetNext() ) + { + wxRadioButton *btn = wxDynamicCast(nodeAfter->GetData(), + wxRadioButton); + + if ( !btn || btn->HasFlag(wxRB_GROUP) ) + { + // no more buttons or the first button of the next group + break; + } + + btn->SetValue(FALSE); + } + } } bool wxRadioButton::GetValue() const @@ -123,7 +209,7 @@ void wxRadioButton::SetFocus() // generates BN_CLICKED which leads to showing another dialog and so on // without end! // - // to aviod this, we drop the pseudo BN_CLICKED events generated when the + // to avoid this, we drop the pseudo BN_CLICKED events generated when the // button gains focus m_focusJustSet = TRUE; @@ -142,9 +228,20 @@ bool wxRadioButton::MSWCommand(WXUINT param, WXWORD WXUNUSED(id)) } else // a real clicked event { + bool isChecked = GetValue(); + + if ( HasFlag(wxRB_SINGLE) ) + { + // when we use a "manual" radio button, we have to check the button + // ourselves -- but it's reset to unchecked state by the user code + // (presumably when another button is pressed) + if ( !isChecked ) + SetValue(TRUE); + } + wxCommandEvent event(wxEVT_COMMAND_RADIOBUTTON_SELECTED, GetId()); event.SetEventObject( this ); - event.SetInt( GetValue() ); + event.SetInt(isChecked); ProcessCommand(event); } @@ -200,7 +297,7 @@ long wxRadioButton::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) return ret; } - return wxControl::MSWWindowProc(nMsg, wParam, lParam); + return wxControl::MSWWindowProc(nMsg, wParam, lParam); } #endif // wxUSE_RADIOBTN