X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8ba7c77150d74a5385f2385e5448ca491263179f..d66551669c4090dfee52fd104a1c2c1f5031c92d:/include/wx/ctrlsub.h?ds=sidebyside

diff --git a/include/wx/ctrlsub.h b/include/wx/ctrlsub.h
index 1736c324e6..ff5f02fe57 100644
--- a/include/wx/ctrlsub.h
+++ b/include/wx/ctrlsub.h
@@ -12,9 +12,7 @@
 #ifndef _WX_CTRLSUB_H_BASE_
 #define _WX_CTRLSUB_H_BASE_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "controlwithitems.h"
-#endif
+#include "wx/defs.h"
 
 #if wxUSE_CONTROLS
 
@@ -46,7 +44,22 @@ public:
     virtual wxString GetString(int n) const = 0;
     wxArrayString GetStrings() const;
     virtual void SetString(int n, const wxString& s) = 0;
-    virtual int FindString(const wxString& s) const = 0;
+
+    // finding string natively is either case sensitive or insensitive
+    // but never both so fall back to this base version for not
+    // supported search type
+    virtual int FindString(const wxString& s, bool bCase = false) const
+    {
+        int count = GetCount();
+
+        for ( int i = 0; i < count ; i ++ )
+        {
+            if (GetString(i).IsSameAs( s , bCase ))
+                return i;
+        }
+
+        return wxNOT_FOUND;
+    }
 
 
     // selection
@@ -65,6 +78,11 @@ public:
     // reads better for multi-selection ones
     void Select(int n) { SetSelection(n); }
 
+
+protected:
+
+    // check that the index is valid
+    inline bool IsValid(int n) const { return n >= 0 && n < GetCount(); }
 };
 
 class WXDLLEXPORT wxItemContainer : public wxItemContainerImmutable
@@ -205,4 +223,3 @@ inline int wxItemContainer::Number() const
 #endif // wxUSE_CONTROLS
 
 #endif // _WX_CTRLSUB_H_BASE_
-