From 17501083ca15adc9e3f53757b47a961ed2e77e9c Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Thu, 27 Aug 2015 21:42:44 +0000
Subject: warning fixes

git-svn-id: http://svn.miranda-ng.org/main/trunk@15051 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/TabSRMM/src/taskbar.cpp | 46 ++++++++++++++++-------------------------
 1 file changed, 18 insertions(+), 28 deletions(-)

(limited to 'plugins/TabSRMM/src/taskbar.cpp')

diff --git a/plugins/TabSRMM/src/taskbar.cpp b/plugins/TabSRMM/src/taskbar.cpp
index 8d1c315fec..16eb8bcf4f 100644
--- a/plugins/TabSRMM/src/taskbar.cpp
+++ b/plugins/TabSRMM/src/taskbar.cpp
@@ -529,15 +529,14 @@ void CProxyWindow::updateTitle(const TCHAR *tszTitle) const
  */
 LRESULT CALLBACK CProxyWindow::stubWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
 {
-	CProxyWindow* pWnd = reinterpret_cast<CProxyWindow *>(::GetWindowLongPtr(hWnd, GWLP_USERDATA));
-
+	CProxyWindow *pWnd = reinterpret_cast<CProxyWindow *>(::GetWindowLongPtr(hWnd, GWLP_USERDATA));
 	if (pWnd)
-		return(pWnd->wndProc(hWnd, msg, wParam, lParam));
+		return pWnd->wndProc(hWnd, msg, wParam, lParam);
 
 	switch (msg) {
 	case WM_NCCREATE:
 		CREATESTRUCT *cs = reinterpret_cast<CREATESTRUCT *>(lParam);
-		CProxyWindow *pWnd = reinterpret_cast<CProxyWindow *>(cs->lpCreateParams);
+		pWnd = reinterpret_cast<CProxyWindow *>(cs->lpCreateParams);
 		::SetWindowLongPtr(hWnd, GWLP_USERDATA, reinterpret_cast<LONG_PTR>(pWnd));
 		return pWnd->wndProc(hWnd, msg, wParam, lParam);
 	}
@@ -550,29 +549,23 @@ LRESULT CALLBACK CProxyWindow::stubWndProc(HWND hWnd, UINT msg, WPARAM wParam, L
 LRESULT CALLBACK CProxyWindow::wndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
 {
 	switch (msg) {
-
-#if defined(__LOGDEBUG_)
-	case WM_NCCREATE:
-		_DebugTraceW(_T("create proxy WINDOW for: %s"), m_dat->cache->getNick());
-		break;
-#endif
 	case WM_CLOSE:
-	{
-		TContainerData* pC = m_dat->pContainer;
-
-		if (m_dat->hwnd != pC->hwndActive)
-			SendMessage(m_dat->hwnd, WM_CLOSE, 1, 3);
-		else
-			SendMessage(m_dat->hwnd, WM_CLOSE, 1, 2);
-		if (!IsIconic(pC->hwnd))
-			SetForegroundWindow(pC->hwnd);
-	}
-	return 0;
+		{
+			TContainerData* pC = m_dat->pContainer;
+
+			if (m_dat->hwnd != pC->hwndActive)
+				SendMessage(m_dat->hwnd, WM_CLOSE, 1, 3);
+			else
+				SendMessage(m_dat->hwnd, WM_CLOSE, 1, 2);
+			if (!IsIconic(pC->hwnd))
+				SetForegroundWindow(pC->hwnd);
+		}
+		return 0;
 
-	/*
-	* proxy window was activated by clicking on the thumbnail. Send this
-	* to the real message window.
-	*/
+		/*
+		* proxy window was activated by clicking on the thumbnail. Send this
+		* to the real message window.
+		*/
 	case WM_ACTIVATE:
 		if (WA_ACTIVE == wParam) {
 			if (IsWindow(m_dat->hwnd))
@@ -583,9 +576,6 @@ LRESULT CALLBACK CProxyWindow::wndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARA
 
 	case WM_NCDESTROY:
 		::SetWindowLongPtr(hWnd, GWLP_USERDATA, 0);
-#if defined(__LOGDEBUG_)
-		_DebugTraceW(_T("destroy proxy WINDOW for: %s"), m_dat->cache->getNick());
-#endif
 		break;
 
 	case WM_DWMSENDICONICTHUMBNAIL:
-- 
cgit v1.2.3