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
This commit is contained in:
@@ -94,6 +94,7 @@ public:
|
|||||||
|
|
||||||
private:
|
private:
|
||||||
bool m_clearOnExit;
|
bool m_clearOnExit;
|
||||||
|
bool m_isOpened;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // wxUSE_CLIPBOARD
|
#endif // wxUSE_CLIPBOARD
|
||||||
|
@@ -539,6 +539,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxClipboard, wxObject)
|
|||||||
wxClipboard::wxClipboard()
|
wxClipboard::wxClipboard()
|
||||||
{
|
{
|
||||||
m_clearOnExit = FALSE;
|
m_clearOnExit = FALSE;
|
||||||
|
m_isOpened = FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
wxClipboard::~wxClipboard()
|
wxClipboard::~wxClipboard()
|
||||||
@@ -582,6 +583,7 @@ bool wxClipboard::Flush()
|
|||||||
bool wxClipboard::Open()
|
bool wxClipboard::Open()
|
||||||
{
|
{
|
||||||
// OLE opens clipboard for us
|
// OLE opens clipboard for us
|
||||||
|
m_isOpened = TRUE;
|
||||||
#if wxUSE_OLE_CLIPBOARD
|
#if wxUSE_OLE_CLIPBOARD
|
||||||
return TRUE;
|
return TRUE;
|
||||||
#else
|
#else
|
||||||
@@ -592,7 +594,7 @@ bool wxClipboard::Open()
|
|||||||
bool wxClipboard::IsOpened() const
|
bool wxClipboard::IsOpened() const
|
||||||
{
|
{
|
||||||
#if wxUSE_OLE_CLIPBOARD
|
#if wxUSE_OLE_CLIPBOARD
|
||||||
return TRUE;
|
return m_isOpened;
|
||||||
#else
|
#else
|
||||||
return wxIsClipboardOpened();
|
return wxIsClipboardOpened();
|
||||||
#endif
|
#endif
|
||||||
@@ -696,6 +698,7 @@ bool wxClipboard::AddData( wxDataObject *data )
|
|||||||
|
|
||||||
void wxClipboard::Close()
|
void wxClipboard::Close()
|
||||||
{
|
{
|
||||||
|
m_isOpened = FALSE;
|
||||||
// OLE closes clipboard for us
|
// OLE closes clipboard for us
|
||||||
#if !wxUSE_OLE_CLIPBOARD
|
#if !wxUSE_OLE_CLIPBOARD
|
||||||
wxCloseClipboard();
|
wxCloseClipboard();
|
||||||
|
Reference in New Issue
Block a user