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

don't use the VC6 workaround in wxList with newer versions of VC

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45453 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2007-04-14 11:04:30 +00:00
parent bc5443ba07
commit a4c1cdc9dc
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/list.h
View File

@@ -93,7 +93,7 @@ enum wxKeyType
#define WX_DECLARE_LIST_WITH_DECL(elT, liT, decl) \ #define WX_DECLARE_LIST_WITH_DECL(elT, liT, decl) \
WX_DECLARE_LIST_XO(elT*, liT, decl) WX_DECLARE_LIST_XO(elT*, liT, decl)
#if !defined( __VISUALC__ ) #if !defined(__VISUALC__) || __VISUALC__ >= 1300 // == !VC6
template<class T> template<class T>
class WXDLLIMPEXP_BASE wxList_SortFunction class WXDLLIMPEXP_BASE wxList_SortFunction
@@ -109,7 +109,7 @@ private:
#define WX_LIST_SORTFUNCTION( elT, f ) wxList_SortFunction<elT>(f) #define WX_LIST_SORTFUNCTION( elT, f ) wxList_SortFunction<elT>(f)
#define VC6_WORKAROUND(elT, liT, decl) #define VC6_WORKAROUND(elT, liT, decl)
#else // if defined( __VISUALC__ ) #else // if defined( __VISUALC__ ) && __VISUALC__ < 1300 // == VC6
#define WX_LIST_SORTFUNCTION( elT, f ) std::greater<elT>( f ) #define WX_LIST_SORTFUNCTION( elT, f ) std::greater<elT>( f )
#define VC6_WORKAROUND(elT, liT, decl) \ #define VC6_WORKAROUND(elT, liT, decl) \
@@ -133,7 +133,7 @@ private:
} \ } \
}; };
#endif // defined( __VISUALC__ ) #endif // VC6/!VC6
/* /*
Note 1: the outer helper class _WX_LIST_HELPER_##liT below is a workaround Note 1: the outer helper class _WX_LIST_HELPER_##liT below is a workaround