X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f048e32fcd5260f33fbebdafbe1a0deeda175419..c7de4135b619a045593a42dcbb1d1e8a7858cdcc:/src/msw/radiobut.cpp?ds=sidebyside diff --git a/src/msw/radiobut.cpp b/src/msw/radiobut.cpp index d63f27cc79..83e588ab4d 100644 --- a/src/msw/radiobut.cpp +++ b/src/msw/radiobut.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: radiobut.cpp +// Name: msw/radiobut.cpp // Purpose: wxRadioButton // Author: Julian Smart // Modified by: @@ -9,6 +9,14 @@ // Licence: wxWindows license ///////////////////////////////////////////////////////////////////////////// +// ============================================================================ +// declarations +// ============================================================================ + +// ---------------------------------------------------------------------------- +// headers +// ---------------------------------------------------------------------------- + #ifdef __GNUG__ #pragma implementation "radiobut.h" #endif @@ -20,220 +28,164 @@ #pragma hdrstop #endif +#if wxUSE_RADIOBTN + #ifndef WX_PRECOMP -#include -#include "wx/setup.h" #include "wx/radiobut.h" +#include "wx/settings.h" #include "wx/brush.h" +#include "wx/dcscreen.h" #endif #include "wx/msw/private.h" -#if !USE_SHARED_LIBRARY +// ============================================================================ +// wxRadioButton implementation +// ============================================================================ + +// ---------------------------------------------------------------------------- +// wxRadioButton creation +// ---------------------------------------------------------------------------- + IMPLEMENT_DYNAMIC_CLASS(wxRadioButton, wxControl) -// IMPLEMENT_DYNAMIC_CLASS(wxBitmapRadioButton, wxRadioButton) -#endif -bool wxRadioButton::MSWCommand(WXUINT param, WXWORD id) +void wxRadioButton::Init() { - if (param == BN_CLICKED) - { - wxCommandEvent event(wxEVT_COMMAND_RADIOBUTTON_SELECTED, m_windowId); - event.SetEventObject( this ); - ProcessCommand(event); - return TRUE; - } - else return FALSE; + m_focusJustSet = FALSE; } -bool wxRadioButton::Create(wxWindow *parent, wxWindowID id, - const wxString& label, - const wxPoint& pos, - const wxSize& size, long style, - const wxValidator& validator, - const wxString& name) +bool wxRadioButton::Create(wxWindow *parent, + wxWindowID id, + const wxString& label, + const wxPoint& pos, + const wxSize& size, + long style, + const wxValidator& validator, + const wxString& name) { - SetName(name); - SetValidator(validator); - - if (parent) parent->AddChild(this); - - SetBackgroundColour(parent->GetBackgroundColour()); - SetForegroundColour(parent->GetForegroundColour()); - - if ( id == -1 ) - m_windowId = (int)NewControlId(); - else - m_windowId = id; - - int x = pos.x; - int y = pos.y; - int width = size.x; - int height = size.y; - - m_windowStyle = style ; + if ( !CreateControl(parent, id, pos, size, style, validator, name) ) + return FALSE; - long groupStyle = 0; - if (m_windowStyle & wxRB_GROUP) - groupStyle = WS_GROUP; + long msStyle = HasFlag(wxRB_GROUP) ? WS_GROUP : 0; -// long msStyle = groupStyle | RADIO_FLAGS; - long msStyle = groupStyle | BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE ; + msStyle |= BS_AUTORADIOBUTTON; - bool want3D; - WXDWORD exStyle = Determine3DEffects(0, &want3D) ; + if ( HasFlag(wxCLIP_SIBLINGS) ) + msStyle |= WS_CLIPSIBLINGS; - // Even with extended styles, need to combine with WS_BORDER - // for them to look right. -/* - if ( want3D || wxStyleHasBorder(m_windowStyle) ) - msStyle |= WS_BORDER; -*/ + if ( !MSWCreateControl(_T("BUTTON"), msStyle, pos, size, label, 0) ) + return FALSE; - m_hWnd = (WXHWND) CreateWindowEx(exStyle, RADIO_CLASS, (const wxChar *)label, - msStyle,0,0,0,0, - (HWND) parent->GetHWND(), (HMENU)m_windowId, wxGetInstance(), NULL); + // 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 + // do it) + if ( HasFlag(wxRB_GROUP) ) + SetValue(TRUE); - wxCHECK_MSG( m_hWnd, FALSE, wxT("Failed to create radiobutton") ); - -#if wxUSE_CTL3D - if (want3D) - { - Ctl3dSubclassCtl((HWND) m_hWnd); - m_useCtl3D = TRUE; - } -#endif - - SetFont(parent->GetFont()); - - // Subclass again for purposes of dialog editing mode - SubclassWin((WXHWND)m_hWnd); - -// SetValue(value); - - // start GRW fix - if (label != wxT("")) - { - int label_width, label_height; - GetTextExtent(label, &label_width, &label_height, NULL, NULL, & this->GetFont()); - if (width < 0) - width = (int)(label_width + RADIO_SIZE); - if (height<0) - { - height = (int)(label_height); - if (height < RADIO_SIZE) - height = RADIO_SIZE; - } - } - else - { - if (width < 0) - width = RADIO_SIZE; - if (height < 0) - height = RADIO_SIZE; - } - // end GRW fix - - SetSize(x, y, width, height); - - return TRUE; + return TRUE; } +// ---------------------------------------------------------------------------- +// wxRadioButton functions +// ---------------------------------------------------------------------------- -void wxRadioButton::SetLabel(const wxString& label) +void wxRadioButton::SetValue(bool value) { - SetWindowText((HWND) GetHWND(), (const wxChar *)label); + // 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) + (void)::SendMessage(GetHwnd(), BM_SETCHECK, (WPARAM)value, 0L); } -void wxRadioButton::SetValue(bool value) +bool wxRadioButton::GetValue() const { -// Following necessary for Win32s, because Win32s translate BM_SETCHECK - SendMessage((HWND) GetHWND(), BM_SETCHECK, (WPARAM)value, 0L); + // 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; } -// Get single selection -bool wxRadioButton::GetValue(void) const +// ---------------------------------------------------------------------------- +// wxRadioButton event processing +// ---------------------------------------------------------------------------- + +void wxRadioButton::Command (wxCommandEvent& event) { - return (SendMessage((HWND) GetHWND(), BM_GETCHECK, 0, 0L) != 0); + SetValue(event.m_commandInt != 0); + ProcessCommand(event); } -void wxRadioButton::Command (wxCommandEvent & event) +void wxRadioButton::SetFocus() { - SetValue ( (event.m_commandInt != 0) ); - ProcessCommand (event); + // 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 aviod this, we drop the pseudo BN_CLICKED events generated when the + // button gains focus + m_focusJustSet = TRUE; + + wxControl::SetFocus(); } - -// Not implemented -#if 0 -bool wxBitmapRadioButton::Create(wxWindow *parent, wxWindowID id, - const wxBitmap *bitmap, - const wxPoint& pos, - const wxSize& size, long style, - const wxValidator& validator, - const wxString& name) +bool wxRadioButton::MSWCommand(WXUINT param, WXWORD WXUNUSED(id)) { - SetName(name); - SetValidator(validator); - - if (parent) parent->AddChild(this); - SetBackgroundColour(parent->GetBackgroundColour()); - SetForegroundColour(parent->GetForegroundColour()); - - if ( id == -1 ) - m_windowId = (int)NewControlId(); - else - m_windowId = id; - - int x = pos.x; - int y = pos.y; - int width = size.x; - int height = size.y; - m_windowStyle = style ; - - long groupStyle = 0; - if (m_windowStyle & wxRB_GROUP) - groupStyle = WS_GROUP; - -// long msStyle = groupStyle | RADIO_FLAGS; - long msStyle = groupStyle | BS_RADIOBUTTON | WS_CHILD | WS_VISIBLE ; - - m_hWnd = (WXHWND) CreateWindowEx(MakeExtendedStyle(m_windowStyle), RADIO_CLASS, "toggle", - msStyle,0,0,0,0, - (HWND) parent->GetHWND(), (HMENU)m_windowId, wxGetInstance(), NULL); - - wxCHECK_MSG( m_hWnd, "Failed to create radio button", FALSE ); - -#if wxUSE_CTL3D - if (!(GetParent()->GetWindowStyleFlag() & wxUSER_COLOURS)) - { - Ctl3dSubclassCtl((HWND) GetHWND()); - m_useCtl3D = TRUE; - } -#endif + if ( param != BN_CLICKED ) + return FALSE; - // Subclass again for purposes of dialog editing mode - SubclassWin(GetHWND()); + if ( m_focusJustSet ) + { + // see above: we want to ignore this event + m_focusJustSet = FALSE; + } + else // a real clicked event + { + wxCommandEvent event(wxEVT_COMMAND_RADIOBUTTON_SELECTED, GetId()); + event.SetEventObject( this ); + event.SetInt( GetValue() ); - SetSize(x, y, width, height); + ProcessCommand(event); + } - return TRUE; + return TRUE; } -void wxBitmapRadioButton::SetLabel(const wxBitmap *bitmap) -{ -} +// ---------------------------------------------------------------------------- +// wxRadioButton geometry +// ---------------------------------------------------------------------------- -void wxBitmapRadioButton::SetValue(bool value) +wxSize wxRadioButton::DoGetBestSize() const { -// Following necessary for Win32s, because Win32s translate BM_SETCHECK - SendMessage((HWND) GetHWND(), BM_SETCHECK, (WPARAM)value, 0L); -} + static int s_radioSize = 0; -// Get single selection, for single choice list items -bool wxBitmapRadioButton::GetValue(void) const -{ - return (bool)SendMessage((HWND) GetHWND(), BM_GETCHECK, 0, 0L); + if ( !s_radioSize ) + { + wxScreenDC dc; + dc.SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT)); + + s_radioSize = dc.GetCharHeight(); + } + + wxString str = GetLabel(); + + int wRadio, hRadio; + if ( !str.empty() ) + { + GetTextExtent(str, &wRadio, &hRadio); + wRadio += s_radioSize + GetCharWidth(); + + if ( hRadio < s_radioSize ) + hRadio = s_radioSize; + } + else + { + wRadio = s_radioSize; + hRadio = s_radioSize; + } + + return wxSize(wRadio, hRadio); } -#endif +#endif // wxUSE_RADIOBTN