Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Line-up interfaces to use size_t for GetCount()s (and count related api).

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38076 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2006-03-14 19:44:45 +00:00
parent afbe150a76
commit 8228b8932a
79 changed files with 667 additions and 745 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/wx/ctrlsub.h
View File

@@ -38,7 +38,7 @@ public:
// accessing strings
// -----------------
virtual int GetCount() const = 0;
virtual size_t GetCount() const = 0;
bool IsEmpty() const { return GetCount() == 0; }
virtual wxString GetString(int n) const = 0;
@@ -50,9 +50,9 @@ public:
// supported search type
virtual int FindString(const wxString& s, bool bCase = false) const
{
int count = GetCount();
size_t count = GetCount();
for ( int i = 0; i < count ; i ++ )
for ( size_t i = 0; i < count ; ++i )
{
if (GetString(i).IsSameAs( s , bCase ))
return i;
@@ -82,7 +82,9 @@ public:
protected:
// check that the index is valid
inline bool IsValid(int n) const { return n >= 0 && n < GetCount(); }
// FIXME: once api will move to size_t, drop >= 0 check
inline bool IsValid(int n) const { return n >= 0 && (size_t)n < GetCount(); }
inline bool IsValidInsert(int n) const { return n >= 0 && (size_t)n <= GetCount(); }
};
class WXDLLEXPORT wxItemContainer : public wxItemContainerImmutable