From 1914d6f60f4ad92c0efa45a6559a51421bfcaf1e Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 25 Nov 2012 16:17:46 +0000 Subject: fix for popups that use icons controlled by icolib git-svn-id: http://svn.miranda-ng.org/main/trunk@2490 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/WhenWasIt/src/notifiers.cpp | 6 +++--- plugins/WhenWasIt/src/notifiers.h | 5 ----- 2 files changed, 3 insertions(+), 8 deletions(-) (limited to 'plugins/WhenWasIt/src') diff --git a/plugins/WhenWasIt/src/notifiers.cpp b/plugins/WhenWasIt/src/notifiers.cpp index f05ae5f1eb..6921a19619 100644 --- a/plugins/WhenWasIt/src/notifiers.cpp +++ b/plugins/WhenWasIt/src/notifiers.cpp @@ -87,7 +87,7 @@ int PopupNotifyBirthday(HANDLE hContact, int dtb, int age) POPUPDATAT pd = {0}; FillPopupData(pd, dtb); pd.lchContact = hContact; - pd.PluginWindowProc = (WNDPROC) DlgProcPopup; + pd.PluginWindowProc = (WNDPROC)DlgProcPopup; pd.lchIcon = GetDTBIcon(dtb); _stprintf(pd.lptzContactName, TranslateT("Birthday - %s"), name); @@ -109,9 +109,9 @@ int PopupNotifyBirthday(HANDLE hContact, int dtb, int age) _stprintf(pd.lptzText, TranslateT("%s\n%s just turned %d."), text, sex, age); PUAddPopUpT(&pd); + Skin_ReleaseIcon(pd.lchIcon); free(name); - return 0; } @@ -132,7 +132,7 @@ int PopupNotifyMissedBirthday(HANDLE hContact, int dab, int age) POPUPDATAT pd = {0}; FillPopupData(pd, dab); pd.lchContact = hContact; - pd.PluginWindowProc = (WNDPROC) DlgProcPopup; + pd.PluginWindowProc = (WNDPROC)DlgProcPopup; pd.lchIcon = GetDTBIcon(dab); _stprintf(pd.lptzContactName, TranslateT("Birthday - %s"), name); diff --git a/plugins/WhenWasIt/src/notifiers.h b/plugins/WhenWasIt/src/notifiers.h index 62f6dd4b4e..344774ce02 100644 --- a/plugins/WhenWasIt/src/notifiers.h +++ b/plugins/WhenWasIt/src/notifiers.h @@ -21,11 +21,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #ifndef M_WWI_NOTIFIERS_H #define M_WWI_NOTIFIERS_H - -#define POPUPDATAT POPUPDATAW -#define PUAddPopUpT PUAddPopUpW - - #define BIRTHDAY_TODAY_SOUND "WWIBirthdayToday" #define BIRTHDAY_NEAR_SOUND "WWIBirthdayNear" -- cgit v1.2.3