compilation fixes and some cleanup

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

diff --git a/include/wx/motif/clipbrd.h b/include/wx/motif/clipbrd.h
index 6b675bc64578ac9b87722b9047651de6e6bb0729..e0baf4a4ac5eee6f526f8bdd0bcd70fb72853dc5 100644 (file)
--- a/include/wx/motif/clipbrd.h
+++ b/include/wx/motif/clipbrd.h
@@ -1,9 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        clipbrd.h
 // Purpose:     Clipboard functionality.
 /////////////////////////////////////////////////////////////////////////////
 // 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.

 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98


@@ -16,14 +13,12 @@
 #define _WX_CLIPBRD_H_
 
 #ifdef __GNUG__
 #define _WX_CLIPBRD_H_
 
 #ifdef __GNUG__

-#pragma interface "clipbrd.h"
+    #pragma interface "clipbrd.h"

 #endif
 
 #if wxUSE_CLIPBOARD
 
 #endif
 
 #if wxUSE_CLIPBOARD
 

-#include "wx/dataobj.h"
-
-#include "wx/module.h"
+#include "wx/list.h"

 
 bool WXDLLEXPORT wxOpenClipboard();
 bool WXDLLEXPORT wxClipboardOpen();
 
 bool WXDLLEXPORT wxOpenClipboard();
 bool WXDLLEXPORT wxClipboardOpen();


@@ -52,19 +47,27 @@ public:
     // close the clipboard after SetData() and GetData()
     virtual void Close();
 
     // close the clipboard after SetData() and GetData()
     virtual void Close();
 

-    // can be called several times
+    // opened?
+    virtual bool IsOpened() const { return m_open; }
+
+    // replaces the data on the clipboard with data

     virtual bool SetData( wxDataObject *data );
 
     virtual bool SetData( wxDataObject *data );
 

+    // adds data to the clipboard
+    virtual bool AddData( wxDataObject *data );
+

     // format available on the clipboard ?
     // format available on the clipboard ?

-    // supply ID if private format, the same as wxPrivateDataObject::SetId()
-    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 );

 
     // clears wxTheClipboard and the system's clipboard if possible
     virtual void Clear();
 
 
     // clears wxTheClipboard and the system's clipboard if possible
     virtual void Clear();
 

+    virtual void UsePrimarySelection(bool primary = TRUE)
+        { m_usePrimary = primary; }
+

     // implementation from now on
 
     bool              m_open;
     // implementation from now on
 
     bool              m_open;


@@ -75,9 +78,6 @@ private:
     DECLARE_DYNAMIC_CLASS(wxClipboard)
 };
 
     DECLARE_DYNAMIC_CLASS(wxClipboard)
 };
 

-/* The clipboard */
-WXDLLEXPORT_DATA(extern wxClipboard*) wxTheClipboard;
-

 #endif // wxUSE_CLIPBOARD
 
 #endif
 #endif // wxUSE_CLIPBOARD
 
 #endif