Include wx/dataobj.h from wx/clipbrd.h.

This is necessary in order to define wxVector<wxDataFormat> at least when
wxVector is std::vector (as in wxUSE_STL==1 build) because vectors of
incomplete types can't be used.

Also removed inclusions of this and other unneeded headers from MSW and OS X
headers and removed a hopefully out of date comment about Mac code being wx
1.xx-based from the latter.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61485 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-07-20 23:54:08 +00:00
parent 43b2d5e7c3
commit 81f0d3caef
4 changed files with 20 additions and 42 deletions

View File

@@ -41,29 +41,9 @@ IMPLEMENT_DYNAMIC_CLASS(wxClipboardEvent,wxEvent)
wxDEFINE_EVENT( wxEVT_CLIPBOARD_CHANGED, wxClipboardEvent );
// notice that ctors are defined here and not inline to avoid having to include
// wx/dataobj.h from wx/clipbrd.h
wxClipboardEvent::wxClipboardEvent(wxEventType evtType)
: wxEvent(0, evtType)
{
}
wxClipboardEvent::wxClipboardEvent(const wxClipboardEvent& event)
: wxEvent(event),
m_formats(event.m_formats)
{
}
wxEvent* wxClipboardEvent::Clone() const
{
return new wxClipboardEvent(*this);
}
bool wxClipboardEvent::SupportsFormat( const wxDataFormat &format ) const
{
#ifdef __WXGTK20__
// GTK has an asynchronous API which reports the supported formats one by
// one. We may have to add X11 and Motif later.
for (wxVector<wxDataFormat>::size_type n = 0; n < m_formats.size(); n++)
{
if (m_formats[n] == format)