Added event handler macro

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

diff --git a/include/wx/motif/clipbrd.h b/include/wx/motif/clipbrd.h
index bd502e32bdb9b678d059702a39e8e81eeae1266e..d0aa3db2749fefb14e98f8e56379db1bb4a60de4 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:


@@ -14,7 +14,7 @@
 
 #if wxUSE_CLIPBOARD
 
 
 #if wxUSE_CLIPBOARD
 

-class WXDLLIMPEXP_CORE wxDataObject;
+class WXDLLIMPEXP_FWD_CORE wxDataObject;

 struct wxDataIdToDataObject;
 
 #include "wx/list.h"
 struct wxDataIdToDataObject;
 
 #include "wx/list.h"


@@ -22,16 +22,16 @@ struct wxDataIdToDataObject;
 WX_DECLARE_LIST(wxDataObject, wxDataObjectList);
 WX_DECLARE_LIST(wxDataIdToDataObject, wxDataIdToDataObjectList);
 
 WX_DECLARE_LIST(wxDataObject, wxDataObjectList);
 WX_DECLARE_LIST(wxDataIdToDataObject, wxDataIdToDataObjectList);
 

-bool WXDLLEXPORT wxOpenClipboard();
-bool WXDLLEXPORT wxClipboardOpen();
-bool WXDLLEXPORT wxCloseClipboard();
-bool WXDLLEXPORT wxEmptyClipboard();
-bool WXDLLEXPORT wxIsClipboardFormatAvailable(wxDataFormat dataFormat);
-bool WXDLLEXPORT wxSetClipboardData(wxDataFormat dataFormat, wxObject *obj, int width = 0, int height = 0);
-wxObject* WXDLLEXPORT wxGetClipboardData(wxDataFormat dataFormat, long *len = NULL);
-wxDataFormat WXDLLEXPORT wxEnumClipboardFormats(wxDataFormat dataFormat);
-wxDataFormat WXDLLEXPORT wxRegisterClipboardFormat(char *formatName);
-bool WXDLLEXPORT wxGetClipboardFormatName(wxDataFormat dataFormat, char *formatName, int maxCount);
+WXDLLEXPORT bool wxOpenClipboard();
+WXDLLEXPORT bool wxClipboardOpen();
+WXDLLEXPORT bool wxCloseClipboard();
+WXDLLEXPORT bool wxEmptyClipboard();
+WXDLLEXPORT bool wxIsClipboardFormatAvailable(wxDataFormat dataFormat);
+WXDLLEXPORT bool wxSetClipboardData(wxDataFormat dataFormat, wxObject *obj, int width = 0, int height = 0);
+WXDLLEXPORT wxObject* wxGetClipboardData(wxDataFormat dataFormat, long *len = NULL);
+WXDLLEXPORT wxDataFormat wxEnumClipboardFormats(wxDataFormat dataFormat);
+WXDLLEXPORT wxDataFormat wxRegisterClipboardFormat(char *formatName);
+WXDLLEXPORT bool wxGetClipboardFormatName(wxDataFormat dataFormat, char *formatName, int maxCount);

 
 //-----------------------------------------------------------------------------
 // wxClipboard
 
 //-----------------------------------------------------------------------------
 // wxClipboard


@@ -41,39 +41,35 @@ 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)
-    { m_usePrimary = primary; }
-    
+

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

-    bool              m_usePrimary;

     wxDataIdToDataObjectList m_idToObject;
 
 private:
     wxDataIdToDataObjectList m_idToObject;
 
 private:


@@ -82,5 +78,4 @@ private:
 
 #endif // wxUSE_CLIPBOARD
 
 
 #endif // wxUSE_CLIPBOARD
 

-#endif
-// _WX_CLIPBRD_H_
+#endif // _WX_CLIPBRD_H_