final switch to the typed icolib api

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

4 files changed, 20 insertions, 20 deletions

diff --git a/plugins/Clist_mw/src/CLUIFrames/cluiframes.cpp b/plugins/Clist_mw/src/CLUIFrames/cluiframes.cpp
index b8d21480e0..9e32704f03 100644
--- a/plugins/Clist_mw/src/CLUIFrames/cluiframes.cpp
+++ b/plugins/Clist_mw/src/CLUIFrames/cluiframes.cpp
@@ -1025,19 +1025,19 @@ INT_PTR CLUIFramesSetFrameOptions(WPARAM wParam,LPARAM lParam)
 		if (flag&F_NOBORDER) {style &= (~WS_BORDER);}

 			SetWindowLongPtr(Frames[pos].hWnd,GWL_STYLE,(LONG)style);

 		ulockfrm();

-		CLUIFramesOnClistResize((WPARAM)pcli->hwndContactList,(LPARAM)0);

+		CLUIFramesOnClistResize((WPARAM)pcli->hwndContactList,0);

 		return 0;

 	}

 

 	case FO_NAME:

-		if (lParam == (LPARAM)NULL) {ulockfrm(); return -1;}

+		if (lParam == 0) {ulockfrm(); return -1;}

 		mir_free(Frames[pos].name);

 		Frames[pos].name = mir_tstrdup((LPTSTR)lParam);

 		ulockfrm();

 		return 0;

 

 	case FO_TBNAME:

-		if (lParam == (LPARAM)NULL) {ulockfrm(); return(-1);}

+		if (lParam == 0) {ulockfrm(); return(-1);}

 		mir_free(Frames[pos].TitleBar.tbname);

 		Frames[pos].TitleBar.tbname = mir_tstrdup((LPTSTR)lParam);

 		ulockfrm();

@@ -1045,7 +1045,7 @@ INT_PTR CLUIFramesSetFrameOptions(WPARAM wParam,LPARAM lParam)
 		return 0;

 

 	case FO_TBTIPNAME:

-		if (lParam == (LPARAM)NULL) {ulockfrm(); return(-1);}

+		if (lParam == 0) {ulockfrm(); return(-1);}

 		mir_free(Frames[pos].TitleBar.tooltip);

 		Frames[pos].TitleBar.tooltip = mir_tstrdup((LPTSTR)lParam);

 		UpdateTBToolTip(pos);

@@ -1106,7 +1106,7 @@ INT_PTR CLUIFramesSetFrameOptions(WPARAM wParam,LPARAM lParam)
 		return 0;

 	}

 	ulockfrm();

-	CLUIFramesOnClistResize((WPARAM)pcli->hwndContactList,(LPARAM)0);

+	CLUIFramesOnClistResize((WPARAM)pcli->hwndContactList,0);

 	return -1;

 }

 

@@ -1115,7 +1115,7 @@ static INT_PTR CLUIFramesShowAll(WPARAM wParam,LPARAM lParam)
 {

 	for (int i = 0;i<nFramescount;i++)

 		Frames[i].visible = TRUE;

-	CLUIFramesOnClistResize((WPARAM)pcli->hwndContactList,(LPARAM)0);

+	CLUIFramesOnClistResize((WPARAM)pcli->hwndContactList,0);

 	return 0;

 }

 

@@ -1124,7 +1124,7 @@ INT_PTR CLUIFramesShowAllTitleBars(WPARAM wParam,LPARAM lParam)
 {

 	for (int i = 0;i<nFramescount;i++)

 		Frames[i].TitleBar.ShowTitleBar = TRUE;

-	CLUIFramesOnClistResize((WPARAM)pcli->hwndContactList,(LPARAM)0);

+	CLUIFramesOnClistResize((WPARAM)pcli->hwndContactList,0);

 	return 0;

 }

 

@@ -1133,7 +1133,7 @@ INT_PTR CLUIFramesHideAllTitleBars(WPARAM wParam,LPARAM lParam)
 {

 	for (int i = 0;i<nFramescount;i++)

 		Frames[i].TitleBar.ShowTitleBar = FALSE;

-	CLUIFramesOnClistResize((WPARAM)pcli->hwndContactList,(LPARAM)0);

+	CLUIFramesOnClistResize((WPARAM)pcli->hwndContactList,0);

 	return 0;

 }

 

