Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix compilation with wxUSE_STL=1 for VC6 (and presumably others) (bug 1614814)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43983 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-12-15 01:47:26 +00:00
parent 9c5fd8a319
commit cd840087aa
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
docs/changes.txt
View File

@@ -92,6 +92,7 @@ Major new features in 2.8 release
All: All:
- Fix compilation with wxUSE_STL=1
- wxGrid::GetBestSize() returns same size the grid would have after AutoSize() - wxGrid::GetBestSize() returns same size the grid would have after AutoSize()
wxMSW: wxMSW:

7
include/wx/list.h
View File

@@ -181,6 +181,7 @@ private:
static BaseListType EmptyList; \ static BaseListType EmptyList; \
\ \
bool m_destroy; \ bool m_destroy; \
\
public: \ public: \
decl compatibility_iterator \ decl compatibility_iterator \
{ \ { \
@@ -188,9 +189,10 @@ private:
/* Workaround for broken VC6 nested class name resolution */ \ /* Workaround for broken VC6 nested class name resolution */ \
typedef std::list<elT>::iterator iterator; \ typedef std::list<elT>::iterator iterator; \
friend class liT; \ friend class liT; \
private: \ \
iterator m_iter; \ iterator m_iter; \
liT * m_list; \ liT * m_list; \
\
public: \ public: \
compatibility_iterator() \ compatibility_iterator() \
: m_iter(EmptyList.end()), m_list( NULL ) {} \ : m_iter(EmptyList.end()), m_list( NULL ) {} \
@@ -338,6 +340,9 @@ private:
void Sort( wxSortCompareFunction compfunc ) \ void Sort( wxSortCompareFunction compfunc ) \
{ sort( WX_LIST_SORTFUNCTION( elT, compfunc ) ); } \ { sort( WX_LIST_SORTFUNCTION( elT, compfunc ) ); } \
~liT() { Clear(); } \ ~liT() { Clear(); } \
\
/* It needs access to our EmptyList */ \
friend decl compatibility_iterator; \
} }
#define WX_DECLARE_LIST(elementtype, listname) \ #define WX_DECLARE_LIST(elementtype, listname) \