From 796a9b8f786810298d5a6bf6eeeedc8ecddb4163 Mon Sep 17 00:00:00 2001 From: Mirek Fidler Date: Thu, 21 Apr 2022 11:36:38 +0200 Subject: [PATCH] VirtualGui: Fixed to compile --- uppsrc/VirtualGui/Clip.cpp | 28 +++------------------------- 1 file changed, 3 insertions(+), 25 deletions(-) diff --git a/uppsrc/VirtualGui/Clip.cpp b/uppsrc/VirtualGui/Clip.cpp index 4cca6d2a7..2f93d4e08 100644 --- a/uppsrc/VirtualGui/Clip.cpp +++ b/uppsrc/VirtualGui/Clip.cpp @@ -53,21 +53,17 @@ void AppendClipboardText(const String& s) void AppendClipboardUnicodeText(const WString& s) { - AppendClipboard("wtext", (byte *)~s, sizeof(wchar) * s.GetLength()); + AppendClipboardText(s.ToString()); } const char *ClipFmtsText() { - return "wtext;text"; + return "text"; } String GetString(PasteClip& clip) { GuiLock __; - if(clip.Accept("wtext")) { - String s = ~clip; - return WString((const wchar *)~s, strlen__((const wchar *)~s)).ToString(); - } if(clip.IsAvailable("text")) return ~clip; return Null; @@ -76,10 +72,6 @@ String GetString(PasteClip& clip) WString GetWString(PasteClip& clip) { GuiLock __; - if(clip.Accept("wtext")) { - String s = ~clip; - return WString((const wchar *)~s, strlen__((const wchar *)~s)); - } if(clip.IsAvailable("text")) return (~clip).ToWString(); return Null; @@ -96,29 +88,20 @@ static String sText(const Value& data) return data; } -static String sWText(const Value& data) -{ - return Unicode__(WString(data)); -} - void Append(VectorMap& data, const String& text) { data.GetAdd("text", ClipData(text, sText)); - data.GetAdd("wtext", ClipData(text, sWText)); } void Append(VectorMap& data, const WString& text) { data.GetAdd("text", ClipData(text, sText)); - data.GetAdd("wtext", ClipData(text, sWText)); } String GetTextClip(const WString& text, const String& fmt) { if(fmt == "text") return text.ToString(); - if(fmt == "wtext") - return Unicode__(text); return Null; } @@ -126,8 +109,6 @@ String GetTextClip(const String& text, const String& fmt) { if(fmt == "text") return text; - if(fmt == "wtext") - return Unicode__(text.ToWString()); return Null; } @@ -139,9 +120,6 @@ String ReadClipboardText() WString ReadClipboardUnicodeText() { - String w = ReadClipboard("wtext"); - if(w.GetCount()) - return WString((const wchar *)~w, w.GetLength() / 2); return ReadClipboard("text").ToWString(); } @@ -152,7 +130,7 @@ bool IsClipboardAvailable(const char *id) bool IsClipboardAvailableText() { - return IsClipboardAvailable("text") || IsClipboardAvailable("wtext"); + return IsClipboardAvailable("text"); } const char *ClipFmtsImage()