Unicode compatibility

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

diff --git a/src/common/regex.cpp b/src/common/regex.cpp
index 62ffa7c7816b51818e749aa6f19f622d7632e528..072ea9df0fb7244dc60bfbd38d5c48eeaed718fe 100644 (file)
--- a/src/common/regex.cpp
+++ b/src/common/regex.cpp
@@ -18,7 +18,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "regex.h"
 #endif
 
     #pragma implementation "regex.h"
 #endif
 


@@ -38,9 +38,12 @@
     #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
 
 #ifndef __WXWINCE__
 #endif
 
 #ifndef __WXWINCE__


@@ -49,6 +52,11 @@
 
 #include "wx/regex.h"
 
 
 #include "wx/regex.h"
 

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

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


@@ -141,17 +149,17 @@ wxString wxRegExImpl::GetErrorMsg(int errorcode) const
     {
         len++;
 
     {
         len++;
 

-#if wxUSE_UNICODE
+#ifdef wx_wchar

         wxCharBuffer buf(len);
 
         (void)regerror(errorcode, &m_RegEx, (char *)buf.data(), len);
 
         msg = wxString(buf.data(), wxConvLibc);
         wxCharBuffer buf(len);
 
         (void)regerror(errorcode, &m_RegEx, (char *)buf.data(), len);
 
         msg = wxString(buf.data(), wxConvLibc);

-#else // !Unicode
+#else 

         (void)regerror(errorcode, &m_RegEx, msg.GetWriteBuf(len), len);
 
         msg.UngetWriteBuf();
         (void)regerror(errorcode, &m_RegEx, msg.GetWriteBuf(len), len);
 
         msg.UngetWriteBuf();

-#endif // Unicode/!Unicode
+#endif 

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


@@ -180,9 +188,15 @@ bool wxRegExImpl::Compile(const wxString& expr, int flags)
     if ( flags & wxRE_NEWLINE )
         flagsRE |= REG_NEWLINE;
 
     if ( flags & wxRE_NEWLINE )
         flagsRE |= REG_NEWLINE;
 

+

     // compile it
     // 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);
     int errorcode = regcomp(&m_RegEx, expr.mb_str(), flagsRE);

-    if ( errorcode )
+#endif
+
+     if ( errorcode )

     {
         wxLogError(_("Invalid regular expression '%s': %s"),
                    expr.c_str(), GetErrorMsg(errorcode).c_str());
     {
         wxLogError(_("Invalid regular expression '%s': %s"),
                    expr.c_str(), GetErrorMsg(errorcode).c_str());


@@ -255,7 +269,12 @@ 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);
     int rc = regexec(&self->m_RegEx, wxConvertWX2MB(str), m_nMatches, m_Matches, flagsRE);

+#endif

 
     switch ( rc )
     {
 
     switch ( rc )
     {


@@ -468,4 +487,38 @@ 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