X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6b81a8eabe78928856c360b14e528c900be852ce..4e15d1caa03346c126015019c1fdf093033ef40b:/src/msw/radiobut.cpp?ds=inline diff --git a/src/msw/radiobut.cpp b/src/msw/radiobut.cpp index f3d6507c8c..6c8ed13480 100644 --- a/src/msw/radiobut.cpp +++ b/src/msw/radiobut.cpp @@ -44,62 +44,6 @@ // wxRadioButton creation // ---------------------------------------------------------------------------- - -#if wxUSE_EXTENDED_RTTI -WX_DEFINE_FLAGS( wxRadioButtonStyle ) - -wxBEGIN_FLAGS( wxRadioButtonStyle ) - // new style border flags, we put them first to - // use them for streaming out - wxFLAGS_MEMBER(wxBORDER_SIMPLE) - wxFLAGS_MEMBER(wxBORDER_SUNKEN) - wxFLAGS_MEMBER(wxBORDER_DOUBLE) - wxFLAGS_MEMBER(wxBORDER_RAISED) - wxFLAGS_MEMBER(wxBORDER_STATIC) - wxFLAGS_MEMBER(wxBORDER_NONE) - - // old style border flags - wxFLAGS_MEMBER(wxSIMPLE_BORDER) - wxFLAGS_MEMBER(wxSUNKEN_BORDER) - wxFLAGS_MEMBER(wxDOUBLE_BORDER) - wxFLAGS_MEMBER(wxRAISED_BORDER) - wxFLAGS_MEMBER(wxSTATIC_BORDER) - wxFLAGS_MEMBER(wxBORDER) - - // standard window styles - wxFLAGS_MEMBER(wxTAB_TRAVERSAL) - wxFLAGS_MEMBER(wxCLIP_CHILDREN) - wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW) - wxFLAGS_MEMBER(wxWANTS_CHARS) - wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE) - wxFLAGS_MEMBER(wxALWAYS_SHOW_SB ) - wxFLAGS_MEMBER(wxVSCROLL) - wxFLAGS_MEMBER(wxHSCROLL) - - wxFLAGS_MEMBER(wxRB_GROUP) - -wxEND_FLAGS( wxRadioButtonStyle ) - -IMPLEMENT_DYNAMIC_CLASS_XTI(wxRadioButton, wxControl,"wx/radiobut.h") - -wxBEGIN_PROPERTIES_TABLE(wxRadioButton) - wxEVENT_PROPERTY( Click , wxEVT_COMMAND_RADIOBUTTON_SELECTED , wxCommandEvent ) - wxPROPERTY( Font , wxFont , SetFont , GetFont , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) - wxPROPERTY( Label,wxString, SetLabel, GetLabel, wxString(), 0 /*flags*/ , wxT("Helpstring") , wxT("group") ) - wxPROPERTY( Value ,bool, SetValue, GetValue, EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group") ) - wxPROPERTY_FLAGS( WindowStyle , wxRadioButtonStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style -wxEND_PROPERTIES_TABLE() - -wxBEGIN_HANDLERS_TABLE(wxRadioButton) -wxEND_HANDLERS_TABLE() - -wxCONSTRUCTOR_6( wxRadioButton , wxWindow* , Parent , wxWindowID , Id , wxString , Label , wxPoint , Position , wxSize , Size , long , WindowStyle ) - -#else -IMPLEMENT_DYNAMIC_CLASS(wxRadioButton, wxControl) -#endif - - void wxRadioButton::Init() { m_isChecked = false; @@ -117,34 +61,15 @@ bool wxRadioButton::Create(wxWindow *parent, if ( !CreateControl(parent, id, pos, size, style, validator, name) ) return false; - 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. - - 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; + WXDWORD exstyle = 0; + WXDWORD msStyle = MSWGetStyle(style, &exstyle); - if ( HasFlag(wxCLIP_SIBLINGS) ) - msStyle |= WS_CLIPSIBLINGS; - if ( HasFlag(wxALIGN_RIGHT) ) - msStyle |= BS_LEFTTEXT | BS_RIGHT; - - if ( !MSWCreateControl(_T("BUTTON"), msStyle, pos, size, label, 0) ) + if ( !MSWCreateControl(wxT("BUTTON"), msStyle, pos, size, label, exstyle) ) return false; // for compatibility with wxGTK, the first radio button in a group is // always checked (this makes sense anyhow as you need to ensure that at - // least one button in the group is checked and this is the simlpest way to + // least one button in the group is checked and this is the simplest way to // do it) if ( HasFlag(wxRB_GROUP) ) SetValue(true); @@ -170,18 +95,18 @@ void wxRadioButton::SetValue(bool value) // buttons in the same group: Windows doesn't do it automatically // // moreover, if another radiobutton in the group currently has the focus, - // we have to set it to this radiobutton, else the old readiobutton will be + // we have to set it to this radiobutton, else the old radiobutton will be // reselected automatically, if a parent window loses the focus and regains // it. wxWindow * const focus = FindFocus(); wxTopLevelWindow * const tlw = wxDynamicCast(wxGetTopLevelParent(this), wxTopLevelWindow); - wxCHECK_RET( tlw, _T("radio button outside of TLW?") ); + wxCHECK_RET( tlw, wxT("radio button outside of TLW?") ); wxWindow * const focusInTLW = tlw->GetLastFocus(); const wxWindowList& siblings = GetParent()->GetChildren(); wxWindowList::compatibility_iterator nodeThis = siblings.Find(this); - wxCHECK_RET( nodeThis, _T("radio button not a child of its parent?") ); + wxCHECK_RET( nodeThis, wxT("radio button not a child of its parent?") ); // this will be set to true in the code below if the focus is in our TLW // and belongs to one of the other buttons in the same group @@ -266,7 +191,7 @@ bool wxRadioButton::GetValue() const { wxASSERT_MSG( m_isChecked == (::SendMessage(GetHwnd(), BM_GETCHECK, 0, 0L) != 0), - _T("wxRadioButton::m_isChecked is out of sync?") ); + wxT("wxRadioButton::m_isChecked is out of sync?") ); return m_isChecked; } @@ -288,9 +213,8 @@ bool wxRadioButton::MSWCommand(WXUINT param, WXWORD WXUNUSED(id)) if ( !m_isChecked ) { - // we have to do this for BS_RADIOBUTTON anyhow and, strangely enough, - // sometimes this is needed even for BS_AUTORADIOBUTTON (when we - // receive focus the button gets BN_CLICKED but stays unchecked!) + // we need to manually update the button state as we use BS_RADIOBUTTON + // and not BS_AUTORADIOBUTTON SetValue(true); wxCommandEvent event(wxEVT_COMMAND_RADIOBUTTON_SELECTED, GetId()); @@ -350,12 +274,27 @@ wxSize wxRadioButton::DoGetBestSize() const WXDWORD wxRadioButton::MSWGetStyle(long style, WXDWORD *exstyle) const { - WXDWORD styleMSW = wxControl::MSWGetStyle(style, exstyle); + WXDWORD msStyle = wxControl::MSWGetStyle(style, exstyle); + + if ( HasFlag(wxRB_GROUP) ) + msStyle |= WS_GROUP; + + // we use BS_RADIOBUTTON and not BS_AUTORADIOBUTTON because the use of the + // latter can easily result in the application entering an infinite loop + // inside IsDialogMessage() + // + // we used to use BS_RADIOBUTTON only for wxRB_SINGLE buttons but there + // doesn't seem to be any harm to always use it and it prevents some hangs, + // see #9786 + msStyle |= BS_RADIOBUTTON; + + if ( style & wxCLIP_SIBLINGS ) + msStyle |= WS_CLIPSIBLINGS; + if ( style & wxALIGN_RIGHT ) + msStyle |= BS_LEFTTEXT | BS_RIGHT; - if ( style & wxRB_GROUP ) - styleMSW |= WS_GROUP; - return styleMSW; + return msStyle; } #endif // wxUSE_RADIOBTN