Fix setting the fonts for wxMSW wxTextCtrl with wxTE_RICH(2) style.

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

diff --git a/include/wx/arrstr.h b/include/wx/arrstr.h
index 3bc11f06555c41b22b9faf5f1254410c3a69636e..33a2f05de1d90dd32aa86d92c0e06189c47e6134 100644 (file)
--- 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;
     }
 
     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
 };
 
 #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
 // 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
 
     #define wxHAS_VECTOR_TEMPLATE_ASSIGN
 #endif
 


@@ -165,7 +176,7 @@ public:
   wxString& Item(size_t nIndex) const
     {
         wxASSERT_MSG( nIndex < m_nCount,
   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];
     }
 
         return m_pItems[nIndex];
     }


@@ -176,7 +187,7 @@ public:
   wxString& Last() const
   {
       wxASSERT_MSG( !IsEmpty(),
   wxString& Last() const
   {
       wxASSERT_MSG( !IsEmpty(),

-                    _T("wxArrayString: index out of bounds") );
+                    wxT("wxArrayString: index out of bounds") );

       return Item(GetCount() - 1);
   }
 
       return Item(GetCount() - 1);
   }