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

Give wxDataObjectComposite a way to report what kind of data was given

Browse Source 
to it from the clipboard or DnD source.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38736 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2006-04-15 05:35:08 +00:00
parent 4725f47eb2
commit c072c75701
4 changed files with 32 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
docs/latex/wx/dobjcomp.tex
View File

@@ -63,3 +63,12 @@ Adds the {\it dataObject} to the list of supported objects and it becomes the
preferred object if {\it preferred} is true. preferred object if {\it preferred} is true.
\membersection{wxDataObjectComposite::GetReceivedFormat}\label{wxdataobjectcompositegetreceivedformat}
\constfunc{wxDataFormat}{GetReceivedFormat}{}
Report the format passed to the SetData method. This should be the
format of the data object within the composite that recieved data from
the clipboard or the DnD operation. You can use this method to find
out what kind of data object was recieved.

8
include/wx/dataobj.h
View File

@@ -273,6 +273,12 @@ public:
// one if preferred == true // one if preferred == true
void Add(wxDataObjectSimple *dataObject, bool preferred = false); void Add(wxDataObjectSimple *dataObject, bool preferred = false);
// Report the format passed to the SetData method. This should be the
// format of the data object within the composite that recieved data from
// the clipboard or the DnD operation. You can use this method to find
// out what kind of data object was recieved.
wxDataFormat GetReceivedFormat() const;
// implement base class pure virtuals // implement base class pure virtuals
// ---------------------------------- // ----------------------------------
virtual wxDataFormat GetPreferredFormat(wxDataObjectBase::Direction dir = Get) const; virtual wxDataFormat GetPreferredFormat(wxDataObjectBase::Direction dir = Get) const;
@@ -301,6 +307,8 @@ private:
// one is the preferred) // one is the preferred)
size_t m_preferred; size_t m_preferred;
wxDataFormat m_receivedFormat;
DECLARE_NO_COPY_CLASS(wxDataObjectComposite) DECLARE_NO_COPY_CLASS(wxDataObjectComposite)
}; };

7
src/common/dobjcmn.cpp
View File

@@ -86,6 +86,7 @@ bool wxDataObjectBase::IsSupported(const wxDataFormat& format,
wxDataObjectComposite::wxDataObjectComposite() wxDataObjectComposite::wxDataObjectComposite()
{ {
m_preferred = 0; m_preferred = 0;
m_receivedFormat = wxFormatInvalid;
} }
wxDataObjectComposite::~wxDataObjectComposite() wxDataObjectComposite::~wxDataObjectComposite()
@@ -120,6 +121,11 @@ void wxDataObjectComposite::Add(wxDataObjectSimple *dataObject, bool preferred)
m_dataObjects.Append( dataObject ); m_dataObjects.Append( dataObject );
} }
wxDataFormat wxDataObjectComposite::GetReceivedFormat() const
{
return m_receivedFormat;
}
wxDataFormat wxDataFormat
wxDataObjectComposite::GetPreferredFormat(Direction WXUNUSED(dir)) const wxDataObjectComposite::GetPreferredFormat(Direction WXUNUSED(dir)) const
{ {
@@ -219,6 +225,7 @@ bool wxDataObjectComposite::SetData(const wxDataFormat& format,
wxCHECK_MSG( dataObj, false, wxCHECK_MSG( dataObj, false,
wxT("unsupported format in wxDataObjectComposite")); wxT("unsupported format in wxDataObjectComposite"));
m_receivedFormat = format;
return dataObj->SetData( len, buf ); return dataObj->SetData( len, buf );
} }

8
wxPython/src/_dataobj.i
View File

@@ -524,6 +524,14 @@ public:
the preferred object if preferred is True.", ""); the preferred object if preferred is True.", "");
%cleardisown( wxDataObjectSimple *dataObject ); %cleardisown( wxDataObjectSimple *dataObject );
DocDeclStr(
wxDataFormat , GetReceivedFormat() const,
"Report the format passed to the `SetData` method. This should be the
format of the data object within the composite that recieved data from
the clipboard or the DnD operation. You can use this method to find
out what kind of data object was recieved.", "");
}; };
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------