X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/853dcc57c6e5ba58e9e546c65ca4965256f3ac21..4b3feaa75de76963492c4202be04be9bf20b321f:/include/wx/ctrlsub.h?ds=sidebyside

diff --git a/include/wx/ctrlsub.h b/include/wx/ctrlsub.h
index ff5f02fe57..216ab3ab4a 100644
--- a/include/wx/ctrlsub.h
+++ b/include/wx/ctrlsub.h
@@ -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
@@ -134,12 +136,6 @@ public:
     bool HasClientUntypedData() const
         { return m_clientDataItemsType == wxClientData_Void; }
 
-#if WXWIN_COMPATIBILITY_2_2
-    // compatibility - these functions are deprecated, use the new ones
-    // instead
-    wxDEPRECATED( int Number() const );
-#endif // WXWIN_COMPATIBILITY_2_2
-
 protected:
     virtual int DoAppend(const wxString& item) = 0;
     virtual int DoInsert(const wxString& item, int pos) = 0;
@@ -203,6 +199,7 @@ protected:
     virtual void SetInitialBestSize(const wxSize& WXUNUSED(size)) { }
 
 private:
+    DECLARE_ABSTRACT_CLASS(wxControlWithItems)
     DECLARE_NO_COPY_CLASS(wxControlWithItems)
 };
 
@@ -211,15 +208,6 @@ private:
 // inline functions
 // ----------------------------------------------------------------------------
 
-#if WXWIN_COMPATIBILITY_2_2
-
-inline int wxItemContainer::Number() const
-{
-    return GetCount();
-}
-
-#endif // WXWIN_COMPATIBILITY_2_2
-
 #endif // wxUSE_CONTROLS
 
 #endif // _WX_CTRLSUB_H_BASE_