From ddba4ede6b451d0cfcd0d32b5180fbd0689966bf Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 10 Feb 2014 08:04:30 +0000 Subject: - HANDLE hContact => HCONTACT - GCF_* prefix was added to chat constants to avoid name conflicts git-svn-id: http://svn.miranda-ng.org/main/trunk@8078 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/mTextControl/src/services.cpp | 4 ++-- plugins/mTextControl/src/services.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'plugins/mTextControl') diff --git a/plugins/mTextControl/src/services.cpp b/plugins/mTextControl/src/services.cpp index 5f2ce42f52..0afa1df715 100644 --- a/plugins/mTextControl/src/services.cpp +++ b/plugins/mTextControl/src/services.cpp @@ -169,7 +169,7 @@ INT_PTR MText_CreateW(WPARAM wParam, LPARAM lParam) { //--------------------------------------------------------------------------- // allocate text object (advanced) HANDLE DLL_CALLCONV -MTI_MTextCreateEx (HANDLE userHandle, HANDLE hContact, void *text, DWORD flags) { +MTI_MTextCreateEx (HANDLE userHandle, HCONTACT hContact, void *text, DWORD flags) { TextObject *result = new TextObject; result->options = TextUserGetOptions(userHandle); result->ftd = new CFormattedTextDraw; @@ -337,7 +337,7 @@ INT_PTR MText_GetInterface(WPARAM wParam, LPARAM lParam) { MText->Create = MTI_MTextCreate; MText->CreateW = MTI_MTextCreateW; // MText->CreateT = defined inside api - MText->CreateEx = MTI_MTextCreateEx; + MText->CreateEx = MTI_MTextCreateEx; MText->Measure = MTI_MTextMeasure; MText->Display = MTI_MTextDisplay; MText->SetParent = MTI_MTextSetParent; diff --git a/plugins/mTextControl/src/services.h b/plugins/mTextControl/src/services.h index 589c33cba2..d5efb2ac87 100644 --- a/plugins/mTextControl/src/services.h +++ b/plugins/mTextControl/src/services.h @@ -25,7 +25,7 @@ void UnloadServices(); __declspec(dllexport) HANDLE DLL_CALLCONV MTI_MTextCreate (HANDLE userHandle, char *text); __declspec(dllexport) HANDLE DLL_CALLCONV MTI_MTextCreateW (HANDLE userHandle, WCHAR *text); -__declspec(dllexport) HANDLE DLL_CALLCONV MTI_MTextCreateEx (HANDLE userHandle, HANDLE hContact, void *text, DWORD flags); +__declspec(dllexport) HANDLE DLL_CALLCONV MTI_MTextCreateEx (HANDLE userHandle, HCONTACT hContact, void *text, DWORD flags); __declspec(dllexport) int DLL_CALLCONV MTI_MTextMeasure (HDC dc, SIZE *sz, HANDLE text); __declspec(dllexport) int DLL_CALLCONV MTI_MTextDisplay (HDC dc, POINT pos, SIZE sz, HANDLE text); __declspec(dllexport) int DLL_CALLCONV MTI_MTextSetParent (HANDLE text, HWND hwnd, RECT rect); -- cgit v1.2.3