Don't call IAutoComplete::Init() twice for the same control as this leaks memory...

[wxWidgets.git] / include / wx / arrstr.h

diff --git a/include/wx/arrstr.h b/include/wx/arrstr.h
index 14c291b2494d3219dc42027e34754dc1e7e4292f..9e6ec1a392e5d5a2337485756229d47fe735eec0 100644 (file)
--- a/include/wx/arrstr.h
+++ b/include/wx/arrstr.h
@@ -87,15 +87,30 @@ public:
     }
 
     int Index(const wxString& str, bool bCase = true, bool bFromEnd = false) const;
+
+private:
+    void Insert()
+    {
+        wxFAIL_MSG( "wxSortedArrayString::Insert() is not to be used" );
+    }
+
+    void Sort()
+    {
+        wxFAIL_MSG( "wxSortedArrayString::Sort() is not to be used" );
+    }
 };
 
 #else // if !wxUSE_STL
 
 // this shouldn't be defined for compilers not supporting template methods or
-// without std::distance() -- and if all of the currently supported compilers
-// do have it, then it can just be removed and wxHAS_VECTOR_TEMPLATE_ASSIGN
-// code always used
-#define wxHAS_VECTOR_TEMPLATE_ASSIGN
+// without std::distance()
+//
+// FIXME-VC6: currently it's only not defined for VC6 in DLL build as it
+//            doesn't export template methods from DLL correctly so even though
+//            it compiles them fine, we get link errors when using wxArrayString
+#if !defined(__VISUALC6__) || !(defined(WXMAKINGDLL) || defined(WXUSINGDLL))
+    #define wxHAS_VECTOR_TEMPLATE_ASSIGN
+#endif
 
 #ifdef wxHAS_VECTOR_TEMPLATE_ASSIGN
     #include "wx/beforestd.h"