@@ -1149,7 +1149,7 @@ INT_PTR CLUIFramesShowHideFrame(WPARAM wParam,LPARAM lParam)
 	ulockfrm();

 

 	if (!Frames[pos].floating)

-		CLUIFramesOnClistResize((WPARAM)pcli->hwndContactList,(LPARAM)0);

+		CLUIFramesOnClistResize((WPARAM)pcli->hwndContactList,0);

 	return 0;

 }

 

@@ -1163,7 +1163,7 @@ INT_PTR CLUIFramesShowHideFrameTitleBar(WPARAM wParam,LPARAM lParam)
 

 	ulockfrm();

 

-	CLUIFramesOnClistResize((WPARAM)pcli->hwndContactList,(LPARAM)0);

+	CLUIFramesOnClistResize((WPARAM)pcli->hwndContactList,0);

 	return 0;

 }

 

@@ -1614,7 +1614,7 @@ INT_PTR CLUIFramesAddFrame(WPARAM wParam,LPARAM lParam)
 	ti.hinst = g_hInst;

 	ti.uFlags = TTF_IDISHWND|TTF_SUBCLASS ;

 	ti.uId = (UINT_PTR)Frames[nFramescount].TitleBar.hwnd;

-	SendMessage(Frames[nFramescount].TitleBar.hwndTip,TTM_ADDTOOL,(WPARAM)0,(LPARAM)&ti);

+	SendMessage(Frames[nFramescount].TitleBar.hwndTip,TTM_ADDTOOL,0,(LPARAM)&ti);

 

 	SendMessage(Frames[nFramescount].TitleBar.hwndTip,TTM_ACTIVATE,(WPARAM)Frames[nFramescount].TitleBar.ShowTitleBarTip,0);

 

@@ -1916,7 +1916,7 @@ int CLUIFramesResize(const RECT newsize)
 INT_PTR CLUIFramesUpdateFrame(WPARAM wParam,LPARAM lParam)

 {

 	if (FramesSysNotStarted) return -1;

-	if (wParam == -1) { CLUIFramesOnClistResize((WPARAM)pcli->hwndContactList,(LPARAM)0); return 0;}

+	if (wParam == -1) { CLUIFramesOnClistResize((WPARAM)pcli->hwndContactList,0); return 0;}

 	if (lParam&FU_FMPOS)	CLUIFramesOnClistResize((WPARAM)pcli->hwndContactList,1);

 	lockfrm();

 	wParam = id2pos(wParam);

@@ -2246,7 +2246,7 @@ LRESULT CALLBACK CLUIFrameTitleBarProc(HWND hwnd, UINT msg, WPARAM wParam, LPARA
 				CLUIFrameSetFloat(Frameid,0);

 				break;

 			}

-			CLUIFramesOnClistResize((WPARAM)pcli->hwndContactList,(LPARAM)0);

+			CLUIFramesOnClistResize((WPARAM)pcli->hwndContactList,0);

 		}

 		break;

 

@@ -2361,7 +2361,7 @@ LRESULT CALLBACK CLUIFrameTitleBarProc(HWND hwnd, UINT msg, WPARAM wParam, LPARA
 					Frames[pos].FloatingSize.x,Frames[pos].FloatingSize.y,

 					Frames[pos].order);

 

-				oldflags = CallService(MS_CLIST_FRAMES_GETFRAMEOPTIONS,MAKEWPARAM(FO_FLAGS,Frames[pos].id),(LPARAM)0);

+				oldflags = CallService(MS_CLIST_FRAMES_GETFRAMEOPTIONS,MAKEWPARAM(FO_FLAGS,Frames[pos].id),0);

 				if ( !(oldflags & F_SHOWTBTIP))

 					oldflags |= F_SHOWTBTIP;

 			}

@@ -2664,7 +2664,7 @@ LRESULT CALLBACK CLUIFrameContainerWndProc(HWND hwnd, UINT msg, WPARAM wParam, L
 			}

 

 			memset(&minmax,0,sizeof(minmax));

