avoid unimplemented wx stubs being used

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

diff --git a/include/wx/string.h b/include/wx/string.h
index 3713e7b0954e711a44b8be83172397dfdd3c69f3..2daf622c901a167e94efe8d71a6825ed0bd670bb 100644 (file)
--- a/include/wx/string.h
+++ b/include/wx/string.h
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        string.h
+// Name:        wx/string.h

 // Purpose:     wxString and wxArrayString classes
 // Author:      Vadim Zeitlin
 // Modified by:
 // Purpose:     wxString and wxArrayString classes
 // Author:      Vadim Zeitlin
 // Modified by:


@@ -11,7 +11,7 @@
 
 /*
     Efficient string class [more or less] compatible with MFC CString,
 
 /*
     Efficient string class [more or less] compatible with MFC CString,

-    wxWindows version 1 wxString and std::string and some handy functions
+    wxWidgets version 1 wxString and std::string and some handy functions

     missing from string.h.
 */
 
     missing from string.h.
 */
 


@@ -47,9 +47,9 @@
 #  include <stdlib.h>
 #endif
 
 #  include <stdlib.h>
 #endif
 

-#ifdef HAVE_STRINGS_H
+#ifdef HAVE_STRCASECMP_IN_STRINGS_H

     #include <strings.h>    // for strcasecmp()
     #include <strings.h>    // for strcasecmp()

-#endif // HAVE_STRINGS_H
+#endif // HAVE_STRCASECMP_IN_STRINGS_H

 
 #include "wx/wxchar.h"      // for wxChar
 #include "wx/buffer.h"      // for wxCharBuffer
 
 #include "wx/wxchar.h"      // for wxChar
 #include "wx/buffer.h"      // for wxCharBuffer


@@ -134,7 +134,9 @@ inline int Stricmp(const char *psz1, const char *psz2)
   return stricmp(psz1, psz2);
 #elif defined(__WXPM__)
   return stricmp(psz1, psz2);
   return stricmp(psz1, psz2);
 #elif defined(__WXPM__)
   return stricmp(psz1, psz2);

-#elif defined(__UNIX__) || defined(__GNUWIN32__)
+#elif defined(HAVE_STRCASECMP_IN_STRING_H) || \
+      defined(HAVE_STRCASECMP_IN_STRINGS_H) || \
+      defined(__GNUWIN32__)

   return strcasecmp(psz1, psz2);
 #elif defined(__MWERKS__) && !defined(__INTEL__)
   register char c1, c2;
   return strcasecmp(psz1, psz2);
 #elif defined(__MWERKS__) && !defined(__INTEL__)
   register char c1, c2;


@@ -216,7 +218,7 @@ struct WXDLLIMPEXP_BASE wxStringData
 
   // VC++ will refuse to inline Unlock but profiling shows that it is wrong
 #if defined(__VISUALC__) && (__VISUALC__ >= 1200)
 
   // VC++ will refuse to inline Unlock but profiling shows that it is wrong
 #if defined(__VISUALC__) && (__VISUALC__ >= 1200)

-       __forceinline
+  __forceinline

 #endif
   // VC++ free must take place in same DLL as allocation when using non dll
   // run-time library (e.g. Multithreaded instead of Multithreaded DLL)
 #endif
   // VC++ free must take place in same DLL as allocation when using non dll
   // run-time library (e.g. Multithreaded instead of Multithreaded DLL)


@@ -331,21 +333,21 @@ public:
   wxStringBase(const void *pStart, const void *pEnd);
 
     // dtor is not virtual, this class must not be inherited from!
   wxStringBase(const void *pStart, const void *pEnd);
 
     // dtor is not virtual, this class must not be inherited from!

-  ~wxStringBase() 
-  { 
+  ~wxStringBase()
+  {

 #if defined(__VISUALC__) && (__VISUALC__ >= 1200)
 #if defined(__VISUALC__) && (__VISUALC__ >= 1200)

-       //RN - according to the above VC++ does indeed inline this,
-       //even though it spits out two warnings
-       #pragma warning (disable:4714)
+      //RN - according to the above VC++ does indeed inline this,
+      //even though it spits out two warnings
+      #pragma warning (disable:4714)

 #endif
 
 #endif
 

-         GetStringData()->Unlock(); 
+      GetStringData()->Unlock();

   }
 
 #if defined(__VISUALC__) && (__VISUALC__ >= 1200)
   }
 
 #if defined(__VISUALC__) && (__VISUALC__ >= 1200)

-       //re-enable inlining warning
-       #pragma warning (default:4714)
-#endif  
+    //re-enable inlining warning
+    #pragma warning (default:4714)
+#endif

   // overloaded assignment
     // from another wxString
   wxStringBase& operator=(const wxStringBase& stringSrc);
   // overloaded assignment
     // from another wxString
   wxStringBase& operator=(const wxStringBase& stringSrc);


