added conversion ctor to create const_iterator from iterator, otherwise assigning...

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

diff --git a/include/wx/msw/clipbrd.h b/include/wx/msw/clipbrd.h
index 377a8ffea9a764088da5aa3a6588497a884e36d9..be3f0b64e57f4439b2bdbd84b19c4bb8b2565a7a 100644 (file)
--- a/include/wx/msw/clipbrd.h
+++ b/include/wx/msw/clipbrd.h
@@ -12,21 +12,14 @@
 #ifndef _WX_CLIPBRD_H_
 #define _WX_CLIPBRD_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "clipbrd.h"
-#endif
-
 #if wxUSE_CLIPBOARD
 
 #include "wx/list.h"
 #include "wx/module.h"
 #include "wx/dataobj.h"     // for wxDataFormat
 
-#if WXWIN_COMPATIBILITY_2_4
-
 // These functions superceded by wxClipboard, but retained in order to
-// implement wxClipboard (and exported from DLL to preserve compatibility -
-// - otherwise they are only implementation details of src/msw/clipbrd.cpp).
+// implement wxClipboard, and for compatibility.
 
 // open/close the clipboard
 WXDLLEXPORT bool wxOpenClipboard();
@@ -50,8 +43,6 @@ WXDLLEXPORT bool wxGetClipboardFormatName(wxDataFormat dataFormat,
                                           wxChar *formatName,
                                           int maxCount);
 
-#endif // WXWIN_COMPATIBILITY_2_4
-
 //-----------------------------------------------------------------------------
 // wxClipboard
 //-----------------------------------------------------------------------------
@@ -95,10 +86,10 @@ public:
     virtual bool Flush();
 
     // X11 has two clipboards which get selected by this call. Empty on MSW.
-    void UsePrimarySelection( bool WXUNUSED(primary) = FALSE ) { }
+    void UsePrimarySelection( bool WXUNUSED(primary) = false ) { }
 
 private:
-    bool m_clearOnExit;
+    IDataObject *m_lastDataObject;
     bool m_isOpened;
 };