2 files changed, 2 insertions, 28 deletions
diff --git a/plugins/ExternalAPI/m_popup2.h b/plugins/ExternalAPI/m_popup2.h
index 073955b945..5d7df42f58 100644
--- a/plugins/ExternalAPI/m_popup2.h
+++ b/plugins/ExternalAPI/m_popup2.h
@@ -192,9 +192,7 @@ wParam = Modification type
 lParam = value of type defined by wParam
 
 /* core define see miranda\include\m_popup.h
-#define CPT_TEXT	1 // lParam = (char *)text
 #define CPT_TEXTW	2 // lParam = (WCHAR *)text
-#define CPT_TITLE	3 // lParam = (char *)title
 #define CPT_TITLEW	4 // lParam = (WCHAR *)title
 #define CPT_DATA	5 // lParam = (POPUPDATA *)data
 #define CPT_DATAEX	6 // lParam = (POPUPDATAEX *) or (POPUPDATAEX_V2 *)data see CPT_DATA2
diff --git a/plugins/ExternalAPI/m_text.h b/plugins/ExternalAPI/m_text.h
index 666c88411a..d5a1beaff8 100644
--- a/plugins/ExternalAPI/m_text.h
+++ b/plugins/ExternalAPI/m_text.h
@@ -40,13 +40,7 @@ typedef struct _tagMTEXT_interface {
 	size_t	cbSize;
 	DWORD	version;
 	HANDLE	(DLL_CALLCONV *Register)	(const char *userTitle, DWORD options);
-	HANDLE	(DLL_CALLCONV *Create)		(HANDLE userHandle, char *text);
-	HANDLE	(DLL_CALLCONV *CreateW)		(HANDLE userHandle, WCHAR *text);
-	#if defined(UNICODE) || defined (_UNICODE)
-	HANDLE	(DLL_CALLCONV *CreateT)		(HANDLE userHandle, WCHAR *text);
-	#else
-	HANDLE	(DLL_CALLCONV *CreateT)		(HANDLE userHandle, char *text);
-	#endif
+	HANDLE	(DLL_CALLCONV *Create)		(HANDLE userHandle, TCHAR *text);
 	HANDLE	(DLL_CALLCONV *CreateEx)	(HANDLE userHandle, MCONTACT hContact, void *text, DWORD flags);
 	int		(DLL_CALLCONV *Measure)		(HDC dc, SIZE *sz, HANDLE text);
 	int		(DLL_CALLCONV *Display)		(HDC dc, POINT pos, SIZE sz, HANDLE text);
@@ -65,12 +59,7 @@ typedef struct _tagMTEXT_interface {
 __forceinline INT_PTR mir_getMTI( MTEXT_INTERFACE* dest )
 {
 	dest->cbSize = sizeof(*dest);
-	INT_PTR result = CallService( MS_TEXT_GETINTERFACE, 0, (LPARAM)dest );
-	#if defined(UNICODE) || defined (_UNICODE)
-		dest->CreateT = dest->CreateW;
-	#else
-		dest->CreateT = dest->Create;
-	#endif
+	INT_PTR result = CallService(MS_TEXT_GETINTERFACE, 0, (LPARAM)dest);
 	return result;
 }
 
@@ -195,19 +184,6 @@ __inline HANDLE MTextRegister(const char *userTitle, DWORD options)
 }
 #endif // MTEXT_NOHELPERS
 
-// allocate text object
-// wParam = (WPARAM)(HANDLE)userHandle
-// lParam = (LPARAM)(char *)text
-// result = (LRESULT)(HANDLE)textHandle
-#define MS_TEXT_CREATE "MText/Create"
-
-#ifndef MTEXT_NOHELPERS
-__inline HANDLE MTextCreate(HANDLE userHandle, char *text)
-{
-	return (HANDLE)CallService(MS_TEXT_CREATE, (WPARAM)userHandle, (LPARAM)text);
-}
-#endif // MTEXT_NOHELPERS
-
 // allocate text object (unicode)
 // wParam = (WPARAM)(HANDLE)userHandle
 // lParam = (LPARAM)(WCHAR *)text