@@ -427,9 +429,9 @@ public:
   const_iterator end() const { return m_pchData + length(); }
 
   // first valid index position
   const_iterator end() const { return m_pchData + length(); }
 
   // first valid index position

-  iterator begin() { CopyBeforeWrite(); return m_pchData; }
+  iterator begin();

   // position one after the last valid one
   // position one after the last valid one

-  iterator end() { CopyBeforeWrite(); return m_pchData + length(); }
+  iterator end();

 
     // insert another string
   wxStringBase& insert(size_t nPos, const wxStringBase& str)
 
     // insert another string
   wxStringBase& insert(size_t nPos, const wxStringBase& str)


@@ -452,7 +454,7 @@ public:
   wxStringBase& insert(size_t nPos, size_t n, wxChar ch)
     { return insert(nPos, wxStringBase(n, ch)); }
   iterator insert(iterator it, wxChar ch)
   wxStringBase& insert(size_t nPos, size_t n, wxChar ch)
     { return insert(nPos, wxStringBase(n, ch)); }
   iterator insert(iterator it, wxChar ch)

-    { size_t idx = it - begin(); insert(idx, 1, ch); return begin() + idx; } 
+    { size_t idx = it - begin(); insert(idx, 1, ch); return begin() + idx; }

   void insert(iterator it, const_iterator first, const_iterator last)
     { insert(it - begin(), first, last - first); }
   void insert(iterator it, size_type n, wxChar ch)
   void insert(iterator it, const_iterator first, const_iterator last)
     { insert(it - begin(), first, last - first); }
   void insert(iterator it, size_type n, wxChar ch)


@@ -673,8 +675,6 @@ public:
 
 #if wxUSE_UNICODE
     // from multibyte string
 
 #if wxUSE_UNICODE
     // from multibyte string

-    // (NB: nLength is right now number of Unicode characters, not
-    //  characters in psz! So try not to use it yet!)

   wxString(const char *psz, wxMBConv& conv, size_t nLength = npos);
     // from wxWCharBuffer (i.e. return from wxGetString)
   wxString(const wxWCharBuffer& psz) : wxStringBase(psz.data()) { }
   wxString(const char *psz, wxMBConv& conv, size_t nLength = npos);
     // from wxWCharBuffer (i.e. return from wxGetString)
   wxString(const wxWCharBuffer& psz) : wxStringBase(psz.data()) { }


@@ -690,7 +690,7 @@ public:
 
     // from wxCharBuffer
   wxString(const wxCharBuffer& psz)
 
     // from wxCharBuffer
   wxString(const wxCharBuffer& psz)

-      : wxStringBase(psz, npos) { }
+      : wxStringBase(psz) { }

 #endif // Unicode/ANSI
 
   // generic attributes & operations
 #endif // Unicode/ANSI
 
   // generic attributes & operations


@@ -1093,7 +1093,7 @@ public:
   void UngetWriteBuf(size_t nLen);
 #endif
 
   void UngetWriteBuf(size_t nLen);
 #endif
 

-  // wxWindows version 1 compatibility functions
+  // wxWidgets version 1 compatibility functions

 
   // use Mid()
   wxString SubString(size_t from, size_t to) const
 
   // use Mid()
   wxString SubString(size_t from, size_t to) const


@@ -1149,7 +1149,7 @@ public:
       : wxStringBase(str, nPos, nLen) { }
     // take all characters from pStart to pEnd
   wxString(const void *pStart, const void *pEnd)
       : wxStringBase(str, nPos, nLen) { }
     // take all characters from pStart to pEnd
   wxString(const void *pStart, const void *pEnd)

-      : wxStringBase((const char*)pStart, (const char*)pEnd) { }
+      : wxStringBase((const wxChar*)pStart, (const wxChar*)pEnd) { }

 #if wxUSE_STL
   wxString(const_iterator first, const_iterator last)
       : wxStringBase(first, last) { }
 #if wxUSE_STL
   wxString(const_iterator first, const_iterator last)
       : wxStringBase(first, last) { }


@@ -1222,7 +1222,7 @@ public:
   wxString& insert(size_t nPos, size_t n, wxChar ch)
     { return (wxString&)wxStringBase::insert(nPos, n, ch); }
   iterator insert(iterator it, wxChar ch)
   wxString& insert(size_t nPos, size_t n, wxChar ch)
     { return (wxString&)wxStringBase::insert(nPos, n, ch); }
   iterator insert(iterator it, wxChar ch)

-    { return wxStringBase::insert(it, ch); } 
+    { return wxStringBase::insert(it, ch); }

   void insert(iterator it, const_iterator first, const_iterator last)
     { wxStringBase::insert(it, first, last); }
   void insert(iterator it, size_type n, wxChar ch)
   void insert(iterator it, const_iterator first, const_iterator last)
     { wxStringBase::insert(it, first, last); }
   void insert(iterator it, size_type n, wxChar ch)