Sorry, should be a __UNIX__ test

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

diff --git a/include/wx/motif/clipbrd.h b/include/wx/motif/clipbrd.h
index 848bfe65655800377b0aee28b9964a3670d979d2..f4e98c9899ff873df6e9359e9c82cb2b37d0724b 100644 (file)
--- a/include/wx/motif/clipbrd.h
+++ b/include/wx/motif/clipbrd.h
@@ -12,14 +12,20 @@
 #ifndef _WX_CLIPBRD_H_
 #define _WX_CLIPBRD_H_
 
 #ifndef _WX_CLIPBRD_H_
 #define _WX_CLIPBRD_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma interface "clipbrd.h"
 #endif
 
 #if wxUSE_CLIPBOARD
 
 #pragma interface "clipbrd.h"
 #endif
 
 #if wxUSE_CLIPBOARD
 

+class 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();


@@ -65,15 +71,15 @@ 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)
+    virtual void UsePrimarySelection(bool primary = true)

     { m_usePrimary = primary; }
     
     // implementation from now on
     { m_usePrimary = primary; }
     
     // 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)
 };