X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3c299c3ab663257429983c24e6fb71450f3cf9f1..a7c8e710e944fc12a81a19d06fe415a92e86bb13:/src/os2/radiobut.cpp?ds=sidebyside diff --git a/src/os2/radiobut.cpp b/src/os2/radiobut.cpp index 8878abed12..f30fb7e201 100644 --- a/src/os2/radiobut.cpp +++ b/src/os2/radiobut.cpp @@ -21,12 +21,19 @@ #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" IMPLEMENT_DYNAMIC_CLASS(wxRadioButton, wxControl) +void wxRadioButton::Init() +{ + m_bFocusJustSet = FALSE; +} // end of wxRadioButton::Init + void wxRadioButton::Command ( wxCommandEvent& rEvent ) @@ -48,93 +55,86 @@ bool wxRadioButton::Create( , const wxString& rsName ) { - int nX = rPos.x; - int nY = rPos.y; - int nWidth = rSize.x; - int nHeight = rSize.y; - long lsStyle = 0L; - long lGroupStyle = 0L; - - SetName(rsName); + if ( !CreateControl( pParent + ,vId + ,rPos + ,rSize + ,lStyle #if wxUSE_VALIDATORS - SetValidator(rValidator); + ,rValidator #endif + ,rsName)) + return FALSE; - if (pParent) - pParent->AddChild(this); + long lSstyle = HasFlag(wxRB_GROUP) ? WS_GROUP : 0; - SetBackgroundColour(pParent->GetBackgroundColour()); - SetForegroundColour(pParent->GetForegroundColour()); + lSstyle |= BS_AUTORADIOBUTTON; - if (vId == -1) - m_windowId = (int)NewControlId(); - else - m_windowId = vId; + 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 - m_windowStyle = lStyle ; +wxSize wxRadioButton::DoGetBestSize() const +{ + static int snRadioSize = 0; - if (m_windowStyle & wxRB_GROUP) - lGroupStyle = WS_GROUP; + if (!snRadioSize) + { + wxScreenDC vDC; - lsStyle = lGroupStyle | BS_AUTORADIOBUTTON | WS_VISIBLE ; + vDC.SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT)); + snRadioSize = vDC.GetCharHeight(); + } - if (m_windowStyle & wxCLIP_SIBLINGS ) - lsStyle |= WS_CLIPSIBLINGS; - m_hWnd = (WXHWND)::WinCreateWindow ( GetHwndOf(pParent) - ,WC_BUTTON - ,rsLabel.c_str() - ,lsStyle - ,0, 0, 0, 0 - ,GetWinHwnd(pParent) - ,HWND_TOP - ,(HMENU)m_windowId - ,NULL - ,NULL - ); - wxCHECK_MSG(m_hWnd, FALSE, wxT("Failed to create radiobutton")); + wxString sStr = GetLabel(); + int nRadioWidth; + int nRadioHeight; - if (rsLabel != wxT("")) + if (!sStr.empty()) { - int nLabelWidth; - int nLabelHeight; - - GetTextExtent( rsLabel - ,&nLabelWidth - ,&nLabelHeight - ,NULL - ,NULL - ,&this->GetFont() + GetTextExtent( sStr + ,&nRadioWidth + ,&nRadioHeight ); - if (nWidth < 0) - nWidth = (int)(nLabelWidth + RADIO_SIZE); - if (nHeight<0) - { - nHeight = (int)(nLabelHeight); - if (nHeight < RADIO_SIZE) - nHeight = RADIO_SIZE; - } + nRadioWidth += snRadioSize + GetCharWidth(); + if (nRadioHeight < snRadioSize) + nRadioHeight = snRadioSize; } else { - if (nWidth < 0) - nWidth = RADIO_SIZE; - if (nHeight < 0) - nHeight = RADIO_SIZE; + nRadioWidth = snRadioSize; + nRadioHeight = snRadioSize; } - - // - // Subclass again for purposes of dialog editing mode - // - SubclassWin((WXHWND)m_hWnd); - SetFont(pParent->GetFont()); - SetSize( nX - ,nY - ,nWidth - ,nHeight - ); - return FALSE; -} // end of wxRadioButton::Create + return wxSize( nRadioWidth + ,nRadioHeight + ); +} // end of wxRadioButton::DoGetBestSize // // Get single selection, for single choice list items @@ -163,6 +163,22 @@ bool wxRadioButton::OS2Command( return FALSE; } // end of wxRadioButton::OS2Command +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 wxRadioButton::SetLabel( const wxString& rsLabel )