- all MS_CLIST_ADD*ITEM services replaced with Menu_Add*Item stubs.

- massive cleanup of the menu-related code

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

1 files changed, 25 insertions, 25 deletions

diff --git a/src/modules/utils/colourpicker.cpp b/src/modules/utils/colourpicker.cpp
index 29d25a175f..731f61f1e1 100644
--- a/src/modules/utils/colourpicker.cpp
+++ b/src/modules/utils/colourpicker.cpp
@@ -11,7 +11,7 @@ modify it under the terms of the GNU General Public License
 as published by the Free Software Foundation; either version 2

 of the License, or (at your option) any later version.

 

-This program is distributed in the hope that it will be useful,

+This program is distributed in the hope that it will be useful, 

 but WITHOUT ANY WARRANTY; without even the implied warranty of

 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 GNU General Public License for more details.

@@ -22,44 +22,44 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */

 #include "..\..\core\commonheaders.h"

 

-static LRESULT CALLBACK ColourPickerWndProc(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam)

+static LRESULT CALLBACK ColourPickerWndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)

 {

 	switch(message) {

 		case WM_CREATE:

-			SetWindowLongPtr(hwnd,0,0);

-			SetWindowLongPtr(hwnd,sizeof(COLORREF),0);

+			SetWindowLongPtr(hwnd, 0, 0);

+			SetWindowLongPtr(hwnd, sizeof(COLORREF), 0);

 			break;

 		case CPM_SETDEFAULTCOLOUR:

-			SetWindowLongPtr(hwnd,sizeof(COLORREF),lParam);

+			SetWindowLongPtr(hwnd, sizeof(COLORREF), lParam);

 			break;

 		case CPM_GETDEFAULTCOLOUR:

-			return GetWindowLongPtr(hwnd,sizeof(COLORREF));

+			return GetWindowLongPtr(hwnd, sizeof(COLORREF));

 		case CPM_SETCOLOUR:

-			SetWindowLongPtr(hwnd,0,lParam);

-			InvalidateRect(hwnd,NULL,FALSE);

+			SetWindowLongPtr(hwnd, 0, lParam);

+			InvalidateRect(hwnd, NULL, FALSE);

 			break;

 		case CPM_GETCOLOUR:

-			return GetWindowLongPtr(hwnd,0);

+			return GetWindowLongPtr(hwnd, 0);

 		case WM_LBUTTONUP:

 		{

             CHOOSECOLOR cc={0};

             COLORREF custColours[16]={0};

-			custColours[0]=GetWindowLongPtr(hwnd,sizeof(COLORREF));

+			custColours[0]=GetWindowLongPtr(hwnd, sizeof(COLORREF));

             cc.lStructSize=sizeof(CHOOSECOLOR);

             cc.hwndOwner=hwnd;

             cc.hInstance=(HWND)hMirandaInst;

-            cc.rgbResult=GetWindowLongPtr(hwnd,0);

+            cc.rgbResult=GetWindowLongPtr(hwnd, 0);

             cc.lpCustColors=custColours;

             cc.Flags=CC_ANYCOLOR|CC_FULLOPEN|CC_RGBINIT;

             if (ChooseColor(&cc)) {

-				SetWindowLongPtr(hwnd,0,cc.rgbResult);

-				SendMessage(GetParent(hwnd),WM_COMMAND,MAKEWPARAM(GetDlgCtrlID(hwnd),CPN_COLOURCHANGED),(LPARAM)hwnd);

-				InvalidateRect(hwnd,NULL,FALSE);

+				SetWindowLongPtr(hwnd, 0, cc.rgbResult);

+				SendMessage(GetParent(hwnd), WM_COMMAND, MAKEWPARAM(GetDlgCtrlID(hwnd), CPN_COLOURCHANGED), (LPARAM)hwnd);

+				InvalidateRect(hwnd, NULL, FALSE);

 			}

 			break;

 		}

 		case WM_ENABLE:

-			InvalidateRect(hwnd,NULL,FALSE);

+			InvalidateRect(hwnd, NULL, FALSE);

 			break;

 		case WM_NCPAINT:

 		case WM_PAINT:

@@ -68,24 +68,24 @@ static LRESULT CALLBACK ColourPickerWndProc(HWND hwnd,UINT message,WPARAM wParam
 			RECT rc;

 			HBRUSH hBrush;

 

-			hdc1=BeginPaint(hwnd,&ps);

-			GetClientRect(hwnd,&rc);

-			DrawEdge(hdc1,&rc,EDGE_ETCHED,BF_RECT);

-			InflateRect(&rc,-2,-2);

+			hdc1=BeginPaint(hwnd, &ps);

+			GetClientRect(hwnd, &rc);

+			DrawEdge(hdc1, &rc, EDGE_ETCHED, BF_RECT);

+			InflateRect(&rc, -2, -2);

 			if (IsWindowEnabled(hwnd))

-				hBrush=CreateSolidBrush(GetWindowLongPtr(hwnd,0));

+				hBrush=CreateSolidBrush(GetWindowLongPtr(hwnd, 0));

 			else

-				hBrush=CreateHatchBrush(HS_BDIAGONAL,GetSysColor(COLOR_GRAYTEXT));

-			SetBkColor(hdc1,GetSysColor(COLOR_BTNFACE));

-			FillRect(hdc1,&rc,hBrush);

+				hBrush=CreateHatchBrush(HS_BDIAGONAL, GetSysColor(COLOR_GRAYTEXT));

+			SetBkColor(hdc1, GetSysColor(COLOR_BTNFACE));

+			FillRect(hdc1, &rc, hBrush);

 			DeleteObject(hBrush);

-			EndPaint(hwnd,&ps);

+			EndPaint(hwnd, &ps);

 			break;

 		}

 		case WM_DESTROY:

 			break;

 	}

-	return DefWindowProc(hwnd,message,wParam,lParam);

+	return DefWindowProc(hwnd, message, wParam, lParam);

 }

 

 int InitColourPicker(void)