From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 25 Jul 2006 00:04:35 +0000 (+0000)
Subject: optionally count repeating wxLog messages instead of logging all (patch 1520815)
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/0edfdd963bdc9cfeb54d403ed77b5f36e4de8c84

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 3755c18222..64dad4cdde 100644
--- 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 3c23399873..ee67b677fd 100644
--- 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