X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8228b8932abaedadbf9568bb3a1eef3ae25fb2a3..f9c240ec1e568d34f861dad705f6074ed2c1dac2:/src/msw/wince/checklst.cpp diff --git a/src/msw/wince/checklst.cpp b/src/msw/wince/checklst.cpp index 0c4a31c527..d2ce744d1f 100644 --- a/src/msw/wince/checklst.cpp +++ b/src/msw/wince/checklst.cpp @@ -21,16 +21,16 @@ #include "wx/wxprec.h" #ifdef __BORLANDC__ -#pragma hdrstop + #pragma hdrstop #endif #if wxUSE_CHECKLISTBOX +#include "wx/checklst.h" + #ifndef WX_PRECOMP #endif -#include "wx/checklst.h" - // include "properly" #include "wx/msw/wrapcctl.h" @@ -154,7 +154,7 @@ void wxCheckListBox::OnSize(wxSizeEvent& event) // misc overloaded methods // ----------------------- -void wxCheckListBox::Delete(int n) +void wxCheckListBox::Delete(unsigned int n) { wxCHECK_RET( IsValid( n ), _T("invalid index in wxCheckListBox::Delete") ); @@ -168,7 +168,7 @@ void wxCheckListBox::Delete(int n) // check items // ----------- -bool wxCheckListBox::IsChecked(size_t uiIndex) const +bool wxCheckListBox::IsChecked(unsigned int uiIndex) const { wxCHECK_MSG( IsValid( uiIndex ), false, _T("invalid index in wxCheckListBox::IsChecked") ); @@ -176,7 +176,7 @@ bool wxCheckListBox::IsChecked(size_t uiIndex) const return (ListView_GetCheckState(((HWND)GetHWND()), uiIndex) != 0); } -void wxCheckListBox::Check(size_t uiIndex, bool bCheck) +void wxCheckListBox::Check(unsigned int uiIndex, bool bCheck) { wxCHECK_RET( IsValid( uiIndex ), _T("invalid index in wxCheckListBox::Check") ); @@ -189,7 +189,7 @@ void wxCheckListBox::Check(size_t uiIndex, bool bCheck) void wxCheckListBox::Clear() { - int n = (int)GetCount(); + unsigned int n = GetCount(); while ( n > 0 ) { @@ -203,15 +203,15 @@ void wxCheckListBox::Clear() _T("broken wxCheckListBox::Clear()") ); } -size_t wxCheckListBox::GetCount() const +unsigned int wxCheckListBox::GetCount() const { - return (size_t)ListView_GetItemCount( (HWND)GetHWND() ); + return (unsigned int)ListView_GetItemCount( (HWND)GetHWND() ); } int wxCheckListBox::GetSelection() const { int i; - for (i = 0; (size_t)i < GetCount(); i++) + for (i = 0; (unsigned int)i < GetCount(); i++) { int selState = ListView_GetItemState(GetHwnd(), i, LVIS_SELECTED); if (selState == LVIS_SELECTED) @@ -224,7 +224,7 @@ int wxCheckListBox::GetSelection() const int wxCheckListBox::GetSelections(wxArrayInt& aSelections) const { int i; - for (i = 0; (size_t)i < GetCount(); i++) + for (i = 0; (unsigned int)i < GetCount(); i++) { int selState = ListView_GetItemState(GetHwnd(), i, LVIS_SELECTED); if (selState == LVIS_SELECTED) @@ -234,7 +234,7 @@ int wxCheckListBox::GetSelections(wxArrayInt& aSelections) const return aSelections.GetCount(); } -wxString wxCheckListBox::GetString(int n) const +wxString wxCheckListBox::GetString(unsigned int n) const { const int bufSize = 513; wxChar buf[bufSize]; @@ -250,7 +250,7 @@ bool wxCheckListBox::IsSelected(int n) const return (selState == LVIS_SELECTED); } -void wxCheckListBox::SetString(int n, const wxString& s) +void wxCheckListBox::SetString(unsigned int n, const wxString& s) { wxCHECK_RET( IsValid( n ), _T("invalid index in wxCheckListBox::SetString") ); @@ -273,22 +273,22 @@ int wxCheckListBox::DoAppend(const wxString& item) return ret; } -void* wxCheckListBox::DoGetItemClientData(int n) const +void* wxCheckListBox::DoGetItemClientData(unsigned int n) const { return m_itemsClientData.Item(n); } -wxClientData* wxCheckListBox::DoGetItemClientObject(int n) const +wxClientData* wxCheckListBox::DoGetItemClientObject(unsigned int n) const { return (wxClientData *)DoGetItemClientData(n); } -void wxCheckListBox::DoInsertItems(const wxArrayString& items, int pos) +void wxCheckListBox::DoInsertItems(const wxArrayString& items, unsigned int pos) { wxCHECK_RET( IsValidInsert( pos ), wxT("invalid index in wxListBox::InsertItems") ); - for( size_t i = 0; i < items.GetCount(); i++ ) + for( unsigned int i = 0; i < items.GetCount(); i++ ) { LVITEM newItem; wxZeroMemory(newItem); @@ -311,12 +311,12 @@ void wxCheckListBox::DoSetFirstItem(int n) ListView_Scroll( (HWND)GetHWND(), 0, ppt.y ); } -void wxCheckListBox::DoSetItemClientData(int n, void* clientData) +void wxCheckListBox::DoSetItemClientData(unsigned int n, void* clientData) { m_itemsClientData.Item(n) = clientData; } -void wxCheckListBox::DoSetItemClientObject(int n, wxClientData* clientData) +void wxCheckListBox::DoSetItemClientObject(unsigned int n, wxClientData* clientData) { DoSetItemClientData(n, clientData); } @@ -325,7 +325,7 @@ void wxCheckListBox::DoSetItems(const wxArrayString& items, void **clientData) { ListView_SetItemCount( GetHwnd(), GetCount() + items.GetCount() ); - for( size_t i = 0; i < items.GetCount(); i++ ) + for( unsigned int i = 0; i < items.GetCount(); i++ ) { int pos = Append(items[i]); if( pos >= 0 && clientData )