AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

compilation fix after STL fixes if 2.8 compatibility is enabled

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44967 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík 2007-03-20 08:14:06 +00:00
parent 0cb6a6e451
commit 76046d7390
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/string.h
View File

@ -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

2
src/common/string.cpp
View File

@ -1115,7 +1115,7 @@ void wxString::UngetWriteBuf(size_t nLen)
}
#endif // WXWIN_COMPATIBILITY_2_8
#endif // !wxUSE_STL
#endif // !wxUSE_STL_BASED_WXSTRING
// ---------------------------------------------------------------------------