X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c5491b21d93690a81a77c038cf7c38c4984b160f..11aac4baa6172481674b017e8529ad7ef18758fd:/src/msw/wince/checklst.cpp diff --git a/src/msw/wince/checklst.cpp b/src/msw/wince/checklst.cpp index 56b519b537..7f14ed6c63 100644 --- a/src/msw/wince/checklst.cpp +++ b/src/msw/wince/checklst.cpp @@ -21,18 +21,16 @@ #include "wx/wxprec.h" #ifdef __BORLANDC__ -#pragma hdrstop + #pragma hdrstop #endif #if wxUSE_CHECKLISTBOX -#ifndef WX_PRECOMP -#endif - #include "wx/checklst.h" -// include "properly" -#include "wx/msw/wrapcctl.h" +#ifndef WX_PRECOMP + #include "wx/msw/wrapcctl.h" // include "properly" +#endif // ============================================================================ // implementation @@ -118,7 +116,7 @@ bool wxCheckListBox::Create(wxWindow *parent, wxWindowID id, m_itemsClientData.SetCount(n); // now we can compute our best size correctly, so do it if necessary - SetBestSize(size); + SetInitialSize(size); return true; } @@ -154,10 +152,9 @@ void wxCheckListBox::OnSize(wxSizeEvent& event) // misc overloaded methods // ----------------------- -void wxCheckListBox::Delete(int n) +void wxCheckListBox::Delete(unsigned int n) { - wxCHECK_RET( n >= 0 && n < GetCount(), - _T("invalid index in wxCheckListBox::Delete") ); + wxCHECK_RET( IsValid( n ), _T("invalid index in wxCheckListBox::Delete") ); if ( !ListView_DeleteItem(GetHwnd(), n) ) { @@ -169,17 +166,17 @@ void wxCheckListBox::Delete(int n) // check items // ----------- -bool wxCheckListBox::IsChecked(size_t uiIndex) const +bool wxCheckListBox::IsChecked(unsigned int uiIndex) const { - wxCHECK_MSG( uiIndex < (size_t)GetCount(), false, + wxCHECK_MSG( IsValid( uiIndex ), false, _T("invalid index in wxCheckListBox::IsChecked") ); 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( uiIndex < (size_t)GetCount(), + wxCHECK_RET( IsValid( uiIndex ), _T("invalid index in wxCheckListBox::Check") ); ListView_SetCheckState(((HWND)GetHWND()), uiIndex, bCheck) @@ -190,7 +187,7 @@ void wxCheckListBox::Check(size_t uiIndex, bool bCheck) void wxCheckListBox::Clear() { - int n = GetCount(); + unsigned int n = GetCount(); while ( n > 0 ) { @@ -204,15 +201,15 @@ void wxCheckListBox::Clear() _T("broken wxCheckListBox::Clear()") ); } -int wxCheckListBox::GetCount() const +unsigned int wxCheckListBox::GetCount() const { - return ListView_GetItemCount( (HWND)GetHWND() ); + return (unsigned int)ListView_GetItemCount( (HWND)GetHWND() ); } int wxCheckListBox::GetSelection() const { int i; - for (i = 0; i < GetCount(); i++) + for (i = 0; (unsigned int)i < GetCount(); i++) { int selState = ListView_GetItemState(GetHwnd(), i, LVIS_SELECTED); if (selState == LVIS_SELECTED) @@ -225,7 +222,7 @@ int wxCheckListBox::GetSelection() const int wxCheckListBox::GetSelections(wxArrayInt& aSelections) const { int i; - for (i = 0; i < GetCount(); i++) + for (i = 0; (unsigned int)i < GetCount(); i++) { int selState = ListView_GetItemState(GetHwnd(), i, LVIS_SELECTED); if (selState == LVIS_SELECTED) @@ -235,7 +232,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]; @@ -251,9 +248,9 @@ 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( n < GetCount(), + wxCHECK_RET( IsValid( n ), _T("invalid index in wxCheckListBox::SetString") ); wxChar *buf = new wxChar[s.length()+1]; wxStrcpy(buf, s.c_str()); @@ -263,7 +260,7 @@ void wxCheckListBox::SetString(int n, const wxString& s) int wxCheckListBox::DoAppend(const wxString& item) { - int n = GetCount(); + int n = (int)GetCount(); LVITEM newItem; wxZeroMemory(newItem); newItem.iItem = n; @@ -274,22 +271,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( pos >= 0 && pos <= GetCount(), + 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); @@ -312,12 +309,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); } @@ -326,7 +323,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 )