Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Check for wxUSE_STD_STRING with #if not with #ifdef,

Browse Source 
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
This commit is contained in:
Mattia Barbon
2005-04-10 14:57:09 +00:00
parent 0a08f02aef
commit 47561b0dc5
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/wx/string.h
View File

@@ -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 "wx/beforestd.h"
#include <string> #include <string>
@@ -196,7 +196,8 @@ inline int Stricmp(const char *psz1, const char *psz2)
typedef wxStdString wxStringBase; typedef wxStdString wxStringBase;
#else // if !wxUSE_STL #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 #define HAVE_STD_STRING_COMPARE
#endif #endif
@@ -657,7 +658,7 @@ public:
// unconditionally add this ctor as it would make wx lib dependent on // 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 // 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 // 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) wxString(const wxStdString& s)
: wxStringBase(s.c_str()) { } : wxStringBase(s.c_str()) { }
#endif // wxUSE_STD_STRING #endif // wxUSE_STD_STRING
@@ -1184,7 +1185,7 @@ public:
{ return (wxString&)wxStringBase::assign(first, last); } { return (wxString&)wxStringBase::assign(first, last); }
// string comparison // string comparison
#ifndef HAVE_STD_STRING_COMPARE #if !defined(HAVE_STD_STRING_COMPARE)
int compare(const wxStringBase& str) const; int compare(const wxStringBase& str) const;
// comparison with a substring // comparison with a substring
int compare(size_t nStart, size_t nLen, const wxStringBase& str) const; int compare(size_t nStart, size_t nLen, const wxStringBase& str) const;