Fixed ambiguity

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

diff --git a/include/wx/motif/clipbrd.h b/include/wx/motif/clipbrd.h
index e0baf4a4ac5eee6f526f8bdd0bcd70fb72853dc5..1e16040456ef5846adece8e4a37aba41cf34489f 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_
 
-#ifdef __GNUG__
-    #pragma interface "clipbrd.h"
+#if defined(__GNUG__) && !defined(__APPLE__)
+#pragma interface "clipbrd.h"
 #endif
 
 #if wxUSE_CLIPBOARD
 
+class wxDataObject;
+struct wxDataIdToDataObject;
+
 #include "wx/list.h"
 
+WX_DECLARE_LIST(wxDataObject, wxDataObjectList);
+WX_DECLARE_LIST(wxDataIdToDataObject, wxDataIdToDataObjectList);
+
 bool WXDLLEXPORT wxOpenClipboard();
 bool WXDLLEXPORT wxClipboardOpen();
 bool WXDLLEXPORT wxCloseClipboard();
@@ -40,39 +46,39 @@ class wxClipboard : public wxClipboardBase
 public:
     wxClipboard();
     ~wxClipboard();
-
+    
     // open the clipboard before SetData() and GetData()
     virtual bool Open();
-
+    
     // close the clipboard after SetData() and GetData()
     virtual void Close();
-
+    
     // opened?
     virtual bool IsOpened() const { return m_open; }
-
+    
     // replaces the data on the clipboard with data
     virtual bool SetData( wxDataObject *data );
-
+    
     // adds data to the clipboard
     virtual bool AddData( wxDataObject *data );
-
+    
     // 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 );
-
+    
     // 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
-
     bool              m_open;
-    wxList            m_data;
+    wxDataObjectList  m_data;
     bool              m_usePrimary;
+    wxDataIdToDataObjectList m_idToObject;
 
 private:
     DECLARE_DYNAMIC_CLASS(wxClipboard)
@@ -81,4 +87,4 @@ private:
 #endif // wxUSE_CLIPBOARD
 
 #endif
-    // _WX_CLIPBRD_H_
+// _WX_CLIPBRD_H_