X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/936525578d838199cf0592e0f89f0a14550398c6..81fb185e4f837355335c4c8831e1a0c1a1bd1334:/include/wx/arrstr.h

diff --git a/include/wx/arrstr.h b/include/wx/arrstr.h
index 3bc11f0655..33a2f05de1 100644
--- a/include/wx/arrstr.h
+++ b/include/wx/arrstr.h
@@ -87,6 +87,17 @@ 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
@@ -97,7 +108,7 @@ public:
 // 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)))
+#if !defined(__VISUALC6__) || !(defined(WXMAKINGDLL) || defined(WXUSINGDLL))
     #define wxHAS_VECTOR_TEMPLATE_ASSIGN
 #endif
 
@@ -165,7 +176,7 @@ public:
   wxString& Item(size_t nIndex) const
     {
         wxASSERT_MSG( nIndex < m_nCount,
-                      _T("wxArrayString: index out of bounds") );
+                      wxT("wxArrayString: index out of bounds") );
 
         return m_pItems[nIndex];
     }
@@ -176,7 +187,7 @@ public:
   wxString& Last() const
   {
       wxASSERT_MSG( !IsEmpty(),
-                    _T("wxArrayString: index out of bounds") );
+                    wxT("wxArrayString: index out of bounds") );
       return Item(GetCount() - 1);
   }