From a6ad2609bad6a7c4b6f30c17973af9dcaba8c8af Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Mon, 9 Jul 2012 13:47:44 +0000
Subject: slightly changed design of custom MButtonCtrl window procedure. Clist
 Nicer works ok

git-svn-id: http://svn.miranda-ng.org/main/trunk@880 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 src/modules/button/button.cpp | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'src/modules')

diff --git a/src/modules/button/button.cpp b/src/modules/button/button.cpp
index f3384f3fcc..ed00c94f3b 100644
--- a/src/modules/button/button.cpp
+++ b/src/modules/button/button.cpp
@@ -261,11 +261,9 @@ static void PaintWorker(MButtonCtrl *ctl, HDC hdcPaint)
 static LRESULT CALLBACK MButtonWndProc(HWND hwndDlg, UINT msg,  WPARAM wParam, LPARAM lParam)
 {
 	MButtonCtrl* bct = (MButtonCtrl *)GetWindowLongPtr(hwndDlg, 0);
-	if (bct && bct->fnWindowProc) {
-		LRESULT res = bct->fnWindowProc(hwndDlg, msg, wParam, lParam);
-		if (res)
-			return res;
-	}		
+	if (bct && bct->fnWindowProc)
+		if ( bct->fnWindowProc(hwndDlg, msg, wParam, lParam))
+			return bct->lResult;
 
 	switch(msg) {
 	case WM_NCCREATE:
-- 
cgit v1.2.3