-			if (SendMessage(Frames[framepos].hWnd,WM_GETMINMAXINFO,(WPARAM)0,(LPARAM)&minmax) == 0) {

+			if (SendMessage(Frames[framepos].hWnd,WM_GETMINMAXINFO,0,(LPARAM)&minmax) == 0) {

 				RECT border;

 				int tbh = TitleBarH*btoint(Frames[framepos].TitleBar.ShowTitleBar);

 				GetBorderSize(hwnd,&border);

diff --git a/plugins/Clist_mw/src/CLUIFrames/extraimage.cpp b/plugins/Clist_mw/src/CLUIFrames/extraimage.cpp
index 49cc833397..d84b30a9fa 100644
--- a/plugins/Clist_mw/src/CLUIFrames/extraimage.cpp
+++ b/plugins/Clist_mw/src/CLUIFrames/extraimage.cpp
@@ -193,7 +193,7 @@ void ReloadExtraIcons()
 	HICON hicon;

 

 	SendMessage(pcli->hwndContactTree,CLM_SETEXTRACOLUMNSSPACE,DBGetContactSettingByte(NULL,"CLUI","ExtraColumnSpace",18),0);					

-	SendMessage(pcli->hwndContactTree,CLM_SETEXTRAIMAGELIST,0,(LPARAM)NULL);		

+	SendMessage(pcli->hwndContactTree,CLM_SETEXTRAIMAGELIST,0,0);		

 	if (hExtraImageList){ImageList_Destroy(hExtraImageList);};

 	hExtraImageList = ImageList_Create(GetSystemMetrics(SM_CXSMICON),GetSystemMetrics(SM_CYSMICON),ILC_COLOR32|ILC_MASK,1,256);

 

diff --git a/plugins/Clist_mw/src/CLUIFrames/framesmenu.cpp b/plugins/Clist_mw/src/CLUIFrames/framesmenu.cpp
index 7ce6bdd2a1..d3c0480cd1 100644
--- a/plugins/Clist_mw/src/CLUIFrames/framesmenu.cpp
+++ b/plugins/Clist_mw/src/CLUIFrames/framesmenu.cpp
@@ -212,7 +212,7 @@ int InitFramesMenus(void)
 			op.Handle = hFrameMenuObject;

 			op.Setting = OPT_MENUOBJECT_SET_FREE_SERVICE;

 			op.Value = (INT_PTR)"FrameMenuFreeService";

-			CallService(MO_SETOPTIONSMENUOBJECT,(WPARAM)0,(LPARAM)&op);

+			CallService(MO_SETOPTIONSMENUOBJECT,0,(LPARAM)&op);

 		}

 	}

 	return 0;

diff --git a/plugins/Clist_mw/src/CLUIFrames/statusbar.cpp b/plugins/Clist_mw/src/CLUIFrames/statusbar.cpp
index 319f4f8f63..ba6c8e4304 100644
--- a/plugins/Clist_mw/src/CLUIFrames/statusbar.cpp
+++ b/plugins/Clist_mw/src/CLUIFrames/statusbar.cpp
@@ -265,7 +265,7 @@ void DrawBackGround(HWND hwnd,HDC mhdc)
 

 		for (nPanel = 0;nPanel<nParts;nPanel++)

 		{

-			PD = (ProtocolData *)SendMessage(pcli->hwndStatus,SB_GETTEXT,(WPARAM)nPanel,(LPARAM)0);

+			PD = (ProtocolData *)SendMessage(pcli->hwndStatus,SB_GETTEXT,(WPARAM)nPanel,0);

 			if (PD == NULL){

 				continue;

 			}

@@ -408,7 +408,7 @@ LRESULT CALLBACK StatusHelperProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa
 						for (i = 0;i<nParts;i++) {

 							SendMessage(pcli->hwndStatus,SB_GETRECT,i,(LPARAM)&rc);

 							if (PtInRect(&rc,pt)) {							

-								PD = (ProtocolData *)SendMessage(pcli->hwndStatus,SB_GETTEXT,i,(LPARAM)0);

+								PD = (ProtocolData *)SendMessage(pcli->hwndStatus,SB_GETTEXT,i,0);

 								if (PD == NULL){return 0;}

 								

 								NotifyEventHooks(hStatusBarShowToolTipEvent,(WPARAM)PD->RealName,0);

@@ -553,7 +553,7 @@ HANDLE CreateStatusBarFrame()
 

 	Frame.tname = _T("Status");

 	Frame.TBtname = TranslateT("Status Bar");

-	hFrameHelperStatusBar = (HANDLE)CallService(MS_CLIST_FRAMES_ADDFRAME,(WPARAM)&Frame,(LPARAM)0);

+	hFrameHelperStatusBar = (HANDLE)CallService(MS_CLIST_FRAMES_ADDFRAME,(WPARAM)&Frame,0);

 

 

 	return hFrameHelperStatusBar;