From 33953cc6a0fab6a91af293c6838f8a46dd7922da Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 10 Feb 2014 14:42:51 +0000 Subject: HCONTACT, part 3 git-svn-id: http://svn.miranda-ng.org/main/trunk@8081 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/SmileyAdd/src/customsmiley.cpp | 2 +- plugins/SmileyAdd/src/customsmiley.h | 8 ++++---- plugins/SmileyAdd/src/dlgboxsubclass.cpp | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'plugins/SmileyAdd') diff --git a/plugins/SmileyAdd/src/customsmiley.cpp b/plugins/SmileyAdd/src/customsmiley.cpp index e9efd4ddee..7249242fa7 100644 --- a/plugins/SmileyAdd/src/customsmiley.cpp +++ b/plugins/SmileyAdd/src/customsmiley.cpp @@ -51,7 +51,7 @@ bool SmileyPackCListType::AddSmiley(HCONTACT hContact, TCHAR* path) } -SmileyPackCType* SmileyPackCListType::GetSmileyPack(HANDLE id) +SmileyPackCType* SmileyPackCListType::GetSmileyPack(HCONTACT id) { for (int i = 0; i < m_SmileyPacks.getCount(); i++) if (m_SmileyPacks[i].GetId() == id) diff --git a/plugins/SmileyAdd/src/customsmiley.h b/plugins/SmileyAdd/src/customsmiley.h index fc8e0dff02..5ccfa5e04f 100644 --- a/plugins/SmileyAdd/src/customsmiley.h +++ b/plugins/SmileyAdd/src/customsmiley.h @@ -37,7 +37,7 @@ private: SmileyVectorType m_SmileyList; SmileyLookupType m_SmileyLookup; - HANDLE m_id; + HCONTACT m_id; void InsertLookup(SmileyCType& sml, CMString& lk, bool first); void AddTriggersToSmileyLookup(void); @@ -50,8 +50,8 @@ public: SmileyCType* GetSmiley(unsigned index) { return &m_SmileyList[index]; } - HANDLE GetId(void) { return m_id; } - void SetId(HANDLE id) { m_id = id; } + HCONTACT GetId(void) { return m_id; } + void SetId(HCONTACT id) { m_id = id; } bool LoadSmileyDir(TCHAR* dir); bool LoadSmiley(TCHAR* path); @@ -74,7 +74,7 @@ public: void ClearAndFreeAll(void) { m_SmileyPacks.destroy(); } - SmileyPackCType* GetSmileyPack(HANDLE id); + SmileyPackCType* GetSmileyPack(HCONTACT id); }; extern SmileyPackCListType g_SmileyPackCStore; diff --git a/plugins/SmileyAdd/src/dlgboxsubclass.cpp b/plugins/SmileyAdd/src/dlgboxsubclass.cpp index d46eb2da72..84723b91fa 100644 --- a/plugins/SmileyAdd/src/dlgboxsubclass.cpp +++ b/plugins/SmileyAdd/src/dlgboxsubclass.cpp @@ -267,7 +267,7 @@ int UpdateSrmmDlg(WPARAM wParam, LPARAM /* lParam */) { WaitForSingleObject(g_hMutex, 2000); for (int i=0; i < g_MsgWndList.getCount(); ++i) { - if (wParam == 0 || g_MsgWndList[i]->hContact == (HANDLE)wParam) { + if (wParam == 0 || g_MsgWndList[i]->hContact == (HCONTACT)wParam) { SendMessage(g_MsgWndList[i]->hwnd, WM_SETREDRAW, FALSE, 0); SendMessage(g_MsgWndList[i]->hwnd, DM_OPTIONSAPPLIED, 0, 0); SendMessage(g_MsgWndList[i]->hwnd, WM_SETREDRAW, TRUE, 0); -- cgit v1.2.3