removed wxHAS_NATIVE_TAB_TRAVERSAL which is now defined in wx/window.h

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

diff --git a/include/wx/motif/clipbrd.h b/include/wx/motif/clipbrd.h
index e0baf4a4ac5eee6f526f8bdd0bcd70fb72853dc5..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,14 +12,16 @@
 #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 WXDLLIMPEXP_CORE wxDataObject;
+struct wxDataIdToDataObject;
+

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

+WX_DECLARE_LIST(wxDataObject, wxDataObjectList);
+WX_DECLARE_LIST(wxDataIdToDataObject, wxDataIdToDataObjectList);
+

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


@@ -35,11 +37,11 @@ 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();


@@ -65,14 +67,14 @@ public:
     // 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; }
+    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;

+    wxDataIdToDataObjectList m_idToObject;

 
 private:
     DECLARE_DYNAMIC_CLASS(wxClipboard)
 
 private:
     DECLARE_DYNAMIC_CLASS(wxClipboard)


@@ -81,4 +83,4 @@ private:
 #endif // wxUSE_CLIPBOARD
 
 #endif
 #endif // wxUSE_CLIPBOARD
 
 #endif

-    // _WX_CLIPBRD_H_
+// _WX_CLIPBRD_H_