diff options
| author | George Hazan <george.hazan@gmail.com> | 2014-02-10 08:04:30 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2014-02-10 08:04:30 +0000 |
| commit | ddba4ede6b451d0cfcd0d32b5180fbd0689966bf (patch) | |
| tree | 5d74f37a7013d13b92c182628d6b68a58e148ae4 /plugins/Popup/src/popup_wnd2.cpp | |
| parent | c39340bf493a1745a41317bbf937fc7eb6cbb26a (diff) | |
- 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
Diffstat (limited to 'plugins/Popup/src/popup_wnd2.cpp')
| -rw-r--r-- | plugins/Popup/src/popup_wnd2.cpp | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/plugins/Popup/src/popup_wnd2.cpp b/plugins/Popup/src/popup_wnd2.cpp index f6d493138d..5f0f2e65f3 100644 --- a/plugins/Popup/src/popup_wnd2.cpp +++ b/plugins/Popup/src/popup_wnd2.cpp @@ -744,7 +744,7 @@ void PopupWnd2::setIcon(HICON hNewIcon) void PopupWnd2::updateData(POPUPDATAW_V2 *ppd)
{
- m_hContact = ppd->lchContact;
+ m_hContact = ppd->lchContact;
m_clBack = ppd->colorBack;
m_clClock = m_clTitle = m_clText = ppd->colorText;
@@ -774,11 +774,11 @@ void PopupWnd2::updateData(POPUPDATAW_V2 *ppd) void PopupWnd2::updateData(POPUPDATA2 *ppd)
{
- m_hContact = ppd->lchContact;
+ m_hContact = ppd->lchContact;
m_clBack = ppd->colorBack;
- m_clClock = m_clTitle = m_clText = ppd->colorText;
- m_iTimeout = ppd->iSeconds;
+ m_clClock = m_clTitle = m_clText = ppd->colorText;
+ m_iTimeout = ppd->iSeconds;
mir_free(m_lpzText); mir_free(m_lpzTitle);
mir_free(m_lpwzText); mir_free(m_lpwzTitle);
@@ -930,27 +930,28 @@ LRESULT CALLBACK NullWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM l return DefWindowProc(hwnd, message, wParam, lParam);
}
-struct ReplyEditData
+struct ReplyEditData
{
- HWND hwndPopup;
- HANDLE hContact;
- WNDPROC oldWndProc;
+ HWND hwndPopup;
+ HCONTACT hContact;
+ WNDPROC oldWndProc;
};
-BOOL IsUtfSendAvailable(HANDLE hContact)
+BOOL IsUtfSendAvailable(HCONTACT hContact)
{
char* szProto = GetContactProto(hContact);
if (szProto == NULL) return FALSE;
//check for MetaContact and get szProto from subcontact
if (strcmp(szProto, gszMetaProto)==0) {
- HANDLE hSubContact = (HANDLE)CallService(MS_MC_GETDEFAULTCONTACT, (WPARAM)hContact, 0);
- if (!hSubContact) return FALSE;
+ HCONTACT hSubContact = (HCONTACT)CallService(MS_MC_GETDEFAULTCONTACT, (WPARAM)hContact, 0);
+ if (!hSubContact)
+ return FALSE;
szProto = GetContactProto(hSubContact);
}
return(CallProtoService(szProto, PS_GETCAPS, PFLAGNUM_4, 0) & PF4_IMSENDUTF) ? TRUE : FALSE;
}
-void AddMessageToDB(HANDLE hContact, char *msg, int flag/*bool utf*/)
+void AddMessageToDB(HCONTACT hContact, char *msg, int flag/*bool utf*/)
{
DBEVENTINFO dbei = {0};
dbei.cbSize = sizeof(dbei);
@@ -1491,13 +1492,13 @@ void WindowThread(void *arg) // Menu Host
LRESULT CALLBACK MenuHostWndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
{
- static HANDLE hContact = NULL;
+ static HCONTACT hContact = NULL;
switch (message)
{
case UM_SHOWMENU:
{
- hContact = (HANDLE)lParam;
+ hContact = (HCONTACT)lParam;
POINT pt = {0};
HMENU hMenu = (HMENU)CallService(MS_CLIST_MENUBUILDCONTACT,(WPARAM)hContact,0);
GetCursorPos(&pt);
|