#define wxUSE_STD_STRING to 0 rather than #undef it, patch 1255570 from Jan van Dijk

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

diff --git a/include/wx/string.h b/include/wx/string.h
index dcf8f9058d655df625abc32ecbdceee7b29a557f..151ca4037a0b6ef5ff6efe04bc44c8fadba0cd23 100644 (file)
--- a/include/wx/string.h
+++ b/include/wx/string.h
@@ -187,6 +187,7 @@ inline int Stricmp(const char *psz1, const char *psz2)
     // we don't need an extra ctor from std::string when copy ctor already does
     // the work
     #undef wxUSE_STD_STRING
     // we don't need an extra ctor from std::string when copy ctor already does
     // the work
     #undef wxUSE_STD_STRING

+    #define wxUSE_STD_STRING 0

 
     #if (defined(__GNUG__) && (__GNUG__ < 3)) || \
         (defined(_MSC_VER) && (_MSC_VER <= 1200))
 
     #if (defined(__GNUG__) && (__GNUG__ < 3)) || \
         (defined(_MSC_VER) && (_MSC_VER <= 1200))