/////////////////////////////////////////////////////////////////////////////
-// Name: msw/radiobut.cpp
+// Name: src/msw/radiobut.cpp
// Purpose: wxRadioButton
// Author: Julian Smart
// Modified by:
// headers
// ----------------------------------------------------------------------------
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
- #pragma implementation "radiobut.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#if wxUSE_RADIOBTN
+#include "wx/radiobut.h"
+
#ifndef WX_PRECOMP
- #include "wx/radiobut.h"
#include "wx/settings.h"
#include "wx/dcscreen.h"
#endif
wxFLAGS_MEMBER(wxBORDER_RAISED)
wxFLAGS_MEMBER(wxBORDER_STATIC)
wxFLAGS_MEMBER(wxBORDER_NONE)
-
+
// old style border flags
wxFLAGS_MEMBER(wxSIMPLE_BORDER)
wxFLAGS_MEMBER(wxSUNKEN_BORDER)
wxBEGIN_PROPERTIES_TABLE(wxRadioButton)
wxEVENT_PROPERTY( Click , wxEVT_COMMAND_RADIOBUTTON_SELECTED , wxCommandEvent )
- wxPROPERTY( Font , wxFont , SetFont , GetFont , , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+ 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,, 0 /*flags*/ , wxT("Helpstring") , wxT("group") )
- wxPROPERTY_FLAGS( WindowStyle , wxRadioButtonStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
+ 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 )
+wxCONSTRUCTOR_6( wxRadioButton , wxWindow* , Parent , wxWindowID , Id , wxString , Label , wxPoint , Position , wxSize , Size , long , WindowStyle )
#else
IMPLEMENT_DYNAMIC_CLASS(wxRadioButton, wxControl)
#endif
-wxRadioButton::wxRadioButton()
-{
- Init();
-}
-
-wxRadioButton::wxRadioButton(wxWindow *parent,
- wxWindowID id,
- const wxString& label,
- const wxPoint& pos,
- const wxSize& size,
- long style,
- const wxValidator& validator,
- const wxString& name)
-{
- Init();
-
- Create(parent, id, label, pos, size, style, validator, name);
-}
-
void wxRadioButton::Init()
{
m_isChecked = false;
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;
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);
+ (void)::SendMessage(GetHwnd(), BM_SETCHECK, (value?BST_CHECKED:BST_UNCHECKED), 0L);
m_isChecked = value;
// buttons in the same group: Windows doesn't do it automatically
if ( m_isChecked )
{
+ // If another radiobutton in the group currently has the focus, we have to
+ // set it to this radiobutton, else the old readiobutton will be reselected
+ // automatically, if a parent window loses the focus and regains it.
+ bool shouldSetFocus = false;
+ wxWindow* pFocusWnd = FindFocus();
+
const wxWindowList& siblings = GetParent()->GetChildren();
wxWindowList::compatibility_iterator nodeThis = siblings.Find(this);
wxCHECK_RET( nodeThis, _T("radio button not a child of its parent?") );
{
wxRadioButton *btn = wxDynamicCast(nodeBefore->GetData(),
wxRadioButton);
- if ( !btn )
+ if ( btn && btn->HasFlag(wxRB_SINGLE) )
{
- // the radio buttons in a group must be consecutive, so
- // there are no more of them
+ // A wxRB_SINGLE button isn't part of this group
break;
}
- btn->SetValue(false);
-
- if ( btn->HasFlag(wxRB_GROUP) )
+ if (btn)
{
- // even if there are other radio buttons before this one,
- // they're not in the same group with us
- break;
+ if (btn == pFocusWnd)
+ shouldSetFocus = true;
+
+ 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;
+ }
}
}
}
wxRadioButton *btn = wxDynamicCast(nodeAfter->GetData(),
wxRadioButton);
- if ( !btn || btn->HasFlag(wxRB_GROUP) )
+ if ( btn && (btn->HasFlag(wxRB_GROUP) || btn->HasFlag(wxRB_SINGLE) ) )
{
// no more buttons or the first button of the next group
break;
}
- btn->SetValue(false);
+ if (btn)
+ {
+ if (btn == pFocusWnd)
+ shouldSetFocus = true;
+
+ btn->SetValue(false);
+ }
}
+ if (shouldSetFocus)
+ SetFocus();
}
}
void wxRadioButton::Command (wxCommandEvent& event)
{
- SetValue(event.m_commandInt != 0);
+ SetValue(event.GetInt() != 0);
ProcessCommand(event);
}
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();
int wRadio, hRadio;
if ( !str.empty() )
{
- GetTextExtent(str, &wRadio, &hRadio);
+ GetTextExtent(GetLabelText(str), &wRadio, &hRadio);
wRadio += s_radioSize + GetCharWidth();
if ( hRadio < s_radioSize )
hRadio = s_radioSize;
}
- return wxSize(wRadio, hRadio);
+ wxSize best(wRadio, hRadio);
+ CacheBestSize(best);
+ return best;
}
-#endif // wxUSE_RADIOBTN
+WXDWORD wxRadioButton::MSWGetStyle(long style, WXDWORD *exstyle) const
+{
+ WXDWORD styleMSW = wxControl::MSWGetStyle(style, exstyle);
+
+ if ( style & wxRB_GROUP )
+ styleMSW |= WS_GROUP;
+ return styleMSW;
+}
+
+#endif // wxUSE_RADIOBTN
projects / wxWidgets.git / blobdiff