X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b3260bce473ab247edd8ca1d3aee4eb648b4b97e..2e14066008229145e2da7b9f05a478ce38631f83:/src/os2/checkbox.cpp?ds=sidebyside diff --git a/src/os2/checkbox.cpp b/src/os2/checkbox.cpp index e2b20ca4d7..5462a84f7a 100644 --- a/src/os2/checkbox.cpp +++ b/src/os2/checkbox.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: checkbox.cpp +// Name: src/os2/checkbox.cpp // Purpose: wxCheckBox // Author: David Webster // Modified by: @@ -12,8 +12,9 @@ // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" +#include "wx/checkbox.h" + #ifndef WX_PRECOMP - #include "wx/checkbox.h" #include "wx/brush.h" #include "wx/scrolwin.h" #include "wx/dcscreen.h" @@ -26,9 +27,12 @@ // macros // ---------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxCheckBox, wxControl) IMPLEMENT_DYNAMIC_CLASS(wxBitmapCheckBox, wxCheckBox) +extern void wxAssociateWinWithHandle( HWND hWnd + ,wxWindowOS2* pWin + ); + // ============================================================================ // implementation // ============================================================================ @@ -37,142 +41,79 @@ IMPLEMENT_DYNAMIC_CLASS(wxBitmapCheckBox, wxCheckBox) // wxCheckBox // ---------------------------------------------------------------------------- -bool wxCheckBox::OS2Command( - WXUINT WXUNUSED(uParam) -, WXWORD WXUNUSED(wId) -) +bool wxCheckBox::OS2Command( WXUINT WXUNUSED(uParam), + WXWORD WXUNUSED(wId) ) { - wxCommandEvent rEvent( wxEVT_COMMAND_CHECKBOX_CLICKED - ,m_windowId - ); + wxCommandEvent rEvent( wxEVT_COMMAND_CHECKBOX_CLICKED, m_windowId ); rEvent.SetInt(GetValue()); rEvent.SetEventObject(this); ProcessCommand(rEvent); - return TRUE; + return true; } // end of wxCheckBox::OS2Command -bool wxCheckBox::Create( - wxWindow* pParent -, wxWindowID vId -, const wxString& rsLabel -, const wxPoint& rPos -, const wxSize& rSize -, long lStyle -#if wxUSE_VALIDATORS -, const wxValidator& rValidator -#endif -, const wxString& rsName -) +bool wxCheckBox::Create(wxWindow* pParent, + wxWindowID vId, + const wxString& rsLabel, + const wxPoint& rPos, + const wxSize& rSize, + long lStyle, + const wxValidator& rValidator, + const wxString& rsName ) { - SetName(rsName); -#if wxUSE_VALIDATORS - SetValidator(rValidator); -#endif - if (pParent) - pParent->AddChild(this); - - SetBackgroundColour(pParent->GetBackgroundColour()); - SetForegroundColour(pParent->GetForegroundColour()); - m_windowStyle = lStyle; - - wxString sLabel = rsLabel; - - if (sLabel == wxT("")) - sLabel = wxT(" "); // Apparently needed or checkbox won't show - - if (vId == -1 ) - m_windowId = NewControlId(); - else - m_windowId = vId; - - int nX = rPos.x; - int nY = rPos.y; - int nWidth = rSize.x; - int nHeight = rSize.y; - long lSstyle = 0L; - - lSstyle = BS_AUTOCHECKBOX | - WS_TABSTOP | - WS_VISIBLE; - if (lStyle & 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 - ); - - // - // Subclass again for purposes of dialog editing mode - // - SubclassWin(m_hWnd); - - LONG lColor = (LONG)m_backgroundColour.GetPixel(); - + if (!CreateControl( pParent + ,vId + ,rPos + ,rSize + ,lStyle + ,rValidator + ,rsName + )) + return false; + + + long osStyle = BS_AUTOCHECKBOX | WS_TABSTOP | WS_VISIBLE; + + bool bOk = OS2CreateControl( wxT("BUTTON") + ,osStyle + ,rPos + ,rSize + ,rsLabel + ,0 + ); + m_backgroundColour = pParent->GetBackgroundColour(); + + LONG lColor = (LONG)m_backgroundColour.GetPixel(); ::WinSetPresParam( m_hWnd ,PP_BACKGROUNDCOLOR ,sizeof(LONG) ,(PVOID)&lColor ); - - wxFont* pTextFont = new wxFont( 10 - ,wxMODERN - ,wxNORMAL - ,wxNORMAL - ); - SetFont(*pTextFont); - SetSize( nX - ,nY - ,nWidth - ,nHeight - ); - delete pTextFont; - return TRUE; + wxAssociateWinWithHandle(m_hWnd, this); + return bOk; } // end of wxCheckBox::Create -void wxCheckBox::SetLabel( - const wxString& rsLabel -) +void wxCheckBox::SetLabel( const wxString& rsLabel ) { - ::WinSetWindowText(GetHwnd(), rsLabel.c_str()); + wxString sLabel=::wxPMTextToLabel(rsLabel); + ::WinSetWindowText(GetHwnd(), sLabel.c_str()); } // end of wxCheckBox::SetLabel wxSize wxCheckBox::DoGetBestSize() const { - static int nCheckSize = 0; - - if (!nCheckSize) - { - wxScreenDC vDc; - - vDc.SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT)); - - // - // The height of a standard button in the dialog units is 8, - // translate this to pixels (as one dialog unit is precisely equal to - // 8 character heights, it's just the char height) - // - nCheckSize = vDc.GetCharHeight(); - } - - int nWidthCheckbox; - int nHeightCheckbox; - wxString sStr = wxGetWindowText(GetHWND()); - - if (!sStr.IsEmpty()) + // We should probably compute nCheckSize but it seems to be a constant + // independent of its label's font size and not made available by OS/2. + int nCheckSize = RADIO_SIZE; + int nWidthCheckbox; + int nHeightCheckbox; + wxString sStr = wxGetWindowText(GetHWND()); + + if (!sStr.empty()) { GetTextExtent( sStr ,&nWidthCheckbox ,&nHeightCheckbox ); - nWidthCheckbox += nCheckSize + GetCharWidth(); + nWidthCheckbox += nCheckSize; if (nHeightCheckbox < nCheckSize) nHeightCheckbox = nCheckSize; @@ -183,14 +124,10 @@ wxSize wxCheckBox::DoGetBestSize() const nHeightCheckbox = nCheckSize; } - return wxSize( nWidthCheckbox - ,nHeightCheckbox - ); + return wxSize( nWidthCheckbox, nHeightCheckbox ); } // end of wxCheckBox::DoGetBestSize -void wxCheckBox::SetValue( - bool bValue -) +void wxCheckBox::SetValue( bool bValue ) { ::WinSendMsg(GetHwnd(), BM_SETCHECK, (MPARAM)bValue, 0); } // end of wxCheckBox::SetValue @@ -204,9 +141,7 @@ bool wxCheckBox::GetValue() const return((LONGFROMMR(::WinSendMsg(GetHwnd(), BM_QUERYCHECK, (MPARAM)0, (MPARAM)0)) == 1L)); } // end of wxCheckBox::GetValue -void wxCheckBox::Command ( - wxCommandEvent& rEvent -) +void wxCheckBox::Command ( wxCommandEvent& rEvent ) { SetValue((rEvent.GetInt() != 0)); ProcessCommand(rEvent); @@ -216,18 +151,14 @@ void wxCheckBox::Command ( // wxBitmapCheckBox // ---------------------------------------------------------------------------- -bool wxBitmapCheckBox::Create( - wxWindow* pParent -, wxWindowID vId -, const wxBitmap* pLabel -, const wxPoint& rPos -, const wxSize& rSize -, long lStyle -#if wxUSE_VALIDATORS -, const wxValidator& rValidator -#endif -, const wxString& rsName -) +bool wxBitmapCheckBox::Create( wxWindow* pParent, + wxWindowID vId, + const wxBitmap* WXUNUSED(pLabel), + const wxPoint& rPos, + const wxSize& rSize, + long lStyle, + const wxValidator& rValidator, + const wxString& rsName) { SetName(rsName); #if wxUSE_VALIDATORS @@ -270,13 +201,10 @@ bool wxBitmapCheckBox::Create( ); ::WinShowWindow(hButton, TRUE); - return TRUE; + return true; } // end of wxBitmapCheckBox::Create -void wxBitmapCheckBox::SetLabel( - const wxBitmap& rBitmap -) +void wxBitmapCheckBox::SetLabel( const wxBitmap& WXUNUSED(rBitmap) ) { wxFAIL_MSG(wxT("not implemented")); } // end of wxBitmapCheckBox::SetLabel -