X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f38374d0d7aa865e9bbe8ee61b75b94ffcdfb220..19e30148e18cc99296b26503c155e5cef59045f4:/src/os2/radiobut.cpp?ds=sidebyside diff --git a/src/os2/radiobut.cpp b/src/os2/radiobut.cpp index 1905f909e2..f30fb7e201 100644 --- a/src/os2/radiobut.cpp +++ b/src/os2/radiobut.cpp @@ -21,202 +21,175 @@ #include "wx/setup.h" #include "wx/radiobut.h" #include "wx/brush.h" +#include "wx/dcscreen.h" +#include "wx/settings.h" #endif #include "wx/os2/private.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxRadioButton, wxControl) -IMPLEMENT_DYNAMIC_CLASS(wxBitmapRadioButton, wxRadioButton) -#endif -bool wxRadioButton::OS2Command(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_bFocusJustSet = FALSE; +} // end of wxRadioButton::Init -bool wxRadioButton::Create(wxWindow *parent, wxWindowID id, - const wxString& label, - const wxPoint& pos, - const wxSize& size, long style, +void wxRadioButton::Command ( + wxCommandEvent& rEvent +) +{ + SetValue ((rEvent.GetInt() != 0) ); + ProcessCommand (rEvent); +} // end of wxRadioButton::Command + +bool wxRadioButton::Create( + wxWindow* pParent +, wxWindowID vId +, const wxString& rsLabel +, const wxPoint& rPos +, const wxSize& rSize +, long lStyle #if wxUSE_VALIDATORS - const wxValidator& validator, +, const wxValidator& rValidator #endif - const wxString& name) +, const wxString& rsName +) { - SetName(name); + if ( !CreateControl( pParent + ,vId + ,rPos + ,rSize + ,lStyle #if wxUSE_VALIDATORS - SetValidator(validator); + ,rValidator #endif + ,rsName)) + return FALSE; + + long lSstyle = HasFlag(wxRB_GROUP) ? WS_GROUP : 0; + + lSstyle |= BS_AUTORADIOBUTTON; + + if (HasFlag(wxCLIP_SIBLINGS)) + lSstyle |= WS_CLIPSIBLINGS; + + if (!OS2CreateControl( _T("BUTTON") + ,lSstyle + ,rPos + ,rSize + ,rsLabel + ,0 + )) + return FALSE; + + if (HasFlag(wxRB_GROUP)) + SetValue(TRUE); + + wxFont* pTextFont = new wxFont( 10 + ,wxMODERN + ,wxNORMAL + ,wxNORMAL + ); + SetFont(*pTextFont); + SetSize( rPos.x + ,rPos.y + ,rSize.x + ,rSize.y + ); + delete pTextFont; + return TRUE; +} // end of wxRadioButton::Create - 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 ; - -// TODO create radiobutton -/* - long groupStyle = 0; - if (m_windowStyle & wxRB_GROUP) - groupStyle = WS_GROUP; - -// long msStyle = groupStyle | RADIO_FLAGS; - long msStyle = groupStyle | BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE ; - - bool want3D; - WXDWORD exStyle = Determine3DEffects(0, &want3D) ; - - m_hWnd = (WXHWND) CreateWindowEx(exStyle, RADIO_CLASS, (const wxChar *)label, - msStyle,0,0,0,0, - (HWND) parent->GetHWND(), (HMENU)m_windowId, wxGetInstance(), NULL); - - wxCHECK_MSG( m_hWnd, FALSE, wxT("Failed to create radiobutton") ); - +wxSize wxRadioButton::DoGetBestSize() const +{ + static int snRadioSize = 0; - SetFont(parent->GetFont()); + if (!snRadioSize) + { + wxScreenDC vDC; - // Subclass again for purposes of dialog editing mode - SubclassWin((WXHWND)m_hWnd); + vDC.SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT)); + snRadioSize = vDC.GetCharHeight(); + } -// SetValue(value); -*/ + wxString sStr = GetLabel(); + int nRadioWidth; + int nRadioHeight; - // 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) + if (!sStr.empty()) { - height = (int)(label_height); - if (height < RADIO_SIZE) - height = RADIO_SIZE; + GetTextExtent( sStr + ,&nRadioWidth + ,&nRadioHeight + ); + nRadioWidth += snRadioSize + GetCharWidth(); + if (nRadioHeight < snRadioSize) + nRadioHeight = snRadioSize; } - } - else - { - if (width < 0) - width = RADIO_SIZE; - if (height < 0) - height = RADIO_SIZE; - } - // end GRW fix - - SetSize(x, y, width, height); - return FALSE; -} - -void wxRadioButton::SetLabel(const wxString& label) -{ - // TODO -} - -void wxRadioButton::SetValue(bool value) -{ - // TODO -} + else + { + nRadioWidth = snRadioSize; + nRadioHeight = snRadioSize; + } + return wxSize( nRadioWidth + ,nRadioHeight + ); +} // end of wxRadioButton::DoGetBestSize +// // Get single selection, for single choice list items +// bool wxRadioButton::GetValue() const { - // TODO - return FALSE; -} + return((::WinSendMsg((HWND) GetHWND(), BM_QUERYCHECK, (MPARAM)0L, (MPARAM)0L) != 0)); +} // end of wxRadioButton::GetValue -void wxRadioButton::Command (wxCommandEvent & event) +bool wxRadioButton::OS2Command( + WXUINT wParam +, WXWORD wId +) { - SetValue ( (event.m_commandInt != 0) ); - ProcessCommand (event); -} - -bool wxBitmapRadioButton::Create(wxWindow *parent, wxWindowID id, - const wxBitmap *bitmap, - const wxPoint& pos, - const wxSize& size, long style, -#if wxUSE_VALIDATORS - const wxValidator& validator, -#endif - const wxString& name) -{ - SetName(name); -#if wxUSE_VALIDATORS - SetValidator(validator); -#endif - - 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; - -// TODO: -/* -// 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 ); - -*/ - // Subclass again for purposes of dialog editing mode - SubclassWin(GetHWND()); - - SetSize(x, y, width, height); + if (wParam == BN_CLICKED) + { + wxCommandEvent rEvent( wxEVT_COMMAND_RADIOBUTTON_SELECTED + ,m_windowId + ); - return TRUE; -} + rEvent.SetEventObject(this); + ProcessCommand(rEvent); + return TRUE; + } + else + return FALSE; +} // end of wxRadioButton::OS2Command -void wxBitmapRadioButton::SetLabel(const wxBitmap *bitmap) +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 aviod this, we drop the pseudo BN_CLICKED events generated when the + // button gains focus + m_bFocusJustSet = TRUE; + + wxControl::SetFocus(); } -void wxBitmapRadioButton::SetValue(bool value) +void wxRadioButton::SetLabel( + const wxString& rsLabel +) { -// Following necessary for Win32s, because Win32s translate BM_SETCHECK -// SendMessage((HWND) GetHWND(), BM_SETCHECK, (WPARAM)value, 0L); -} + ::WinSetWindowText((HWND)GetHWND(), (const char *)rsLabel.c_str()); +} // end of wxRadioButton::SetLabel -// Get single selection, for single choice list items -bool wxBitmapRadioButton::GetValue(void) const +void wxRadioButton::SetValue( + bool bValue +) { -// return (bool)SendMessage((HWND) GetHWND(), BM_GETCHECK, 0, 0L); - return FALSE; -} + ::WinSendMsg((HWND)GetHWND(), BM_SETCHECK, (MPARAM)bValue, (MPARAM)0); +} // end of wxRadioButton::SetValue