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

compilation fix for VC6 with wxUSE_STL=1

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45483 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík 2007-04-15 18:47:19 +00:00
parent a81a4db388
commit 8a7afe4dfe
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
include/wx/list.h
View File

@ -128,11 +128,18 @@ private:
bool operator()(const elT X, const elT Y) const \ bool operator()(const elT X, const elT Y) const \
{ \ { \
return m_CompFunc ? \ return m_CompFunc ? \
( m_CompFunc( X, Y ) < 0 ) : \ ( m_CompFunc( wxListCastElementToVoidPtr(X), \
wxListCastElementToVoidPtr(Y) ) < 0 ) : \
( X > Y ); \ ( X > Y ); \
} \ } \
}; };
// helper for std::greater<elT> above:
template<typename T>
inline const void *wxListCastElementToVoidPtr(const T* ptr) { return ptr; }
inline const void *wxListCastElementToVoidPtr(const wxString& str)
{ return (const char*)str; }
#endif // VC6/!VC6 #endif // VC6/!VC6
/* /*
@ -1217,10 +1224,10 @@ public:
// default // default
#ifdef wxWARN_COMPAT_LIST_USE #ifdef wxWARN_COMPAT_LIST_USE
wxStringList(); wxStringList();
wxDEPRECATED( wxStringList(const wxChar *first ...) ); wxDEPRECATED( wxStringList(const wxChar *first ...) ); // FIXME-UTF8
#else #else
wxStringList(); wxStringList();
wxStringList(const wxChar *first ...); wxStringList(const wxChar *first ...); // FIXME-UTF8
#endif #endif
// copying the string list: the strings are copied, too (extremely // copying the string list: the strings are copied, too (extremely