Fix hiding wxMediaEvent::Clone().

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

diff --git a/include/wx/msw/clipbrd.h b/include/wx/msw/clipbrd.h
index 377a8ffea9a764088da5aa3a6588497a884e36d9..ce57d79a5c283f448cdf4324d06a2abacc4e59d0 100644 (file)
--- a/include/wx/msw/clipbrd.h
+++ b/include/wx/msw/clipbrd.h
@@ -22,11 +22,8 @@
 #include "wx/module.h"
 #include "wx/dataobj.h"     // for wxDataFormat
 
 #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,8 +47,6 @@ WXDLLEXPORT bool wxGetClipboardFormatName(wxDataFormat dataFormat,
                                           wxChar *formatName,
                                           int maxCount);
 
                                           wxChar *formatName,
                                           int maxCount);
 

-#endif // WXWIN_COMPATIBILITY_2_4
-

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


@@ -95,7 +90,7 @@ public:
     virtual bool Flush();
 
     // X11 has two clipboards which get selected by this call. Empty on MSW.
     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;
 
 private:
     bool m_clearOnExit;