Remove defined(__WXMAC__) && defined(__APPLE__) case from the OS if/elif block.

[wxWidgets.git] / include / wx / os2 / clipbrd.h

diff --git a/include/wx/os2/clipbrd.h b/include/wx/os2/clipbrd.h
index 9d8c45ef36dcba8c3ce9a64ec2090806897eca9d..dfbd291c5e0ca50e7aef41107a8bbf76733dbad2 100644 (file)
--- a/include/wx/os2/clipbrd.h
+++ b/include/wx/os2/clipbrd.h
@@ -2,8 +2,8 @@
 // Name:        clipbrd.h
 // Purpose:     Clipboard functionality.
 //              Note: this functionality is under review, and
-//              is derived from wxWindows 1.xx code. Please contact
-//              the wxWindows developers for further information.
+//              is derived from wxWidgets 1.xx code. Please contact
+//              the wxWidgets developers for further information.
 // Author:      David Webster
 // Modified by:
 // Created:     10/13/99
@@ -50,14 +50,14 @@ WXDLLEXPORT bool wxGetClipboardFormatName(wxDataFormat dataFormat,
 // wxClipboard
 //-----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxDataObject;
-class WXDLLEXPORT wxClipboard : public wxObject
+class WXDLLIMPEXP_FWD_CORE wxDataObject;
+class WXDLLEXPORT wxClipboard : public wxClipboardBase
 {
     DECLARE_DYNAMIC_CLASS(wxClipboard)
 
 public:
     wxClipboard();
-    ~wxClipboard();
+    virtual ~wxClipboard();
 
     // open the clipboard before SetData() and GetData()
     virtual bool Open();
@@ -75,10 +75,10 @@ public:
     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 );
+    virtual bool GetData( wxDataObject& data );
 
     // clears wxTheClipboard and the system's clipboard if possible
     virtual void Clear();
@@ -88,13 +88,9 @@ public:
     // eating memory), otherwise the clipboard will be emptied on exit
     virtual bool Flush();
 
-    // X11 has two clipboards which get selected by this call. Empty on MSW.
-    void UsePrimarySelection( bool WXUNUSED(primary) = FALSE ) { }
-
 private:
     bool m_clearOnExit;
 };
 
 #endif // wxUSE_CLIPBOARD
-#endif
-    // _WX_CLIPBRD_H_
+#endif // _WX_CLIPBRD_H_