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

More interface fixes for Phoenix

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71402 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2012-05-10 22:38:14 +00:00
parent c921d597cf
commit 92de61e429
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
interface/wx/dataobj.h
View File

@@ -106,11 +106,21 @@ public:
*/ */
void SetType(wxDataFormatId type); void SetType(wxDataFormatId type);
/**
Returns @true if the formats are different.
*/
bool operator !=(const wxDataFormat& format) const;
/** /**
Returns @true if the formats are different. Returns @true if the formats are different.
*/ */
bool operator !=(wxDataFormatId format) const; 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. Returns @true if the formats are equal.
*/ */
@@ -496,7 +506,7 @@ public:
@since 2.9.1 @since 2.9.1
*/ */
wxDataObjectSimple *GetObject(const wxDataFormat& format, 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 Returns 1 under other platforms (e.g. wxMSW) or when building in ANSI mode
(@c wxUSE_UNICODE==0). (@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. 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. under other ports returns only one of the two, depending on the build mode.
*/ */
virtual void GetAllFormats(wxDataFormat* formats, 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 Sets the text associated with the data object. This method is called