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

diff --git a/include/wx/string.h b/include/wx/string.h
index 3b9bb155f976385a2e66e0b02824f6ca357cb2f2..0642f2ff376788932292e5804a02dc889ee3189f 100644 (file)
--- 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();
     // 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
     // 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) );
     // 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
 
 
   // wxWidgets version 1 compatibility functions
 

diff --git a/src/common/string.cpp b/src/common/string.cpp
index 9c8122f952d1dda3f4d8b50d752fae8249372813..f26486112aaee9a34233162cf96f6271a4f60495 100644 (file)
--- 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 // WXWIN_COMPATIBILITY_2_8
 

-#endif // !wxUSE_STL
+#endif // !wxUSE_STL_BASED_WXSTRING

 
 
 // ---------------------------------------------------------------------------
 
 
 // ---------------------------------------------------------------------------