X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6c9a19aabab3a878b565e6c2a5f2a3824277c4dc..69d31e313035d5e22d9400ec946f6007f710910c:/src/msw/radiobut.cpp diff --git a/src/msw/radiobut.cpp b/src/msw/radiobut.cpp index 9dd4865998..01e5fd8dbb 100644 --- a/src/msw/radiobut.cpp +++ b/src/msw/radiobut.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: msw/radiobut.cpp +// Name: src/msw/radiobut.cpp // Purpose: wxRadioButton // Author: Julian Smart // Modified by: @@ -17,24 +17,21 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ -#pragma implementation "radiobut.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" #ifdef __BORLANDC__ -#pragma hdrstop + #pragma hdrstop #endif #if wxUSE_RADIOBTN -#ifndef WX_PRECOMP #include "wx/radiobut.h" -#include "wx/settings.h" -#include "wx/brush.h" -#include "wx/dcscreen.h" + +#ifndef WX_PRECOMP + #include "wx/settings.h" + #include "wx/dcscreen.h" + #include "wx/toplevel.h" #endif #include "wx/msw/private.h" @@ -47,11 +44,65 @@ // 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_focusJustSet = FALSE; + m_isChecked = false; } bool wxRadioButton::Create(wxWindow *parent, @@ -64,39 +115,37 @@ bool wxRadioButton::Create(wxWindow *parent, const wxString& name) { if ( !CreateControl(parent, id, pos, size, style, validator, name) ) - return FALSE; + 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; + // 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 ( HasFlag(wxCLIP_SIBLINGS) ) msStyle |= WS_CLIPSIBLINGS; + if ( HasFlag(wxALIGN_RIGHT) ) + msStyle |= BS_LEFTTEXT | BS_RIGHT; - if ( !MSWCreateControl(_T("BUTTON"), msStyle, pos, size, label, 0) ) - return FALSE; + if ( !MSWCreateControl(wxT("BUTTON"), msStyle, pos, size, label, 0) ) + 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); + SetValue(true); - return TRUE; + return true; } // ---------------------------------------------------------------------------- @@ -105,20 +154,45 @@ 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 use BST_XXX here as they're not defined for Win16) - (void)::SendMessage(GetHwnd(), BM_SETCHECK, (WPARAM)value, 0L); + ::SendMessage(GetHwnd(), BM_SETCHECK, + value ? BST_CHECKED : BST_UNCHECKED, 0); + + m_isChecked = value; + + if ( !value ) + return; // 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 ) + // + // moreover, if another radiobutton in the group currently has the focus, + // 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, 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, 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 + bool shouldSetFocus = false; + + // this will be set to true if the focus is outside of our TLW currently + // but the remembered focus of this TLW is one of the other buttons in the + // same group + bool shouldSetTLWFocus = false; + + // if it's not the first item of the group ... + if ( !HasFlag(wxRB_GROUP) ) { - const wxWindowList& siblings = GetParent()->GetChildren(); - wxWindowList::Node *nodeThis = siblings.Find(this); - wxCHECK_RET( nodeThis, _T("radio button not a child of its parent?") ); - - // turn off all radio buttons before this one - for ( wxWindowList::Node *nodeBefore = nodeThis->GetPrevious(); + // ... turn off all radio buttons before it + for ( wxWindowList::compatibility_iterator nodeBefore = nodeThis->GetPrevious(); nodeBefore; nodeBefore = nodeBefore->GetPrevious() ) { @@ -126,12 +200,23 @@ void wxRadioButton::SetValue(bool value) wxRadioButton); if ( !btn ) { - // the radio buttons in a group must be consecutive, so there - // are no more of them - break; + // don't stop on non radio buttons, we could have intermixed + // buttons and e.g. static labels + continue; } - btn->SetValue(FALSE); + if ( btn->HasFlag(wxRB_SINGLE) ) + { + // A wxRB_SINGLE button isn't part of this group + break; + } + + if ( btn == focus ) + shouldSetFocus = true; + else if ( btn == focusInTLW ) + shouldSetTLWFocus = true; + + btn->SetValue(false); if ( btn->HasFlag(wxRB_GROUP) ) { @@ -140,31 +225,46 @@ void wxRadioButton::SetValue(bool value) break; } } + } - // ... and all after this one - for ( wxWindowList::Node *nodeAfter = nodeThis->GetNext(); - nodeAfter; - nodeAfter = nodeAfter->GetNext() ) - { - wxRadioButton *btn = wxDynamicCast(nodeAfter->GetData(), - wxRadioButton); + // ... 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; - } + if ( !btn ) + continue; - btn->SetValue(FALSE); + if ( btn->HasFlag(wxRB_GROUP | wxRB_SINGLE) ) + { + // no more buttons or the first button of the next group + break; } + + if ( btn == focus ) + shouldSetFocus = true; + else if ( btn == focusInTLW ) + shouldSetTLWFocus = true; + + btn->SetValue(false); } + + if ( shouldSetFocus ) + SetFocus(); + else if ( shouldSetTLWFocus ) + tlw->SetLastFocus(this); } bool wxRadioButton::GetValue() const { - // NB: this will also return TRUE for BST_INDETERMINATE value if we ever - // have 3-state radio buttons - return ::SendMessage(GetHwnd(), BM_GETCHECK, 0, 0L) != 0; + wxASSERT_MSG( m_isChecked == + (::SendMessage(GetHwnd(), BM_GETCHECK, 0, 0L) != 0), + wxT("wxRadioButton::m_isChecked is out of sync?") ); + + return m_isChecked; } // ---------------------------------------------------------------------------- @@ -173,57 +273,29 @@ bool wxRadioButton::GetValue() const void wxRadioButton::Command (wxCommandEvent& event) { - SetValue(event.m_commandInt != 0); + SetValue(event.GetInt() != 0); ProcessCommand(event); } -void wxRadioButton::SetFocus() -{ - // when the radio button receives a WM_SETFOCUS message it generates a - // BN_CLICKED which is totally unexpected and leads to catastrophic results - // if you pop up a dialog from the radio button event handler as, when the - // dialog is dismissed, the focus is returned to the radio button which - // generates BN_CLICKED which leads to showing another dialog and so on - // without end! - // - // to avoid this, we drop the pseudo BN_CLICKED events generated when the - // button gains focus - m_focusJustSet = TRUE; - - wxControl::SetFocus(); -} - bool wxRadioButton::MSWCommand(WXUINT param, WXWORD WXUNUSED(id)) { if ( param != BN_CLICKED ) - return FALSE; + return false; - if ( m_focusJustSet ) - { - // see above: we want to ignore this event - m_focusJustSet = FALSE; - } - else // a real clicked event + if ( !m_isChecked ) { - 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); - } + // 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()); event.SetEventObject( this ); - event.SetInt(isChecked); + event.SetInt(true); // always checked ProcessCommand(event); } - return TRUE; + return true; } // ---------------------------------------------------------------------------- @@ -240,6 +312,13 @@ wxSize wxRadioButton::DoGetBestSize() const dc.SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT)); s_radioSize = dc.GetCharHeight(); + + // radio button bitmap size under CE is bigger than the font height, + // adding just one pixel seems to work fine for the default font but it + // would be nice to find some better way to find the correct height +#ifdef __WXWINCE__ + s_radioSize++; +#endif // __WXWINCE__ } wxString str = GetLabel(); @@ -247,7 +326,7 @@ wxSize wxRadioButton::DoGetBestSize() const int wRadio, hRadio; if ( !str.empty() ) { - GetTextExtent(str, &wRadio, &hRadio); + GetTextExtent(GetLabelText(str), &wRadio, &hRadio); wRadio += s_radioSize + GetCharWidth(); if ( hRadio < s_radioSize ) @@ -259,22 +338,19 @@ wxSize wxRadioButton::DoGetBestSize() const hRadio = s_radioSize; } - return wxSize(wRadio, hRadio); + wxSize best(wRadio, hRadio); + CacheBestSize(best); + return best; } -long wxRadioButton::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) +WXDWORD wxRadioButton::MSWGetStyle(long style, WXDWORD *exstyle) const { - if (nMsg == WM_SETFOCUS) - { - m_focusJustSet = TRUE; + WXDWORD styleMSW = wxControl::MSWGetStyle(style, exstyle); - long ret = wxControl::MSWWindowProc(nMsg, wParam, lParam); + if ( style & wxRB_GROUP ) + styleMSW |= WS_GROUP; - m_focusJustSet = FALSE; - - return ret; - } - return wxControl::MSWWindowProc(nMsg, wParam, lParam); + return styleMSW; } #endif // wxUSE_RADIOBTN