From c5dc28ec2272a865ef2f28fd7ab151b55517fedf Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Mon, 26 Sep 2022 19:16:12 +0300
Subject: more clipboard shit removed

---
 plugins/ChangeKeyboardLayout/src/hook_events.cpp     |  4 ++--
 plugins/ChangeKeyboardLayout/src/text_operations.cpp | 16 +---------------
 plugins/ChangeKeyboardLayout/src/text_operations.h   |  1 -
 3 files changed, 3 insertions(+), 18 deletions(-)

(limited to 'plugins/ChangeKeyboardLayout/src')

diff --git a/plugins/ChangeKeyboardLayout/src/hook_events.cpp b/plugins/ChangeKeyboardLayout/src/hook_events.cpp
index c9598d5814..88e9b0c08d 100644
--- a/plugins/ChangeKeyboardLayout/src/hook_events.cpp
+++ b/plugins/ChangeKeyboardLayout/src/hook_events.cpp
@@ -189,7 +189,7 @@ int CALLBACK CKLPopupDlgProc(HWND hWnd, UINT uiMessage, WPARAM wParam, LPARAM lP
 	case WM_COMMAND:
 		if (HIWORD(wParam) == STN_CLICKED) {
 			if (!IsBadStringPtr(ptszPopupText, MaxTextSize))
-				CopyTextToClipboard(ptszPopupText);
+				Utils_ClipboardCopy(ptszPopupText);
 			PUDeletePopup(hWnd);
 		}
 		break;
@@ -200,7 +200,7 @@ int CALLBACK CKLPopupDlgProc(HWND hWnd, UINT uiMessage, WPARAM wParam, LPARAM lP
 
 	case UM_POPUPACTION:
 		if ((lParam == 0) && (!IsBadStringPtr(ptszPopupText, MaxTextSize)))
-			CopyTextToClipboard(ptszPopupText);
+			Utils_ClipboardCopy(ptszPopupText);
 		break;
 
 	case UM_FREEPLUGINDATA:
diff --git a/plugins/ChangeKeyboardLayout/src/text_operations.cpp b/plugins/ChangeKeyboardLayout/src/text_operations.cpp
index 85fb6bf458..14d3d56894 100644
--- a/plugins/ChangeKeyboardLayout/src/text_operations.cpp
+++ b/plugins/ChangeKeyboardLayout/src/text_operations.cpp
@@ -47,20 +47,6 @@ wchar_t* GeTStringFromStreamData(EditStreamData *esd)
 
 /////////////////////////////////////////////////////////////////////////////////////////
 
-BOOL CopyTextToClipboard(wchar_t *ptszText)
-{
-	if (!OpenClipboard(nullptr))
-		return FALSE;
-
-	EmptyClipboard();
-	HGLOBAL hCopy = GlobalAlloc(GMEM_MOVEABLE, (mir_wstrlen(ptszText) + 1) * sizeof(wchar_t));
-	mir_wstrcpy((wchar_t *)GlobalLock(hCopy), ptszText);
-	GlobalUnlock(hCopy);
-	SetClipboardData(CF_UNICODETEXT, hCopy);
-	CloseClipboard();
-	return TRUE;
-}
-
 LPSTR GetNameOfLayout(HKL hklLayout)
 {
 	LPSTR ptszLayName = (LPSTR)mir_alloc(KL_NAMELENGTH + 1);
@@ -438,7 +424,7 @@ int ChangeLayout(HWND hTextWnd, uint8_t TextOperation, BOOL CurrentWord)
 				Skin_PlaySound(SND_ChangeCase);
 
 			if (moOptions.CopyToClipboard)
-				CopyTextToClipboard(ptszMBox);
+				Utils_ClipboardCopy(ptszMBox);
 
 			//-------------------------------Покажем попапы------------------------------------------ 			
 			if (moOptions.ShowPopup) {
diff --git a/plugins/ChangeKeyboardLayout/src/text_operations.h b/plugins/ChangeKeyboardLayout/src/text_operations.h
index 786d811c2d..a8fe87770c 100644
--- a/plugins/ChangeKeyboardLayout/src/text_operations.h
+++ b/plugins/ChangeKeyboardLayout/src/text_operations.h
@@ -3,7 +3,6 @@
 
 #include "stdafx.h"
 
-BOOL CopyTextToClipboard(wchar_t *ptszText);
 LPSTR GetNameOfLayout(HKL hklLayout);
 wchar_t *GetShortNameOfLayout(HKL hklLayout);
 wchar_t *GenerateLayoutString(HKL hklLayout);
-- 
cgit v1.2.3