final switch to the typed icolib api

git-svn-id: http://svn.miranda-ng.org/main/trunk@2152 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

7 files changed, 10 insertions, 8 deletions

diff --git a/protocols/IRCG/src/clist.cpp b/protocols/IRCG/src/clist.cpp
index 94bb460db9..4d189ce3bb 100644
--- a/protocols/IRCG/src/clist.cpp
+++ b/protocols/IRCG/src/clist.cpp
@@ -78,7 +78,7 @@ BOOL CIrcProto::CList_AddDCCChat(const CMString& name, const CMString& hostmask,
 		cle.ptszTooltip = szNick;

 		cle.lParam = (LPARAM)pdci;

 

-		if ( CallService( MS_CLIST_GETEVENT, (WPARAM)hContact, (LPARAM)0))

+		if ( CallService( MS_CLIST_GETEVENT, (WPARAM)hContact, 0))

 			CallService( MS_CLIST_REMOVEEVENT, (WPARAM)hContact, (LPARAM)"dccchat");

 		CallService( MS_CLIST_ADDEVENT,(WPARAM) hContact,(LPARAM) &cle);

 	}

diff --git a/protocols/IRCG/src/ircproto.cpp b/protocols/IRCG/src/ircproto.cpp
index 9ff2a1c851..eb40452d47 100644
--- a/protocols/IRCG/src/ircproto.cpp
+++ b/protocols/IRCG/src/ircproto.cpp
@@ -928,7 +928,7 @@ int CIrcProto::SetStatusInternal( int iNewStatus, bool bIsInternal )
 		msn.tszInfo = TranslateT( "Connection can not be established! You have not completed all necessary fields (Nickname, User ID and m_name)." );

 		msn.dwInfoFlags = NIIF_ERROR | NIIF_INTERN_UNICODE;

 		msn.uTimeout = 15000;

-		CallService( MS_CLIST_SYSTRAY_NOTIFY, (WPARAM)NULL,(LPARAM) &msn);

+		CallService( MS_CLIST_SYSTRAY_NOTIFY, 0,(LPARAM) &msn);

 		return 0;

 	}

 

diff --git a/protocols/IRCG/src/options.cpp b/protocols/IRCG/src/options.cpp
index 4576574da4..25fcc1a971 100644
--- a/protocols/IRCG/src/options.cpp
+++ b/protocols/IRCG/src/options.cpp
@@ -251,7 +251,7 @@ HICON LoadIconEx( int iconId, bool big )
 {

 	for ( int i=0; i < SIZEOF(iconList); i++ )

 		if ( iconList[i].defIconID == iconId )

-			return ( HICON )CallService( MS_SKIN2_GETICONBYHANDLE, big, (LPARAM)hIconLibItems[i] );

+			return Skin_GetIconByHandle(hIconLibItems[i], big);

 

 	return NULL;

 }

@@ -267,7 +267,8 @@ HANDLE GetIconHandle( int iconId )
 

 void ReleaseIconEx( HICON hIcon )

 {

-	if ( hIcon ) CallService(MS_SKIN2_RELEASEICON, (WPARAM)hIcon, 0);

+	if (hIcon)

+		Skin_ReleaseIcon(hIcon);

 }

 

 void WindowSetIcon( HWND hWnd, int iconId )

diff --git a/protocols/IRCG/src/services.cpp b/protocols/IRCG/src/services.cpp
index e3b363ac15..64c7086355 100644
--- a/protocols/IRCG/src/services.cpp
+++ b/protocols/IRCG/src/services.cpp
@@ -813,7 +813,7 @@ int __cdecl CIrcProto::GCEventHook(WPARAM wParam,LPARAM lParam)
 							acs.handleType = HANDLE_SEARCHRESULT;

 							acs.szProto = m_szModuleName;

 							acs.psr = &psr;

-							CallService( MS_ADDCONTACT_SHOW, (WPARAM)NULL, (LPARAM)&acs);

+							CallService( MS_ADDCONTACT_SHOW, 0, (LPARAM)&acs);

 						}

 						break;

 					case 31:	//slap

diff --git a/protocols/IRCG/src/tools.cpp b/protocols/IRCG/src/tools.cpp
index 83ac7ae60f..a665eb205c 100644
--- a/protocols/IRCG/src/tools.cpp
+++ b/protocols/IRCG/src/tools.cpp
@@ -608,7 +608,7 @@ INT_PTR CIrcProto::DoEvent(int iEvent, const TCHAR* pszWindow, const TCHAR* pszN
 	else

 		gce.time = timestamp;

 	gce.bIsMe = bIsMe;

-	return CallChatEvent((WPARAM)0, (LPARAM)&gce);

+	return CallChatEvent(0, (LPARAM)&gce);

 }

 

 CMString CIrcProto::ModeToStatus(int sMode) 

diff --git a/protocols/IRCG/src/ui_utils.cpp b/protocols/IRCG/src/ui_utils.cpp
index d7c8e4b6b6..b9e264d3c7 100644
--- a/protocols/IRCG/src/ui_utils.cpp
+++ b/protocols/IRCG/src/ui_utils.cpp
@@ -558,7 +558,8 @@ CCtrlMButton::CCtrlMButton( CDlgBase* dlg, int ctrlId, int iCoreIcon, const char
 

 CCtrlMButton::~CCtrlMButton()

 {

-	if ( m_hIcon ) CallService( MS_SKIN2_RELEASEICON, (WPARAM)m_hIcon, 0 );

+	if (m_hIcon)

+		Skin_ReleaseIcon(m_hIcon);

 }

 

 void CCtrlMButton::OnInit()

diff --git a/protocols/IRCG/src/ui_utils.h b/protocols/IRCG/src/ui_utils.h
index 60566ce913..a6d55fe1cb 100644
--- a/protocols/IRCG/src/ui_utils.h
+++ b/protocols/IRCG/src/ui_utils.h
@@ -113,7 +113,7 @@ typedef struct tagLVSETINFOTIP
 #define LVN_MARQUEEBEGIN (LVN_FIRST-56)

 #define LVM_MAPINDEXTOID (LVM_FIRST + 180)

 #define ListView_MapIndexToID(hwnd, index) \

-	(UINT)SendMessage((hwnd), LVM_MAPINDEXTOID, (WPARAM)index, (LPARAM)0)

+	(UINT)SendMessage((hwnd), LVM_MAPINDEXTOID, (WPARAM)index, 0)

 #define TreeView_GetLineColor(hwnd) \

 	(COLORREF)SendMessage((hwnd), TVM_GETLINECOLOR, 0, 0)

 #define TreeView_SetLineColor(hwnd, clr) \