From dc38d017dab888de1e2d530b916c94989489af94 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Wed, 5 Apr 2017 22:51:23 +0300
Subject: two remaining crutches removed

---
 plugins/Dropbox/src/dropbox_utils.cpp       | 8 +-------
 plugins/QuickReplies/src/stdafx.h           | 2 --
 plugins/TranslitSwitcher/src/Layoutproc.cpp | 4 +---
 plugins/TranslitSwitcher/src/stdafx.h       | 4 +---
 4 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/plugins/Dropbox/src/dropbox_utils.cpp b/plugins/Dropbox/src/dropbox_utils.cpp
index 6da10ae8b3..cd71d187f7 100644
--- a/plugins/Dropbox/src/dropbox_utils.cpp
+++ b/plugins/Dropbox/src/dropbox_utils.cpp
@@ -116,13 +116,7 @@ void CDropbox::SendToContact(MCONTACT hContact, const wchar_t *data)
 
 void CDropbox::PasteToInputArea(MCONTACT hContact, const wchar_t *data)
 {
-	MessageWindowData mwd;
-	if (!Srmm_GetWindowData(hContact, mwd)) {
-		HWND hEdit = GetDlgItem(mwd.hwndWindow, 1002 /*IDC_MESSAGE*/);
-		if (!hEdit) hEdit = GetDlgItem(mwd.hwndWindow, 1009 /*IDC_CHATMESSAGE*/);
-
-		SendMessage(hEdit, EM_REPLACESEL, TRUE, (LPARAM)data);
-	}
+	CallService(MS_MSG_SENDMESSAGEW, hContact, (LPARAM)data);
 }
 
 void CDropbox::PasteToClipboard(const wchar_t *data)
diff --git a/plugins/QuickReplies/src/stdafx.h b/plugins/QuickReplies/src/stdafx.h
index 3c5ae4b296..827974eb82 100644
--- a/plugins/QuickReplies/src/stdafx.h
+++ b/plugins/QuickReplies/src/stdafx.h
@@ -36,8 +36,6 @@ Boston, MA 02111-1307, USA.
 #include "resource.h"
 
 #define MODULE "QuickReplies"
-#define IDC_MESSAGE 1002
-#define IDC_CHATMESSAGE 1009
 
 #define MS_QUICKREPLIES_SERVICE MODULE"/Service"
 
diff --git a/plugins/TranslitSwitcher/src/Layoutproc.cpp b/plugins/TranslitSwitcher/src/Layoutproc.cpp
index 043ccf20b4..e36052669f 100644
--- a/plugins/TranslitSwitcher/src/Layoutproc.cpp
+++ b/plugins/TranslitSwitcher/src/Layoutproc.cpp
@@ -652,9 +652,7 @@ int OnButtonPressed(WPARAM, LPARAM lParam)
 	else
 		return 0;
 
-	HWND hEdit = GetDlgItem(cbcd->hwndFrom, IDC_MESSAGE);
-	if (!hEdit)
-		hEdit = GetDlgItem(cbcd->hwndFrom, IDC_CHATMESSAGE);
+	HWND hEdit = GetDlgItem(cbcd->hwndFrom, IDC_SRMM_MESSAGE);
 
 	BYTE byKeybState[256];
 	GetKeyboardState(byKeybState);
diff --git a/plugins/TranslitSwitcher/src/stdafx.h b/plugins/TranslitSwitcher/src/stdafx.h
index 3d6e3ee724..fd6e7cd3c7 100644
--- a/plugins/TranslitSwitcher/src/stdafx.h
+++ b/plugins/TranslitSwitcher/src/stdafx.h
@@ -31,6 +31,7 @@ Boston, MA 02111-1307, USA.
 #include <m_icolib.h>
 #include <m_popup.h>
 #include <m_string.h>
+#include <m_chat_int.h>
 
 #include <m_message.h>
 #include <m_smileyadd.h>
@@ -39,9 +40,6 @@ Boston, MA 02111-1307, USA.
 #include "version.h"
 #include "resource.h"
 
-#define IDC_MESSAGE				1002
-#define IDC_CHATMESSAGE			1009
-
 VOID SwitchLayout(bool);
 VOID TranslitLayout(bool);
 VOID InvertCase(bool);
-- 
cgit v1.2.3