reverted previous revision, old clipboard API is still used by wxMSW itself

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27921 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/msw/clipbrd.h b/include/wx/msw/clipbrd.h
index 377a8ffea9a764088da5aa3a6588497a884e36d9..8432b0f067b7d342f7f2adecb4f091d6d2dbb592 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
 //-----------------------------------------------------------------------------