fixing the regex mess that Ryan wasn't yet able to fix himself

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25003 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/configure b/configure
index e9f23759ae7101d4a4ddad5cb58d4ea9be2b44ad..e213dde09e527a4ce125e0e647a98beb77ad8650 100755 (executable)
--- a/configure
+++ b/configure
@@ -6735,7 +6735,6 @@ if test "x$wxUSE_COCOA" != "x" -a "$wxUSE_COCOA" != "0" ; then
   wxUSE_DRAG_AND_DROP=no
   # Generic notebook requires tab dialog
   DEFAULT_wxUSE_TABDIALOG=yes
-  DEFAULT_wxUSE_TOOLBAR_NATIVE=no
   DEFAULT_wxUSE_SCROLLBAR=no
   DEFAULT_wxUSE_TOOLTIPS=no
   DEFAULT_wxUSE_DRAGIMAGE=no
@@ -9833,6 +9832,7 @@ if test "$wxUSE_WINE" = "yes"; then
         CC=winegcc
     CXX=wineg++
     RESCOMP=wrc
+    LDFLAGS_GUI="-mwindows"
 fi
 
 if test "$wants_win32" = 1 ; then
@@ -18910,6 +18910,12 @@ if test "$wxUSE_REGEX" != "no"; then
 _ACEOF
 
 
+    if test "$wxUSE_UNICODE" = "yes" -a "$wxUSE_REGEX" = "yes"; then
+        { echo "$as_me:$LINENO: WARNING: Unicode build requires built-in regex library, will use it instead" >&5
+echo "$as_me: WARNING: Unicode build requires built-in regex library, will use it instead" >&2;}
+        wxUSE_REGEX=builtin
+    fi
+
     if test "$wxUSE_REGEX" = "sys" -o "$wxUSE_REGEX" = "yes" ; then
                         if test "${ac_cv_header_regex_h+set}" = set; then
   echo "$as_me:$LINENO: checking for regex.h" >&5
@@ -33791,11 +33797,6 @@ if test "$wxUSE_SOCKETS" = "yes"; then
 echo "$as_me: WARNING: wxSocket not yet supported under MGL... disabled" >&2;}
         wxUSE_SOCKETS="no"
     fi
-    if test "$wxUSE_COCOA" = "1"; then
-        { echo "$as_me:$LINENO: WARNING: wxSocket not yet supported under Cocoa... disabled" >&5
-echo "$as_me: WARNING: wxSocket not yet supported under Cocoa... disabled" >&2;}
-        wxUSE_SOCKETS="no"
-    fi
 fi
 
 if test "$wxUSE_SOCKETS" = "yes"; then

diff --git a/configure.in b/configure.in
index 1c59809d24709d34749ed133a386967d9f0e8c11..49950ac5cd6dfd0e399f2b01799a5d364ab136c6 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1877,6 +1877,11 @@ dnl ------------------------------------------------------------------------
 
 if test "$wxUSE_REGEX" != "no"; then
     AC_DEFINE(wxUSE_REGEX)
+            
+    if test "$wxUSE_UNICODE" = "yes" -a "$wxUSE_REGEX" = "yes"; then
+        AC_MSG_WARN([Unicode build requires built-in regex library, will use it instead])
+        wxUSE_REGEX=builtin
+    fi
 
     if test "$wxUSE_REGEX" = "sys" -o "$wxUSE_REGEX" = "yes" ; then
         dnl according to Unix 98 specs, regcomp() is in libc but I believe that

diff --git a/include/wx/wxchar.h b/include/wx/wxchar.h
index 58e6c84fca2b4d552ab6a390ee5613e58ff7b972..0bf32e0c16c2c5078874c83f7d7e7f090192baed 100644 (file)
--- a/include/wx/wxchar.h
+++ b/include/wx/wxchar.h
@@ -869,10 +869,12 @@ WXDLLIMPEXP_BASE int wxStrnicmp(const wxChar *psz1, const wxChar *psz2, size_t l
 WXDLLIMPEXP_BASE wxChar * wxStrtok(wxChar *psz, const wxChar *delim, wxChar **save_ptr);
 #endif
 
+#ifdef __cplusplus
 #ifndef wxSetlocale
 class WXDLLIMPEXP_BASE wxWCharBuffer;
 WXDLLIMPEXP_BASE wxWCharBuffer wxSetlocale(int category, const wxChar *locale);
 #endif
+#endif
 
 /*  stdio.h functions */
 #ifdef wxNEED_WX_STDIO_H