fix compilation with wxUSE_STL=1 for VC6 (and presumably others) (bug 1614814)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43983 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -92,6 +92,7 @@ Major new features in 2.8 release
|
||||
|
||||
All:
|
||||
|
||||
- Fix compilation with wxUSE_STL=1
|
||||
- wxGrid::GetBestSize() returns same size the grid would have after AutoSize()
|
||||
|
||||
wxMSW:
|
||||
|
@@ -181,6 +181,7 @@ private:
|
||||
static BaseListType EmptyList; \
|
||||
\
|
||||
bool m_destroy; \
|
||||
\
|
||||
public: \
|
||||
decl compatibility_iterator \
|
||||
{ \
|
||||
@@ -188,9 +189,10 @@ private:
|
||||
/* Workaround for broken VC6 nested class name resolution */ \
|
||||
typedef std::list<elT>::iterator iterator; \
|
||||
friend class liT; \
|
||||
private: \
|
||||
\
|
||||
iterator m_iter; \
|
||||
liT * m_list; \
|
||||
\
|
||||
public: \
|
||||
compatibility_iterator() \
|
||||
: m_iter(EmptyList.end()), m_list( NULL ) {} \
|
||||
@@ -338,6 +340,9 @@ private:
|
||||
void Sort( wxSortCompareFunction compfunc ) \
|
||||
{ sort( WX_LIST_SORTFUNCTION( elT, compfunc ) ); } \
|
||||
~liT() { Clear(); } \
|
||||
\
|
||||
/* It needs access to our EmptyList */ \
|
||||
friend decl compatibility_iterator; \
|
||||
}
|
||||
|
||||
#define WX_DECLARE_LIST(elementtype, listname) \
|
||||
|
Reference in New Issue
Block a user