From ad90d3032fc8bf87f893c14ab8e2ef6b6f4b6c8e Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 26 Mar 2014 20:16:33 +0000 Subject: andalso for modern :) git-svn-id: http://svn.miranda-ng.org/main/trunk@8765 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Clist_modern/src/hdr/modern_global_structure.h | 1 - plugins/Clist_modern/src/modern_clistevents.cpp | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'plugins/Clist_modern') diff --git a/plugins/Clist_modern/src/hdr/modern_global_structure.h b/plugins/Clist_modern/src/hdr/modern_global_structure.h index 2f6b095114..6572e96290 100644 --- a/plugins/Clist_modern/src/hdr/modern_global_structure.h +++ b/plugins/Clist_modern/src/hdr/modern_global_structure.h @@ -16,7 +16,6 @@ typedef struct tagCLUIDATA BOOL bEventAreaEnabled; BOOL bNotifyActive; DWORD dwFlags; - TCHAR *szNoEvents; int hIconNotify; MCONTACT hUpdateContact; diff --git a/plugins/Clist_modern/src/modern_clistevents.cpp b/plugins/Clist_modern/src/modern_clistevents.cpp index 9632f6665a..ae2461b09b 100644 --- a/plugins/Clist_modern/src/modern_clistevents.cpp +++ b/plugins/Clist_modern/src/modern_clistevents.cpp @@ -354,7 +354,8 @@ static int EventArea_DrawWorker(HWND hWnd, HDC hDC) } else { HICON hIcon = (HICON)LoadImage(GetModuleHandle(NULL), MAKEINTRESOURCE(IDI_BLANK), IMAGE_ICON, 16, 16, 0); - ske_DrawText(hDC, g_CluiData.szNoEvents, lstrlen(g_CluiData.szNoEvents), &rc, DT_VCENTER | DT_SINGLELINE); + TCHAR *ptszEvents = TranslateT("No Events"); + ske_DrawText(hDC, ptszEvents, lstrlen(ptszEvents), &rc, DT_VCENTER | DT_SINGLELINE); ske_DrawIconEx(hDC, 4, (rc.bottom + rc.top - 16) / 2, hIcon, 16, 16, 0, 0, DI_NORMAL | DI_COMPAT); DestroyIcon(hIcon); } @@ -426,7 +427,6 @@ int EventArea_Create(HWND hCluiWnd) CallService(MS_CLIST_FRAMES_UPDATEFRAME,-1,0); EventArea_HideShowNotifyFrame(); - g_CluiData.szNoEvents = TranslateT("No Events"); g_CluiData.hMenuNotify = CreatePopupMenu(); g_CluiData.wNextMenuID = 1; EventArea_ConfigureEventArea(); -- cgit v1.2.3