optionally count repeating wxLog messages instead of logging all (patch 1520815)

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

diff --git a/docs/changes.txt b/docs/changes.txt
index 3755c182220ec8906a068039679f94f62ce19c9f..64dad4cddee5483c8ff229877d45e31f7fce2b1f 100644 (file)
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -102,7 +102,6 @@ wxMSW:
 - Fixed version script problems when using configure with cygwin/mingw32.
 - Use system default paper size for printing instead of A4.
 - Fix colours when converting wxBitmap with alpha to wxImage (nusi).
-- Clipboard data is now retained after the application exits.
 
 
 2.7.2

diff --git a/src/msw/clipbrd.cpp b/src/msw/clipbrd.cpp
index 3c233998730f770128c80ca64fb5e12010627b51..ee67b677fd694f50b2c6e0ebe782bf4223d27574 100644 (file)
--- a/src/msw/clipbrd.cpp
+++ b/src/msw/clipbrd.cpp
@@ -537,9 +537,7 @@ wxClipboard::~wxClipboard()
 {
     if ( m_lastDataObject )
     {
-        // Retain any remaining clipboard data
-        // after application exits.
-        Flush();
+        Clear();
     }
 
 #if wxUSE_OLE_CLIPBOARD