BC++ 5.5 and later supports wxUSE_ON_FATAL_EXCEPTION

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

diff --git a/include/wx/motif/clipbrd.h b/include/wx/motif/clipbrd.h
index c1a91626b5e8bac9bac55d48bb0b85d99ee8f137..f4e98c9899ff873df6e9359e9c82cb2b37d0724b 100644 (file)
--- a/include/wx/motif/clipbrd.h
+++ b/include/wx/motif/clipbrd.h
@@ -12,16 +12,19 @@
 #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
 
 class wxDataObject;
 #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(wxDataObject, wxDataObjectList);

+WX_DECLARE_LIST(wxDataIdToDataObject, wxDataIdToDataObjectList);

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


@@ -72,11 +75,11 @@ public:
     { m_usePrimary = primary; }
     
     // implementation from now on
     { m_usePrimary = primary; }
     
     // 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)
 };