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

VA fussy compiler fix (must qualify any reference to member more than one class up the inheritance tree

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4124 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster
1999-10-21 22:36:51 +00:00
parent dcc7139872
commit 4004aba331
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
include/wx/dataobj.h
View File

@@ -79,6 +79,8 @@ public:
#include "wx/motif/dataform.h" #include "wx/motif/dataform.h"
#elif defined(__WXGTK__) #elif defined(__WXGTK__)
#include "wx/gtk/dataform.h" #include "wx/gtk/dataform.h"
#elif defined(__WXPM__)
#include "wx/os2/dataform.h"
#endif #endif
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@@ -208,12 +210,12 @@ public:
// implement base class pure virtuals // implement base class pure virtuals
// ---------------------------------- // ----------------------------------
virtual wxDataFormat GetPreferredFormat(Direction WXUNUSED(dir) = Get) const virtual wxDataFormat GetPreferredFormat(wxDataObjectBase::Direction WXUNUSED(dir) = Get) const
{ return m_format; } { return m_format; }
virtual size_t GetFormatCount(Direction WXUNUSED(dir) = Get) const virtual size_t GetFormatCount(wxDataObjectBase::Direction WXUNUSED(dir) = Get) const
{ return 1; } { return 1; }
virtual void GetAllFormats(wxDataFormat *formats, virtual void GetAllFormats(wxDataFormat *formats,
Direction WXUNUSED(dir) = Get) const wxDataObjectBase::Direction WXUNUSED(dir) = Get) const
{ *formats = m_format; } { *formats = m_format; }
virtual size_t GetDataSize(const wxDataFormat& WXUNUSED(format)) const virtual size_t GetDataSize(const wxDataFormat& WXUNUSED(format)) const
{ return GetDataSize(); } { return GetDataSize(); }
@@ -254,9 +256,9 @@ public:
// implement base class pure virtuals // implement base class pure virtuals
// ---------------------------------- // ----------------------------------
virtual wxDataFormat GetPreferredFormat(Direction dir = Get) const; virtual wxDataFormat GetPreferredFormat(wxDataObjectBase::Direction dir = Get) const;
virtual size_t GetFormatCount(Direction dir = Get) const; virtual size_t GetFormatCount(wxDataObjectBase::Direction dir = Get) const;
virtual void GetAllFormats(wxDataFormat *formats, Direction dir = Get) const; virtual void GetAllFormats(wxDataFormat *formats, wxDataObjectBase::Direction dir = Get) const;
virtual size_t GetDataSize(const wxDataFormat& format) const; virtual size_t GetDataSize(const wxDataFormat& format) const;
virtual bool GetDataHere(const wxDataFormat& format, void *buf) const; virtual bool GetDataHere(const wxDataFormat& format, void *buf) const;
virtual bool SetData(const wxDataFormat& format, size_t len, const void *buf); virtual bool SetData(const wxDataFormat& format, size_t len, const void *buf);