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

*** empty log message ***

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4126 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster
1999-10-22 04:37:39 +00:00
parent 2e1a688e3e
commit 6dddc146fb
11 changed files with 707 additions and 296 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
include/wx/dataobj.h
View File

@@ -157,7 +157,7 @@ public:
#elif defined(__WXMAC__)
#include "wx/mac/dnd.h"
#elif defined(__WXPM__)
#include "wx/os2/dnd.h"
#include "wx/os2/dataobj.h"
#elif defined(__WXSTUBS__)
#include "wx/stubs/dnd.h"
#endif
@@ -312,6 +312,16 @@ public:
private:
wxString m_text;
#if defined(__VISAGECPP__)
// Virtual function hiding supression
size_t GetDataSize(const wxDataFormat& rFormat) const
{ return(wxDataObjectSimple::GetDataSize(rFormat)); }
bool GetDataHere(const wxDataFormat& WXUNUSED(rFormat), void *pBuf) const
{ return(GetDataHere(pBuf)); }
bool SetData(const wxDataFormat& rFormat, size_t nLen, const void* pBuf)
{ return(wxDataObjectSimple::SetData(rFormat, nLen, pBuf)); }
#endif
};
// ----------------------------------------------------------------------------
@@ -359,6 +369,15 @@ public:
protected:
wxArrayString m_filenames;
#if defined(__VISAGECPP__)
private:
// Virtual function hiding supression
size_t GetDataSize(const wxDataFormat& rFormat) const
{ return(wxDataObjectSimple::GetDataSize(rFormat)); }
bool GetDataHere(const wxDataFormat& WXUNUSED(rformat), void* pBuf) const
{ return(GetDataHere(pBuf)); }
#endif
};
// ----------------------------------------------------------------------------
@@ -405,6 +424,16 @@ public:
private:
size_t m_size;
void *m_data;
#if defined(__VISAGECPP__)
// Virtual function hiding supression
size_t GetDataSize(const wxDataFormat& rFormat) const
{ return(wxDataObjectSimple::GetDataSize(rFormat)); }
bool GetDataHere(const wxDataFormat& rFormat, void* pBuf) const
{ return(wxDataObjectSimple::GetDataHere(rFormat, pBuf)); }
bool SetData(const wxDataFormat& rFormat, size_t nLen, const void* pBuf)
{ return(wxDataObjectSimple::SetData(rFormat, nLen, pBuf)); }
#endif
};
// ----------------------------------------------------------------------------
@@ -417,6 +446,8 @@ private:
// #include "wx/motif/dataobj2.h" -- not yet
#elif defined(__WXGTK__)
#include "wx/gtk/dataobj2.h"
#elif defined(__WXPM__)
#include "wx/os2/dataobj2.h"
#endif
#endif // _WX_DATAOBJ_H_BASE_