wxClipboard changes compilation fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27919 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -52,7 +52,7 @@ WXDLLEXPORT bool wxGetClipboardFormatName(wxDataFormat dataFormat,
|
|||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
|
|
||||||
class WXDLLEXPORT wxDataObject;
|
class WXDLLEXPORT wxDataObject;
|
||||||
class WXDLLEXPORT wxClipboard : public wxObject
|
class WXDLLEXPORT wxClipboard : public wxClipboardBase
|
||||||
{
|
{
|
||||||
DECLARE_DYNAMIC_CLASS(wxClipboard)
|
DECLARE_DYNAMIC_CLASS(wxClipboard)
|
||||||
|
|
||||||
@@ -76,7 +76,7 @@ public:
|
|||||||
virtual bool AddData( wxDataObject *data );
|
virtual bool AddData( wxDataObject *data );
|
||||||
|
|
||||||
// ask if data in correct format is available
|
// ask if data in correct format is available
|
||||||
virtual bool IsSupported( wxDataFormat format );
|
virtual bool IsSupported( const wxDataFormat& format );
|
||||||
|
|
||||||
// fill data with data on the clipboard (if available)
|
// fill data with data on the clipboard (if available)
|
||||||
virtual bool GetData( wxDataObject& data );
|
virtual bool GetData( wxDataObject& data );
|
||||||
|
@@ -51,7 +51,7 @@ WXDLLEXPORT bool wxGetClipboardFormatName(wxDataFormat dataFormat,
|
|||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
|
|
||||||
class WXDLLEXPORT wxDataObject;
|
class WXDLLEXPORT wxDataObject;
|
||||||
class WXDLLEXPORT wxClipboard : public wxObject
|
class WXDLLEXPORT wxClipboard : public wxClipboardBase
|
||||||
{
|
{
|
||||||
DECLARE_DYNAMIC_CLASS(wxClipboard)
|
DECLARE_DYNAMIC_CLASS(wxClipboard)
|
||||||
|
|
||||||
@@ -75,7 +75,7 @@ public:
|
|||||||
virtual bool AddData( wxDataObject *data );
|
virtual bool AddData( wxDataObject *data );
|
||||||
|
|
||||||
// ask if data in correct format is available
|
// ask if data in correct format is available
|
||||||
virtual bool IsSupported( wxDataFormat format );
|
virtual bool IsSupported( const wxDataFormat& format );
|
||||||
|
|
||||||
// fill data with data on the clipboard (if available)
|
// fill data with data on the clipboard (if available)
|
||||||
virtual bool GetData( wxDataObject& data );
|
virtual bool GetData( wxDataObject& data );
|
||||||
|
@@ -701,7 +701,7 @@ void wxClipboard::Close()
|
|||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
bool wxClipboard::IsSupported( wxDataFormat format )
|
bool wxClipboard::IsSupported( const wxDataFormat& format )
|
||||||
{
|
{
|
||||||
return wxIsClipboardFormatAvailable(format);
|
return wxIsClipboardFormatAvailable(format);
|
||||||
}
|
}
|
||||||
|
@@ -532,7 +532,7 @@ void wxClipboard::Close()
|
|||||||
wxCloseClipboard();
|
wxCloseClipboard();
|
||||||
}
|
}
|
||||||
|
|
||||||
bool wxClipboard::IsSupported( wxDataFormat format )
|
bool wxClipboard::IsSupported( const wxDataFormat& format )
|
||||||
{
|
{
|
||||||
return wxIsClipboardFormatAvailable(format);
|
return wxIsClipboardFormatAvailable(format);
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user