Integrated fixes from 1.0 branch.

This commit is contained in:
crs
2003-08-06 21:09:25 +00:00
parent 345de4cd11
commit 2f9cdfd1b2
7 changed files with 34 additions and 11 deletions

View File

@@ -43,7 +43,7 @@ CMSWindowsClipboard::~CMSWindowsClipboard()
}
bool
CMSWindowsClipboard::empty()
CMSWindowsClipboard::emptyUnowned()
{
LOG((CLOG_DEBUG "empty clipboard"));
@@ -53,6 +53,16 @@ CMSWindowsClipboard::empty()
return false;
}
return true;
}
bool
CMSWindowsClipboard::empty()
{
if (!emptyUnowned()) {
return false;
}
// mark clipboard as being owned by synergy
HGLOBAL data = GlobalAlloc(GMEM_MOVEABLE | GMEM_DDESHARE, 1);
SetClipboardData(getOwnershipFormat(), data);