summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2016-11-11 14:11:14 +0100
committer Miodrag Milanovic <mmicko@gmail.com>2016-11-11 16:12:01 +0100
commit5c0edceec3a939ce7804b23beaeebfc700413489 (patch)
tree6dc9ad405185b8cff0cbc886809ea4864455afb1
parent2918d8def4b908f6f7d8d4b1b1a183c7be9142b4 (diff)
clipboard handling for uwp (nw)
-rw-r--r--src/osd/modules/lib/osdlib_uwp.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/osd/modules/lib/osdlib_uwp.cpp b/src/osd/modules/lib/osdlib_uwp.cpp
index ccdd3f3886a..344418e7efb 100644
--- a/src/osd/modules/lib/osdlib_uwp.cpp
+++ b/src/osd/modules/lib/osdlib_uwp.cpp
@@ -184,7 +184,7 @@ void osd_break_into_debugger(const char *message)
static char *get_clipboard_text_by_format(UINT format, std::string (*convert)(LPCVOID data))
{
- /*DataPackageView^ dataPackageView;
+ DataPackageView^ dataPackageView;
IAsyncOperation<String^>^ getTextOp;
String^ clipboardText;
@@ -192,8 +192,7 @@ static char *get_clipboard_text_by_format(UINT format, std::string (*convert)(LP
getTextOp = dataPackageView->GetTextAsync();
clipboardText = getTextOp->GetResults();
- return osd::text::from_wstring(clipboardText->Data()).c_str();*/
- return nullptr;
+ return (char *)convert(clipboardText->Data()).c_str();
}
//============================================================