Implemented wxButton::DoGetBestSize for wxMotif. Now normal buttons

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

diff --git a/include/wx/motif/clipbrd.h b/include/wx/motif/clipbrd.h
index 6b675bc64578ac9b87722b9047651de6e6bb0729..6b17de1e9f5af18121adb3eb932682db3281f1c2 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


@@ -21,9 +18,10 @@
 
 #if wxUSE_CLIPBOARD
 
 
 #if wxUSE_CLIPBOARD
 

-#include "wx/dataobj.h"
+class wxDataObject;

 
 

-#include "wx/module.h"
+#include "wx/list.h"
+WX_DECLARE_LIST(wxDataObject, wxDataObjectList);

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


@@ -45,40 +43,45 @@ class wxClipboard : public wxClipboardBase
 public:
     wxClipboard();
     ~wxClipboard();
 public:
     wxClipboard();
     ~wxClipboard();

-
+    

     // open the clipboard before SetData() and GetData()
     virtual bool Open();
     // open the clipboard before SetData() and GetData()
     virtual bool Open();

-
+    

     // 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
     // implementation from now on

-
+    

     bool              m_open;
     bool              m_open;

-    wxList            m_data;
+    wxDataObjectList  m_data;

     bool              m_usePrimary;
     bool              m_usePrimary;

-
+    

 private:
     DECLARE_DYNAMIC_CLASS(wxClipboard)
 };
 
 private:
     DECLARE_DYNAMIC_CLASS(wxClipboard)
 };
 

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

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

-    // _WX_CLIPBRD_H_
+// _WX_CLIPBRD_H_