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

wxUSE_STL=1 compilation fixes.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22132 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mattia Barbon
2003-07-19 22:42:12 +00:00
parent ee6eb8d8ca
commit 69b9f4cca4
2 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
include/wx/list.h
View File

@@ -980,29 +980,31 @@ private:
#endif // !wxUSE_STL #endif // !wxUSE_STL
// ============================================================================= // ============================================================================
// now we can define classes 100% compatible with the old ones // now we can define classes 100% compatible with the old ones
// ============================================================================= // ============================================================================
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// commonly used list classes // commonly used list classes
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
#ifdef wxLIST_COMPATIBILITY #if defined(wxLIST_COMPATIBILITY)
// inline compatibility functions // inline compatibility functions
// ----------------------------------------------------------------------------- #if !wxUSE_STL
// ----------------------------------------------------------------------------
// wxNodeBase deprecated methods // wxNodeBase deprecated methods
// ----------------------------------------------------------------------------- // ----------------------------------------------------------------------------
inline wxNode *wxNodeBase::Next() const { return (wxNode *)GetNext(); } inline wxNode *wxNodeBase::Next() const { return (wxNode *)GetNext(); }
inline wxNode *wxNodeBase::Previous() const { return (wxNode *)GetPrevious(); } inline wxNode *wxNodeBase::Previous() const { return (wxNode *)GetPrevious(); }
inline wxObject *wxNodeBase::Data() const { return (wxObject *)GetData(); } inline wxObject *wxNodeBase::Data() const { return (wxObject *)GetData(); }
// ----------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// wxListBase deprecated methods // wxListBase deprecated methods
// ----------------------------------------------------------------------------- // ----------------------------------------------------------------------------
inline int wxListBase::Number() const { return (int)GetCount(); } inline int wxListBase::Number() const { return (int)GetCount(); }
inline wxNode *wxListBase::First() const { return (wxNode *)GetFirst(); } inline wxNode *wxListBase::First() const { return (wxNode *)GetFirst(); }
@@ -1010,13 +1012,14 @@ inline wxNode *wxListBase::Last() const { return (wxNode *)GetLast(); }
inline wxNode *wxListBase::Nth(size_t n) const { return (wxNode *)Item(n); } inline wxNode *wxListBase::Nth(size_t n) const { return (wxNode *)Item(n); }
inline wxListBase::operator wxList&() const { return *(wxList*)this; } inline wxListBase::operator wxList&() const { return *(wxList*)this; }
#endif
// define this to make a lot of noise about use of the old wxList classes. // define this to make a lot of noise about use of the old wxList classes.
//#define wxWARN_COMPAT_LIST_USE //#define wxWARN_COMPAT_LIST_USE
// ----------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// wxList compatibility class: in fact, it's a list of wxObjects // wxList compatibility class: in fact, it's a list of wxObjects
// ----------------------------------------------------------------------------- // ----------------------------------------------------------------------------
WX_DECLARE_LIST_2(wxObject, wxObjectList, wxObjectListNode, WX_DECLARE_LIST_2(wxObject, wxObjectList, wxObjectListNode,
class WXDLLIMPEXP_BASE); class WXDLLIMPEXP_BASE);

1
include/wx/tipwin.h
View File

@@ -28,6 +28,7 @@
#define wxTipWindowBase wxFrame #define wxTipWindowBase wxFrame
#endif #endif
#include "wx/arrstr.h"
class WXDLLEXPORT wxTipWindowView; class WXDLLEXPORT wxTipWindowView;