X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f9eee2db810695ae4417e9935475f268bb68bbac..0966d1fe2639772efab156387f95f63ce766bf17:/src/os2/checklst.cpp diff --git a/src/os2/checklst.cpp b/src/os2/checklst.cpp index ec5776444d..e1883b8545 100644 --- a/src/os2/checklst.cpp +++ b/src/os2/checklst.cpp @@ -226,9 +226,6 @@ void wxCheckListBoxItem::Check ( m_nIndex = (size_t)nIndex; } - HWND hWndListbox = (HWND)m_pParent->GetHWND(); - RECTL rUpdate; - MRESULT mRc; wxCommandEvent vEvent( wxEVT_COMMAND_CHECKLISTBOX_TOGGLED ,m_pParent->GetId() @@ -291,6 +288,31 @@ wxCheckListBox::wxCheckListBox ( ); } // end of wxCheckListBox::wxCheckListBox +wxCheckListBox::wxCheckListBox ( + wxWindow* pParent +, wxWindowID vId +, const wxPoint& rPos +, const wxSize& rSize +, const wxArrayString& asChoices +, long lStyle +, const wxValidator& rVal +, const wxString& rsName +) + : wxListBox() +{ + wxCArrayString chs(asChoices); + Create( pParent + ,vId + ,rPos + ,rSize + ,chs.GetCount() + ,chs.GetStrings() + ,lStyle | wxLB_OWNERDRAW + ,rVal + ,rsName + ); +} // end of wxCheckListBox::wxCheckListBox + void wxCheckListBox::Delete( int N ) @@ -420,7 +442,7 @@ void wxCheckListBox::OnChar ( wxKeyEvent& rEvent ) { - if (rEvent.KeyCode() == WXK_SPACE) + if (rEvent.GetKeyCode() == WXK_SPACE) GetItem(GetSelection())->Toggle(); else rEvent.Skip(); @@ -443,7 +465,7 @@ void wxCheckListBox::OnLeftClick ( ,&nParentHeight ); vDc.SetFont(GetFont()); - vHeight = vDc.GetCharHeight() * 2.5; + vHeight = (wxCoord)(vDc.GetCharHeight() * 2.5); // // This, of course, will not work if the LB is scrolled