added WX_ASSERT_MESSAGE macro to simply using CPPUNIT_ASSERT_MESSAGE with wxString...

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

diff --git a/include/wx/msw/clipbrd.h b/include/wx/msw/clipbrd.h
index 377a8ffea9a764088da5aa3a6588497a884e36d9..ee04acf8f70422f295e651d61b4745cf9edb20c3 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_
 
 #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 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
 // 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();
 
 // open/close the clipboard
 WXDLLEXPORT bool wxOpenClipboard();


@@ -50,20 +43,18 @@ WXDLLEXPORT bool wxGetClipboardFormatName(wxDataFormat dataFormat,
                                           wxChar *formatName,
                                           int maxCount);
 
                                           wxChar *formatName,
                                           int maxCount);
 

-#endif // WXWIN_COMPATIBILITY_2_4
-

 //-----------------------------------------------------------------------------
 // wxClipboard
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 // wxClipboard
 //-----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxDataObject;
+class WXDLLIMPEXP_FWD_CORE wxDataObject;

 class WXDLLEXPORT wxClipboard : public wxClipboardBase
 {
     DECLARE_DYNAMIC_CLASS(wxClipboard)
 
 public:
     wxClipboard();
 class WXDLLEXPORT wxClipboard : public wxClipboardBase
 {
     DECLARE_DYNAMIC_CLASS(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();


@@ -94,14 +85,11 @@ public:
     // eating memory), otherwise the clipboard will be emptied on exit
     virtual bool Flush();
 
     // eating memory), otherwise the clipboard will be emptied on exit
     virtual bool Flush();
 

-    // X11 has two clipboards which get selected by this call. Empty on MSW.
-    void UsePrimarySelection( bool WXUNUSED(primary) = FALSE ) { }
-

 private:
 private:

-    bool m_clearOnExit;
+    IDataObject *m_lastDataObject;

     bool m_isOpened;
 };
 
 #endif // wxUSE_CLIPBOARD
     bool m_isOpened;
 };
 
 #endif // wxUSE_CLIPBOARD

-#endif
-    // _WX_CLIPBRD_H_
+
+#endif // _WX_CLIPBRD_H_