From 87fff9deac0941da4e87728f14c917700d5bbdec Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Thu, 27 Aug 2015 17:07:10 +0000
Subject: name conflicts

git-svn-id: http://svn.miranda-ng.org/main/trunk@15046 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/Clist_nicer/src/cluiframes.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'plugins/Clist_nicer/src/cluiframes.cpp')

diff --git a/plugins/Clist_nicer/src/cluiframes.cpp b/plugins/Clist_nicer/src/cluiframes.cpp
index ace31e1037..bbf7b4f8e0 100644
--- a/plugins/Clist_nicer/src/cluiframes.cpp
+++ b/plugins/Clist_nicer/src/cluiframes.cpp
@@ -1409,7 +1409,6 @@ static int UpdateTBToolTip(int framepos)
 
 int FrameNCPaint(HWND hwnd, WNDPROC oldWndProc, WPARAM wParam, LPARAM lParam, BOOL hasTitleBar)
 {
-	HDC hdc;
 	RECT rcWindow, rc;
 	HWND hwndParent = GetParent(hwnd);
 	LRESULT result = 0;
@@ -1457,7 +1456,7 @@ int FrameNCPaint(HWND hwnd, WNDPROC oldWndProc, WPARAM wParam, LPARAM lParam, BO
 	}
 
 	if (GetWindowLongPtr(hwnd, GWL_STYLE) & WS_BORDER) {
-		hdc = GetWindowDC(hwnd);
+		HDC hdc = GetWindowDC(hwnd);
 		HPEN hPenOld = reinterpret_cast<HPEN>(SelectObject(hdc, g_hPenCLUIFrames));
 		GetWindowRect(hwnd, &rcWindow);
 		rc.left = rc.top = 0;
@@ -2812,7 +2811,6 @@ LRESULT CALLBACK CLUIFrameContainerWndProc(HWND hwnd, UINT msg, WPARAM wParam, L
 
 			CLUIFrameResizeFloatingFrame(framepos);
 
-			RECT rect;
 			GetWindowRect(Frames[framepos].ContainerWnd, &rect);
 			Frames[framepos].FloatingPos.x = rect.left;
 			Frames[framepos].FloatingPos.y = rect.top;
-- 
cgit v1.2.3