Further wxUniv fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10729 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -28,8 +28,6 @@
|
||||
#pragma hdrstop
|
||||
#endif
|
||||
|
||||
#if defined(__WIN32__) && !defined(__GNUWIN32_OLD__)
|
||||
|
||||
#ifndef WX_PRECOMP
|
||||
#include "wx/intl.h"
|
||||
#include "wx/log.h"
|
||||
@@ -37,6 +35,8 @@
|
||||
|
||||
#include "wx/dataobj.h"
|
||||
|
||||
#if wxUSE_OLE && defined(__WIN32__) && !defined(__GNUWIN32_OLD__)
|
||||
|
||||
#include "wx/msw/private.h" // includes <windows.h>
|
||||
|
||||
#if wxUSE_NORLANDER_HEADERS
|
||||
@@ -1186,5 +1186,27 @@ static const wxChar *GetTymedName(DWORD tymed)
|
||||
|
||||
#endif // Debug
|
||||
|
||||
#endif // not using OLE at all
|
||||
#else // not using OLE at all
|
||||
// ----------------------------------------------------------------------------
|
||||
// wxDataObject
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
wxDataObject::wxDataObject()
|
||||
{
|
||||
}
|
||||
|
||||
wxDataObject::~wxDataObject()
|
||||
{
|
||||
}
|
||||
|
||||
void wxDataObject::SetAutoDelete()
|
||||
{
|
||||
}
|
||||
|
||||
const wxChar *wxDataObject::GetFormatName(wxDataFormat format)
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
|
Reference in New Issue
Block a user