Added m_isOpened variable to simulate opening/closing

the clipboard on wxMSW

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

diff --git a/include/wx/msw/clipbrd.h b/include/wx/msw/clipbrd.h
index bc4e18fdbe7e28a40561e9820d19cea33c89a68e..c4a2594970613a7bc06df2c5d90eeddff17a4c92 100644 (file)
--- a/include/wx/msw/clipbrd.h
+++ b/include/wx/msw/clipbrd.h
@@ -94,6 +94,7 @@ public:
 
 private:
     bool m_clearOnExit;
 
 private:
     bool m_clearOnExit;

+    bool m_isOpened;

 };
 
 #endif // wxUSE_CLIPBOARD
 };
 
 #endif // wxUSE_CLIPBOARD

diff --git a/src/msw/clipbrd.cpp b/src/msw/clipbrd.cpp
index c03b65fd46e3837b86787447bc76b575cc55e9f8..875c9f838a9f62a5f8be1ed6aaeffc3d0c5903b9 100644 (file)
--- a/src/msw/clipbrd.cpp
+++ b/src/msw/clipbrd.cpp
@@ -539,6 +539,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxClipboard, wxObject)
 wxClipboard::wxClipboard()
 {
     m_clearOnExit = FALSE;
 wxClipboard::wxClipboard()
 {
     m_clearOnExit = FALSE;

+    m_isOpened = FALSE;

 }
 
 wxClipboard::~wxClipboard()
 }
 
 wxClipboard::~wxClipboard()


@@ -582,6 +583,7 @@ bool wxClipboard::Flush()
 bool wxClipboard::Open()
 {
     // OLE opens clipboard for us
 bool wxClipboard::Open()
 {
     // OLE opens clipboard for us

+    m_isOpened = TRUE;

 #if wxUSE_OLE_CLIPBOARD
     return TRUE;
 #else
 #if wxUSE_OLE_CLIPBOARD
     return TRUE;
 #else


@@ -592,7 +594,7 @@ bool wxClipboard::Open()
 bool wxClipboard::IsOpened() const
 {
 #if wxUSE_OLE_CLIPBOARD
 bool wxClipboard::IsOpened() const
 {
 #if wxUSE_OLE_CLIPBOARD

-    return TRUE;
+    return m_isOpened;

 #else
     return wxIsClipboardOpened();
 #endif
 #else
     return wxIsClipboardOpened();
 #endif


@@ -696,6 +698,7 @@ bool wxClipboard::AddData( wxDataObject *data )
 
 void wxClipboard::Close()
 {
 
 void wxClipboard::Close()
 {

+    m_isOpened = FALSE;

     // OLE closes clipboard for us
 #if !wxUSE_OLE_CLIPBOARD
     wxCloseClipboard();
     // OLE closes clipboard for us
 #if !wxUSE_OLE_CLIPBOARD
     wxCloseClipboard();