wxFont can now raelly use the native fonts

[wxWidgets.git] / src / common / string.cpp

diff --git a/src/common/string.cpp b/src/common/string.cpp
index 3fdcf1e0de455fd04cd125877be0fb605ad5c668..b45a1482a020d4bf564b139456d0f1bda485f849 100644 (file)
--- a/src/common/string.cpp
+++ b/src/common/string.cpp
@@ -38,8 +38,6 @@
   #include "wx/thread.h"
 #endif
 
   #include "wx/thread.h"
 #endif
 

-#include "wx/regex.h"   // for wxString::Matches()
-

 #include <ctype.h>
 #include <string.h>
 #include <stdlib.h>
 #include <ctype.h>
 #include <string.h>
 #include <stdlib.h>


@@ -135,7 +133,7 @@ extern const wxChar WXDLLEXPORT *wxEmptyString = &g_strEmpty.dummy;
     #endif //compiler
 #endif // no vsnprintf
 
     #endif //compiler
 #endif // no vsnprintf
 

-#ifdef _AIX
+#if defined(_AIX)

   // AIX has vsnprintf, but there's no prototype in the system headers.
   extern "C" int vsnprintf(char* str, size_t n, const char* format, va_list ap);
 #endif
   // AIX has vsnprintf, but there's no prototype in the system headers.
   extern "C" int vsnprintf(char* str, size_t n, const char* format, va_list ap);
 #endif


@@ -1458,7 +1456,11 @@ int wxString::PrintfV(const wxChar* pszFormat, va_list argptr)
 // of them)
 bool wxString::Matches(const wxChar *pszMask) const
 {
 // of them)
 bool wxString::Matches(const wxChar *pszMask) const
 {

-#if wxUSE_REGEX
+    // I disable this code as it doesn't seem to be faster (in fact, it seems
+    // to be much slower) than the old, hand-written code below and using it
+    // here requires always linking with libregex even if the user code doesn't
+    // use it
+#if 0 // wxUSE_REGEX

     // first translate the shell-like mask into a regex
     wxString pattern;
     pattern.reserve(wxStrlen(pszMask));
     // first translate the shell-like mask into a regex
     wxString pattern;
     pattern.reserve(wxStrlen(pszMask));


@@ -1632,7 +1634,7 @@ void wxString::resize(size_t nSize, wxChar ch)
     }
     else if ( nSize > len )
     {
     }
     else if ( nSize > len )
     {

-        *this += wxString(ch, len - nSize);
+        *this += wxString(ch, nSize - len);

     }
     //else: we have exactly the specified length, nothing to do
 }
     }
     //else: we have exactly the specified length, nothing to do
 }


@@ -1698,7 +1700,7 @@ size_t wxString::find(wxChar ch, size_t nStart) const
 size_t wxString::rfind(const wxString& str, size_t nStart) const
 {
   wxASSERT( str.GetStringData()->IsValid() );
 size_t wxString::rfind(const wxString& str, size_t nStart) const
 {
   wxASSERT( str.GetStringData()->IsValid() );

-  wxASSERT( nStart <= Len() );
+  wxASSERT( nStart == npos || nStart <= Len() );

 
   // TODO could be made much quicker than that
   const wxChar *p = c_str() + (nStart == npos ? Len() : nStart);
 
   // TODO could be made much quicker than that
   const wxChar *p = c_str() + (nStart == npos ? Len() : nStart);


@@ -1715,7 +1717,7 @@ size_t wxString::rfind(const wxString& str, size_t nStart) const
 #if !defined(__VISUALC__) || defined(__WIN32__)
 size_t wxString::rfind(const wxChar* sz, size_t nStart, size_t n) const
 {
 #if !defined(__VISUALC__) || defined(__WIN32__)
 size_t wxString::rfind(const wxChar* sz, size_t nStart, size_t n) const
 {

-    return rfind(wxString(sz, n == npos ? 0 : n), nStart);
+    return rfind(wxString(sz, n == npos ? wxSTRING_MAXLEN : n), nStart);

 }
 
 size_t wxString::rfind(wxChar ch, size_t nStart) const
 }
 
 size_t wxString::rfind(wxChar ch, size_t nStart) const