warning fixes

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

1 files changed, 10 insertions, 10 deletions

diff --git a/plugins/TabSRMM/src/tabctrl.cpp b/plugins/TabSRMM/src/tabctrl.cpp
index 59cfa8ef4d..49e90e2020 100644
--- a/plugins/TabSRMM/src/tabctrl.cpp
+++ b/plugins/TabSRMM/src/tabctrl.cpp
@@ -598,7 +598,6 @@ static void PaintWorker(HWND hwnd, TabControlData *tabdat)
 	RECT rectTemp, rctPage, rctActive, rcItem, rctClip, rctOrig;

 	RECT rectUpDn = { 0, 0, 0, 0 };

 	int nCount = TabCtrl_GetItemCount(hwnd), i;

-	TCITEM item = { 0 };

 	int iActive, hotItem;

 	POINT pt;

 	DWORD dwStyle = tabdat->dwStyle;

@@ -617,7 +616,8 @@ static void PaintWorker(HWND hwnd, TabControlData *tabdat)
 		InvalidateRect(hwnd, NULL, FALSE);

 	tabdat->iHoveredTabIndex = hotItem;

 

-	item.mask = TCIF_PARAM;

+	TCITEM tci = { 0 };

+	tci.mask = TCIF_PARAM;

 

 	tabdat->fAeroTabs = (CSkin::m_fAeroSkinsValid && (isAero || PluginConfig.m_fillColor)) ? TRUE : FALSE;

 	tabdat->fCloseButton = (tabdat->pContainer->dwFlagsEx & TCF_CLOSEBUTTON ? TRUE : FALSE);

@@ -843,13 +843,13 @@ page_done:
 		goto skip_tabs;

 

 	for (i = 0; i < nCount; i++) {

-		TWindowData *dat = 0;

-

 		if (i == iActive)

 			continue;

-		TabCtrl_GetItem(hwnd, i, &item);

-		if (item.lParam)

-			dat = (TWindowData*)GetWindowLongPtr((HWND)item.lParam, GWLP_USERDATA);

+

+		TabCtrl_GetItem(hwnd, i, &tci);

+		TWindowData *dat = 0;

+		if (tci.lParam)

+			dat = (TWindowData*)GetWindowLongPtr((HWND)tci.lParam, GWLP_USERDATA);

 		TabCtrl_GetItemRect(hwnd, i, &rcItem);

 		if (!bClassicDraw && uiBottom) {

 			rcItem.top -= PluginConfig.tabConfig.m_bottomAdjust;

@@ -881,9 +881,9 @@ page_done:
 		int nHint = 0;

 

 		rcItem = rctActive;

-		TabCtrl_GetItem(hwnd, iActive, &item);

-		if (item.lParam)

-			dat = (TWindowData*)GetWindowLongPtr((HWND)item.lParam, GWLP_USERDATA);

+		TabCtrl_GetItem(hwnd, iActive, &tci);

+		if (tci.lParam)

+			dat = (TWindowData*)GetWindowLongPtr((HWND)tci.lParam, GWLP_USERDATA);

 

 		if (!bClassicDraw && !(dwStyle & TCS_BUTTONS)) {

 			InflateRect(&rcItem, 2, 2);