From 76046d7390d8c6f02dbbd851d1d896354bfc07cc Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Tue, 20 Mar 2007 08:14:06 +0000 Subject: [PATCH] compilation fix after STL fixes if 2.8 compatibility is enabled git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44967 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/string.h | 4 ++-- src/common/string.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/wx/string.h b/include/wx/string.h index 3b9bb155f9..0642f2ff37 100644 --- a/include/wx/string.h +++ b/include/wx/string.h @@ -1461,7 +1461,7 @@ public: // minimize the string's memory // only works if the data of this string is not shared bool Shrink(); -#if WXWIN_COMPATIBILITY_2_8 && !wxUSE_STL +#if WXWIN_COMPATIBILITY_2_8 && !wxUSE_STL_BASED_WXSTRING // These are deprecated, use wxStringBuffer or wxStringBufferLength instead // // get writable buffer of at least nLen bytes. Unget() *must* be called @@ -1470,7 +1470,7 @@ public: // call this immediately after GetWriteBuf() has been used wxDEPRECATED( void UngetWriteBuf() ); wxDEPRECATED( void UngetWriteBuf(size_t nLen) ); -#endif // WXWIN_COMPATIBILITY_2_8 && !wxUSE_STL +#endif // WXWIN_COMPATIBILITY_2_8 && !wxUSE_STL_BASED_WXSTRING // wxWidgets version 1 compatibility functions diff --git a/src/common/string.cpp b/src/common/string.cpp index 9c8122f952..f26486112a 100644 --- a/src/common/string.cpp +++ b/src/common/string.cpp @@ -1115,7 +1115,7 @@ void wxString::UngetWriteBuf(size_t nLen) } #endif // WXWIN_COMPATIBILITY_2_8 -#endif // !wxUSE_STL +#endif // !wxUSE_STL_BASED_WXSTRING // --------------------------------------------------------------------------- -- 2.45.2