From af24ae6db7ebce0a1573c98a224b6971bb5a16db Mon Sep 17 00:00:00 2001 From: crs Date: Mon, 26 May 2003 09:49:38 +0000 Subject: [PATCH] No longer installing clibboard format for plain text on windows nt family because nt automatically converts to and from the unicode format. This may fix text encoding errors when synergy puts non-ascii text on the clipboard and other clients prefer CF_TEXT to CF_UNICODE (which they should not because synergy lists CF_UNICODE first). --- lib/platform/CMSWindowsClipboard.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/platform/CMSWindowsClipboard.cpp b/lib/platform/CMSWindowsClipboard.cpp index 7df5d61f..1f3fd408 100644 --- a/lib/platform/CMSWindowsClipboard.cpp +++ b/lib/platform/CMSWindowsClipboard.cpp @@ -16,6 +16,7 @@ #include "CMSWindowsClipboardTextConverter.h" #include "CMSWindowsClipboardUTF16Converter.h" #include "CLog.h" +#include "CArchMiscWindows.h" // // CMSWindowsClipboard @@ -29,7 +30,11 @@ CMSWindowsClipboard::CMSWindowsClipboard(HWND window) : { // add converters, most desired first m_converters.push_back(new CMSWindowsClipboardUTF16Converter); - m_converters.push_back(new CMSWindowsClipboardTextConverter); + if (CArchMiscWindows::isWindows95Family()) { + // windows nt family converts to/from unicode automatically. + // let it do so to avoid text encoding issues. + m_converters.push_back(new CMSWindowsClipboardTextConverter); + } } CMSWindowsClipboard::~CMSWindowsClipboard()