SetTextColour is gone

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

diff --git a/include/wx/motif/clipbrd.h b/include/wx/motif/clipbrd.h
index 6b17de1e9f5af18121adb3eb932682db3281f1c2..7aecda908dcb8b92b7821b50adfb7dcef3c7ac6b 100644 (file)
--- a/include/wx/motif/clipbrd.h
+++ b/include/wx/motif/clipbrd.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        clipbrd.h
+// Name:        wx/motif/clipbrd.h

 // Purpose:     Clipboard functionality.
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     Clipboard functionality.
 // Author:      Julian Smart
 // Modified by:


@@ -12,16 +12,15 @@
 #ifndef _WX_CLIPBRD_H_
 #define _WX_CLIPBRD_H_
 
 #ifndef _WX_CLIPBRD_H_
 #define _WX_CLIPBRD_H_
 

-#ifdef __GNUG__
-#pragma interface "clipbrd.h"
-#endif
-

 #if wxUSE_CLIPBOARD
 
 #if wxUSE_CLIPBOARD
 

-class wxDataObject;
+class WXDLLIMPEXP_CORE wxDataObject;
+struct wxDataIdToDataObject;

 
 #include "wx/list.h"
 
 #include "wx/list.h"

+

 WX_DECLARE_LIST(wxDataObject, wxDataObjectList);
 WX_DECLARE_LIST(wxDataObject, wxDataObjectList);

+WX_DECLARE_LIST(wxDataIdToDataObject, wxDataIdToDataObjectList);

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


@@ -38,45 +37,45 @@ bool WXDLLEXPORT wxGetClipboardFormatName(wxDataFormat dataFormat, char *formatN
 // wxClipboard
 //-----------------------------------------------------------------------------
 
 // wxClipboard
 //-----------------------------------------------------------------------------
 

-class wxClipboard : public wxClipboardBase
+class WXDLLIMPEXP_CORE wxClipboard : public wxClipboardBase

 {
 public:
     wxClipboard();
 {
 public:
     wxClipboard();

-    ~wxClipboard();
-    
+    virtual ~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();

-    
+

     // opened?
     virtual bool IsOpened() const { return m_open; }
     // opened?
     virtual bool IsOpened() const { return m_open; }

-    
+

     // replaces the data on the clipboard with data
     virtual bool SetData( wxDataObject *data );
     // replaces the data on the clipboard with data
     virtual bool SetData( wxDataObject *data );

-    
+

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

-    
+

     // format available on the clipboard ?
     virtual bool IsSupported( const wxDataFormat& format );
     // format available on the clipboard ?
     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 );

-    
+

     // 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)
+
+    virtual void UsePrimarySelection(bool primary = true)

     { m_usePrimary = primary; }
     { m_usePrimary = primary; }

-    
+

     // implementation from now on
     // implementation from now on

-    

     bool              m_open;
     wxDataObjectList  m_data;
     bool              m_usePrimary;
     bool              m_open;
     wxDataObjectList  m_data;
     bool              m_usePrimary;

-    
+    wxDataIdToDataObjectList m_idToObject;
+

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