X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1c089c47f344926e2f95a8aa342992ed844fe609..c2dd8380badebac8dc01f8948288235ae91056ed:/src/msw/checklst.cpp?ds=inline diff --git a/src/msw/checklst.cpp b/src/msw/checklst.cpp index 51fd72182e..f0c2c0ee23 100644 --- a/src/msw/checklst.cpp +++ b/src/msw/checklst.cpp @@ -47,7 +47,7 @@ class wxCheckListBoxItem : public wxOwnerDrawn { public: // ctor - wxCheckListBoxItem(wxCheckListBox *pParent, uint nIndex); + wxCheckListBoxItem(wxCheckListBox *pParent, size_t nIndex); // drawing functions virtual bool OnDrawItem(wxDC& dc, const wxRect& rc, wxODAction act, wxODStatus stat); @@ -60,10 +60,10 @@ public: private: bool m_bChecked; wxCheckListBox *m_pParent; - uint m_nIndex; + size_t m_nIndex; }; -wxCheckListBoxItem::wxCheckListBoxItem(wxCheckListBox *pParent, uint nIndex) +wxCheckListBoxItem::wxCheckListBoxItem(wxCheckListBox *pParent, size_t nIndex) : wxOwnerDrawn("", TRUE) // checkable { m_bChecked = FALSE; @@ -95,7 +95,7 @@ bool wxCheckListBoxItem::OnDrawItem(wxDC& dc, const wxRect& rc, if ( wxOwnerDrawn::OnDrawItem(dc, rc, act, stat) ) { // ## using native API for performance and precision - uint nCheckWidth = GetDefaultMarginWidth(), + size_t nCheckWidth = GetDefaultMarginWidth(), nCheckHeight = m_pParent->GetItemHeight(); int x = rc.GetX(), @@ -188,8 +188,8 @@ void wxCheckListBoxItem::Toggle() { m_bChecked = !m_bChecked; - uint nHeight = m_pParent->GetItemHeight(); - uint y = m_nIndex * nHeight; + size_t nHeight = m_pParent->GetItemHeight(); + size_t y = m_nIndex * nHeight; RECT rcUpdate = { 0, y, GetDefaultMarginWidth(), y + nHeight}; InvalidateRect((HWND)m_pParent->GetHWND(), &rcUpdate, FALSE); @@ -219,10 +219,10 @@ wxCheckListBox::wxCheckListBox() : wxListBox() } // ctor which creates the associated control -wxCheckListBox::wxCheckListBox(wxWindow *parent, const wxWindowID id, +wxCheckListBox::wxCheckListBox(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size, - const int nStrings, const wxString choices[], - const long style, const wxValidator& val, + int nStrings, const wxString choices[], + long style, const wxValidator& val, const wxString& name) // , const wxFont& font) // don't use ctor with arguments! we must call Create() // ourselves from here. @@ -236,7 +236,7 @@ wxCheckListBox::wxCheckListBox(wxWindow *parent, const wxWindowID id, // -------------------- // create a check list box item -wxOwnerDrawn *wxCheckListBox::CreateItem(uint nIndex) +wxOwnerDrawn *wxCheckListBox::CreateItem(size_t nIndex) { wxCheckListBoxItem *pItem = new wxCheckListBoxItem(this, nIndex); if ( m_windowFont.Ok() ) @@ -270,12 +270,12 @@ bool wxCheckListBox::MSWOnMeasure(WXMEASUREITEMSTRUCT *item) // check items // ----------- -bool wxCheckListBox::IsChecked(uint uiIndex) const +bool wxCheckListBox::IsChecked(size_t uiIndex) const { return GetItem(uiIndex)->IsChecked(); } -void wxCheckListBox::Check(uint uiIndex, bool bCheck) +void wxCheckListBox::Check(size_t uiIndex, bool bCheck) { GetItem(uiIndex)->Check(bCheck); } @@ -296,8 +296,8 @@ void wxCheckListBox::OnLeftClick(wxMouseEvent& event) // clicking on the item selects it, clicking on the checkmark toggles if ( event.GetX() <= wxOwnerDrawn::GetDefaultMarginWidth() ) { // # better use LB_ITEMFROMPOINT perhaps? - uint nItem = ((uint)event.GetY()) / m_nItemHeight; - if ( nItem < (uint)m_noItems ) + size_t nItem = ((size_t)event.GetY()) / m_nItemHeight; + if ( nItem < (size_t)m_noItems ) GetItem(nItem)->Toggle(); //else: it's not an error, just click outside of client zone }