String corrections

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

diff --git a/src/common/regex.cpp b/src/common/regex.cpp
index 2efc4a026be98d02a73c7f6ed630352f4ab8f18e..12d49ee971737968bbf92a7d8ed56246e6297ee8 100644 (file)
--- a/src/common/regex.cpp
+++ b/src/common/regex.cpp
@@ -38,22 +38,17 @@
     #include "wx/intl.h"
 #endif //WX_PRECOMP
 
     #include "wx/intl.h"
 #endif //WX_PRECOMP
 

-// FreeBSD & Watcom require this, it probably doesn't hurt for others
+// FreeBSD, Watcom and DMars require this, CW doesn't have nor need it.
+// Others also don't seem to need it. If you have an error related to
+// (not) including <sys/types.h> please report details to
+// wx-dev@lists.wxwindows.org

 #if defined(__UNIX__) || defined(__WATCOMC__) || defined(__DIGITALMARS__)
 #if defined(__UNIX__) || defined(__WATCOMC__) || defined(__DIGITALMARS__)

-    #include <sys/types.h>
+#   include <sys/types.h>

 #endif
 
 #endif
 

-#ifndef __WXWINCE__

 #include <regex.h>
 #include <regex.h>

-#endif
-

 #include "wx/regex.h"
 
 #include "wx/regex.h"
 

-#ifdef wx_wchar
-    #define regerror wx_regerror
-    #define regfree wx_regfree
-#endif
-

 // ----------------------------------------------------------------------------
 // private classes
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // private classes
 // ----------------------------------------------------------------------------


@@ -138,32 +133,25 @@ wxRegExImpl::~wxRegExImpl()
 
 wxString wxRegExImpl::GetErrorMsg(int errorcode) const
 {
 
 wxString wxRegExImpl::GetErrorMsg(int errorcode) const
 {

-    wxString msg;
+    wxString szError;

 
     // first get the string length needed
     int len = regerror(errorcode, &m_RegEx, NULL, 0);
     if ( len > 0 )
     {
 
     // first get the string length needed
     int len = regerror(errorcode, &m_RegEx, NULL, 0);
     if ( len > 0 )
     {

-        len++;
-
-#ifdef wx_wchar
-        wxCharBuffer buf(len);
-
-        (void)regerror(errorcode, &m_RegEx, (char *)buf.data(), len);
+        char* szcmbError = new char[++len];

 
 

-        msg = wxString(buf.data(), wxConvLibc);
-#else 
-        (void)regerror(errorcode, &m_RegEx, msg.GetWriteBuf(len), len);
+        (void)regerror(errorcode, &m_RegEx, szcmbError, len);

 
 

-        msg.UngetWriteBuf();
-#endif 
+        szError = wxConvertMB2WX(szcmbError);
+        delete [] szcmbError;

     }
     else // regerror() returned 0
     {
     }
     else // regerror() returned 0
     {

-        msg = _("unknown error");
+        szError = _("unknown error");

     }
 
     }
 

-    return msg;
+    return szError;

 }
 
 bool wxRegExImpl::Compile(const wxString& expr, int flags)
 }
 
 bool wxRegExImpl::Compile(const wxString& expr, int flags)


@@ -186,12 +174,8 @@ bool wxRegExImpl::Compile(const wxString& expr, int flags)
         flagsRE |= REG_NEWLINE;
 
 
         flagsRE |= REG_NEWLINE;
 
 

-    // compile it
-#ifdef wx_wchar
-    int errorcode = wx_regcomp(&m_RegEx, expr, expr.Length(), flagsRE);
-#else
-    int errorcode = regcomp(&m_RegEx, expr.mb_str(), flagsRE);
-#endif
+
+    int errorcode = regcomp(&m_RegEx, expr, flagsRE);

 
      if ( errorcode )
     {
 
      if ( errorcode )
     {


@@ -266,12 +250,7 @@ bool wxRegExImpl::Matches(const wxChar *str, int flags) const
     }
 
     // do match it
     }
 
     // do match it

-#ifdef wx_wchar
-       rm_detail_t rd;
-    int rc = wx_regexec(&self->m_RegEx, str, wxStrlen(str), &rd, m_nMatches, m_Matches, flagsRE);
-#else
-    int rc = regexec(&self->m_RegEx, wxConvertWX2MB(str), m_nMatches, m_Matches, flagsRE);
-#endif
+    int rc = regexec(&self->m_RegEx, str, m_nMatches, m_Matches, flagsRE);

 
     switch ( rc )
     {
 
     switch ( rc )
     {


@@ -484,38 +463,4 @@ int wxRegEx::Replace(wxString *pattern,
     return m_impl->Replace(pattern, replacement, maxMatches);
 }
 
     return m_impl->Replace(pattern, replacement, maxMatches);
 }
 

-#ifdef wx_wchar
-
-/**  Locale functions */
-
-extern "C" {
-
-int wx_isdigit(wx_wchar c) {return (c >= 0 && c <= UCHAR_MAX &&  wxIsdigit((unsigned char) c));}
-int wx_isalpha(wx_wchar c) {return (c >= 0 && c <= UCHAR_MAX &&  wxIsalpha((unsigned char) c));}
-int wx_isalnum(wx_wchar c) {return (c >= 0 && c <= UCHAR_MAX &&  wxIsalnum((unsigned char) c));}
-int wx_isupper(wx_wchar c) {return (c >= 0 && c <= UCHAR_MAX &&  wxIsupper((unsigned char) c));}
-int wx_islower(wx_wchar c) {return (c >= 0 && c <= UCHAR_MAX &&  wxIslower((unsigned char) c));}
-int wx_isgraph(wx_wchar c) {return (c >= 0 && c <= UCHAR_MAX &&  wxIsgraph((unsigned char) c));}
-int wx_ispunct(wx_wchar c) {return (c >= 0 && c <= UCHAR_MAX &&  wxIspunct((unsigned char) c));}
-int wx_isspace(wx_wchar c) {return (c >= 0 && c <= UCHAR_MAX &&  wxIsspace((unsigned char) c));}
-
-wx_wchar wx_toupper(wx_wchar c) 
-{
-       if (c >= 0 && c <= UCHAR_MAX)
-               return wxToupper((unsigned char) c);
-       return c;
-
-}
-
-wx_wchar wx_tolower(wx_wchar c)
-{
-       if (c >= 0 && c <= UCHAR_MAX)
-               return wxTolower((unsigned char) c);
-       return c;
-}
-
-}
-
-#endif
-

 #endif // wxUSE_REGEX
 #endif // wxUSE_REGEX