Check for wxUSE_STD_STRING with #if not with #ifdef,

because it is always defined.
  Do not unconditionally #define HAVE_STD_STRING_COMPARE if
it is not defined, because this nullifies the configure test.

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

diff --git a/include/wx/string.h b/include/wx/string.h
index 94dc733c6c05480c1c1646254e9e331dd9419a6c..f55ac3032bd3e5428c0793050fe81e6642e57a09 100644 (file)
--- a/include/wx/string.h
+++ b/include/wx/string.h
@@ -164,7 +164,7 @@ inline int Stricmp(const char *psz1, const char *psz2)
 // ----------------------------------------------------------------------------
 
 // in both cases we need to define wxStdString
 // ----------------------------------------------------------------------------
 
 // in both cases we need to define wxStdString

-#if wxUSE_STL || defined(wxUSE_STD_STRING)
+#if wxUSE_STL || wxUSE_STD_STRING

 
 #include "wx/beforestd.h"
 #include <string>
 
 #include "wx/beforestd.h"
 #include <string>


@@ -196,7 +196,8 @@ inline int Stricmp(const char *psz1, const char *psz2)
     typedef wxStdString wxStringBase;
 #else // if !wxUSE_STL
 
     typedef wxStdString wxStringBase;
 #else // if !wxUSE_STL
 

-#ifndef HAVE_STD_STRING_COMPARE
+#if !defined(HAVE_STD_STRING_COMPARE) && \
+    (!defined(__WX_SETUP_H__) || wxUSE_STL == 0)

     #define HAVE_STD_STRING_COMPARE
 #endif
 
     #define HAVE_STD_STRING_COMPARE
 #endif
 


@@ -657,7 +658,7 @@ public:
   // unconditionally add this ctor as it would make wx lib dependent on
   // libstdc++ on some Linux versions which is bad, so instead we ask the
   // client code to define this wxUSE_STD_STRING symbol if they need it
   // unconditionally add this ctor as it would make wx lib dependent on
   // libstdc++ on some Linux versions which is bad, so instead we ask the
   // client code to define this wxUSE_STD_STRING symbol if they need it

-#ifdef wxUSE_STD_STRING
+#if wxUSE_STD_STRING

   wxString(const wxStdString& s)
       : wxStringBase(s.c_str()) { }
 #endif // wxUSE_STD_STRING
   wxString(const wxStdString& s)
       : wxStringBase(s.c_str()) { }
 #endif // wxUSE_STD_STRING


@@ -1184,7 +1185,7 @@ public:
     { return (wxString&)wxStringBase::assign(first, last); }
 
     // string comparison
     { return (wxString&)wxStringBase::assign(first, last); }
 
     // string comparison

-#ifndef HAVE_STD_STRING_COMPARE
+#if !defined(HAVE_STD_STRING_COMPARE) 

   int compare(const wxStringBase& str) const;
     // comparison with a substring
   int compare(size_t nStart, size_t nLen, const wxStringBase& str) const;
   int compare(const wxStringBase& str) const;
     // comparison with a substring
   int compare(size_t nStart, size_t nLen, const wxStringBase& str) const;