From 75b1ff75c42644eb36552762652e4b0c9ff071bc Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 2 Nov 2012 14:11:01 +0000 Subject: final switch to the typed icolib api git-svn-id: http://svn.miranda-ng.org/main/trunk@2152 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/MyDetails/src/frame.cpp | 4 ++-- plugins/MyDetails/src/mydetails.cpp | 11 ++++------- 2 files changed, 6 insertions(+), 9 deletions(-) (limited to 'plugins/MyDetails/src') diff --git a/plugins/MyDetails/src/frame.cpp b/plugins/MyDetails/src/frame.cpp index 245011558b..690bd84a9d 100644 --- a/plugins/MyDetails/src/frame.cpp +++ b/plugins/MyDetails/src/frame.cpp @@ -1456,7 +1456,7 @@ void ShowGlobalStatusMenu(HWND hwnd, MyDetailsFrameData *data, Protocol *proto, | (opts.draw_text_align_right ? TPM_RIGHTALIGN : TPM_LEFTALIGN), p.x, p.y, 0, hwnd, NULL); if (ret) - CallService(MS_CLIST_MENUPROCESSCOMMAND, MAKEWPARAM(LOWORD(ret),MPCF_MAINMENU),(LPARAM)NULL); + CallService(MS_CLIST_MENUPROCESSCOMMAND, MAKEWPARAM(LOWORD(ret),MPCF_MAINMENU),0); } void ShowProtocolStatusMenu(HWND hwnd, MyDetailsFrameData *data, Protocol *proto, POINT &p) @@ -1512,7 +1512,7 @@ void ShowProtocolStatusMenu(HWND hwnd, MyDetailsFrameData *data, Protocol *proto | (opts.draw_text_align_right ? TPM_RIGHTALIGN : TPM_LEFTALIGN), p.x, p.y, 0, hwnd, NULL); if (ret) - CallService(MS_CLIST_MENUPROCESSCOMMAND, MAKEWPARAM(LOWORD(ret),MPCF_MAINMENU),(LPARAM)NULL); + CallService(MS_CLIST_MENUPROCESSCOMMAND, MAKEWPARAM(LOWORD(ret),MPCF_MAINMENU),0); /* if (to_remove < 5) diff --git a/plugins/MyDetails/src/mydetails.cpp b/plugins/MyDetails/src/mydetails.cpp index 8dccbbd165..325e31e8ca 100644 --- a/plugins/MyDetails/src/mydetails.cpp +++ b/plugins/MyDetails/src/mydetails.cpp @@ -200,9 +200,8 @@ static int MainInit(WPARAM wparam,LPARAM lparam) InitFrames(); - if (CallService(MS_SKIN2_GETICON, 0, (LPARAM) "LISTENING_TO_ICON") == NULL) { - SKINICONDESC sid = {0}; - sid.cbSize = sizeof(SKINICONDESC); + if ( Skin_GetIcon("LISTENING_TO_ICON") == NULL) { + SKINICONDESC sid = { sizeof(SKINICONDESC) }; sid.flags = SIDF_TCHAR; sid.ptszSection = LPGENT("Contact List"); sid.ptszDescription = LPGENT("Listening to"); @@ -211,8 +210,7 @@ static int MainInit(WPARAM wparam,LPARAM lparam) Skin_AddIcon(&sid); } { - SKINICONDESC sid = {0}; - sid.cbSize = sizeof(SKINICONDESC); + SKINICONDESC sid = { sizeof(SKINICONDESC) }; sid.flags = SIDF_TCHAR; sid.ptszSection = LPGENT("My Details"); sid.ptszDescription = LPGENT("Previous protocol"); @@ -221,8 +219,7 @@ static int MainInit(WPARAM wparam,LPARAM lparam) Skin_AddIcon(&sid); } { - SKINICONDESC sid = {0}; - sid.cbSize = sizeof(SKINICONDESC); + SKINICONDESC sid = { sizeof(SKINICONDESC) }; sid.flags = SIDF_TCHAR; sid.ptszSection = LPGENT("My Details"); sid.ptszDescription = LPGENT("Next protocol"); -- cgit v1.2.3