From 2c8b6466b9e1b56090a05a7461c2f6060b24d255 Mon Sep 17 00:00:00 2001 From: John Rennie Date: Fri, 2 Aug 2013 10:38:54 +0100 Subject: Win32: change GUIDialogKeyboardGeneric to use g_Windowing.GetClipboard --- xbmc/dialogs/GUIDialogKeyboardGeneric.cpp | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/xbmc/dialogs/GUIDialogKeyboardGeneric.cpp b/xbmc/dialogs/GUIDialogKeyboardGeneric.cpp index 4fbe0c8eab..3880aea1a4 100644 --- a/xbmc/dialogs/GUIDialogKeyboardGeneric.cpp +++ b/xbmc/dialogs/GUIDialogKeyboardGeneric.cpp @@ -758,20 +758,7 @@ void CGUIDialogKeyboardGeneric::OnPasteClipboard(void) if (szStr) pasted_text = szStr; #elif defined TARGET_WINDOWS - if (OpenClipboard(NULL)) - { - HGLOBAL hglb = GetClipboardData(CF_UNICODETEXT); - if (hglb != NULL) - { - LPWSTR lpwstr = (LPWSTR) GlobalLock(hglb); - if (lpwstr != NULL) - { - pasted_text = lpwstr; - GlobalUnlock(hglb); - } - } - CloseClipboard(); - } + pasted_text = g_Windowing.GetClipboard(); #endif // Insert the pasted text at the current cursor position. -- cgit v1.2.3