wxClipboard changes compilation fixes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27919 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/msw/clipbrd.h b/include/wx/msw/clipbrd.h
index 7d8b873c1178e0d4fdae5ff587d5c56a95942d70..8432b0f067b7d342f7f2adecb4f091d6d2dbb592 100644 (file)
--- a/include/wx/msw/clipbrd.h
+++ b/include/wx/msw/clipbrd.h
@@ -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 );
 
     // ask if data in correct format is available
     virtual bool AddData( wxDataObject *data );
 
     // 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)
     virtual bool GetData( wxDataObject& data );
 
     // fill data with data on the clipboard (if available)
     virtual bool GetData( wxDataObject& data );

diff --git a/include/wx/os2/clipbrd.h b/include/wx/os2/clipbrd.h
index ab3c933eb9a9e8de284654c225bb07fb042e2a2f..2db04c431a1c7fa4f5786c7815b5a69f47200dc4 100644 (file)
--- a/include/wx/os2/clipbrd.h
+++ b/include/wx/os2/clipbrd.h
@@ -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 );
 
     // ask if data in correct format is available
     virtual bool AddData( wxDataObject *data );
 
     // 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)
     virtual bool GetData( wxDataObject& data );
 
     // fill data with data on the clipboard (if available)
     virtual bool GetData( wxDataObject& data );

diff --git a/src/msw/clipbrd.cpp b/src/msw/clipbrd.cpp
index c3ed1b194b89ddf3354c7b988de9423796559fa7..9d351247651e1670efba85920b0a4d784b455383 100644 (file)
--- a/src/msw/clipbrd.cpp
+++ b/src/msw/clipbrd.cpp
@@ -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);
 }

diff --git a/src/os2/clipbrd.cpp b/src/os2/clipbrd.cpp
index e27f3bc58a43b3fc9b509c5a4257d769b8bdac1f..efb52d4ea3f99ff72fa3ef7322a2819cbefd3e24 100644 (file)
--- a/src/os2/clipbrd.cpp
+++ b/src/os2/clipbrd.cpp
@@ -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);
 }