From 92de61e4295f385a6fe3be1a01aa94187a8dde2a Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Thu, 10 May 2012 22:38:14 +0000 Subject: [PATCH] More interface fixes for Phoenix git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71402 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- interface/wx/dataobj.h | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/interface/wx/dataobj.h b/interface/wx/dataobj.h index ea43966b03..b5614303d0 100644 --- a/interface/wx/dataobj.h +++ b/interface/wx/dataobj.h @@ -106,11 +106,21 @@ public: */ void SetType(wxDataFormatId type); + /** + Returns @true if the formats are different. + */ + bool operator !=(const wxDataFormat& format) const; + /** Returns @true if the formats are different. */ bool operator !=(wxDataFormatId format) const; + /** + Returns @true if the formats are equal. + */ + bool operator ==(const wxDataFormat& format) const; + /** Returns @true if the formats are equal. */ @@ -496,7 +506,7 @@ public: @since 2.9.1 */ wxDataObjectSimple *GetObject(const wxDataFormat& format, - wxDataObjectBase::Direction dir = Get) const; + wxDataObject::Direction dir = wxDataObject::Get) const; }; @@ -709,7 +719,7 @@ public: Returns 1 under other platforms (e.g. wxMSW) or when building in ANSI mode (@c wxUSE_UNICODE==0). */ - virtual size_t GetFormatCount(Direction dir = Get) const; + virtual size_t GetFormatCount(wxDataObject::Direction dir = wxDataObject::Get) const; /** Returns the preferred format supported by this object. @@ -726,7 +736,7 @@ public: under other ports returns only one of the two, depending on the build mode. */ virtual void GetAllFormats(wxDataFormat* formats, - Direction dir = Get) const = 0; + wxDataObject::Direction dir = wxDataObject::Get) const; /** Sets the text associated with the data object. This method is called -- 2.45.2