- 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

2 files changed, 32 insertions, 32 deletions

diff --git a/src/modules/help/about.cpp b/src/modules/help/about.cpp
index b3594c4dc0..d1dc8bac5c 100644
--- a/src/modules/help/about.cpp
+++ b/src/modules/help/about.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.

@@ -40,25 +40,25 @@ INT_PTR CALLBACK DlgProcAbout(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPar
 			UINT blockSize;

 			PVOID pVerInfo;

 

-			GetModuleFileName(NULL,filename,SIZEOF(filename));

-			verInfoSize=GetFileVersionInfoSize(filename,&unused);

+			GetModuleFileName(NULL, filename, SIZEOF(filename));

+			verInfoSize=GetFileVersionInfoSize(filename, &unused);

 			pVerInfo=mir_alloc(verInfoSize);

-			GetFileVersionInfo(filename,0,verInfoSize,pVerInfo);

-			VerQueryValue(pVerInfo,_T("\\StringFileInfo\\000004b0\\LegalCopyright"),(LPVOID*)&productCopyright,&blockSize);

-			SetDlgItemText(hwndDlg,IDC_DEVS,productCopyright);

+			GetFileVersionInfo(filename, 0, verInfoSize, pVerInfo);

+			VerQueryValue(pVerInfo, _T("\\StringFileInfo\\000004b0\\LegalCopyright"), (LPVOID*)&productCopyright, &blockSize);

+			SetDlgItemText(hwndDlg, IDC_DEVS, productCopyright);

 			mir_free(pVerInfo);

 		}

 		{	char productVersion[56], *p;

             int isAnsi = 0;

 			TCHAR str[64];

-			CallService(MS_SYSTEM_GETVERSIONTEXT,SIZEOF(productVersion),(LPARAM)productVersion);

+			CallService(MS_SYSTEM_GETVERSIONTEXT, SIZEOF(productVersion), (LPARAM)productVersion);

             // Hide Unicode from version text as it is assumed at this point

             p = strstr(productVersion, " Unicode"); 

 			if (p)

 				*p = '\0';

             else

                 isAnsi = 1;

-			mir_sntprintf(str,SIZEOF(str),_T(STR_VERSION_FORMAT), TranslateT("v"), productVersion, isAnsi?" ANSI":"");

+			mir_sntprintf(str, SIZEOF(str), _T(STR_VERSION_FORMAT), TranslateT("v"), productVersion, isAnsi?" ANSI":"");

             {

                 TCHAR oldTitle[256], newTitle[256];

 				GetDlgItemText( hwndDlg, IDC_HEADERBAR, oldTitle, SIZEOF( oldTitle ));

@@ -66,14 +66,14 @@ INT_PTR CALLBACK DlgProcAbout(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPar
 				SetDlgItemText( hwndDlg, IDC_HEADERBAR, newTitle );

 			}

             

-			mir_sntprintf(str,SIZEOF(str),TranslateT("Built %s %s"),_T(__DATE__),_T(__TIME__));

-			SetDlgItemText(hwndDlg,IDC_BUILDTIME,str);

+			mir_sntprintf(str, SIZEOF(str), TranslateT("Built %s %s"), _T(__DATE__), _T(__TIME__));

+			SetDlgItemText(hwndDlg, IDC_BUILDTIME, str);

 		}

 		ShowWindow(GetDlgItem(hwndDlg, IDC_CREDITSFILE), SW_HIDE);

 		{	

-			HRSRC   hResInfo  = FindResource(hMirandaInst,MAKEINTRESOURCE(IDR_CREDITS),_T("TEXT"));

-			DWORD   ResSize   = SizeofResource(hMirandaInst,hResInfo);

-			HGLOBAL hRes      = LoadResource(hMirandaInst,hResInfo);

+			HRSRC   hResInfo  = FindResource(hMirandaInst, MAKEINTRESOURCE(IDR_CREDITS), _T("TEXT"));

+			DWORD   ResSize   = SizeofResource(hMirandaInst, hResInfo);

+			HGLOBAL hRes      = LoadResource(hMirandaInst, hResInfo);

 			char*   pszMsg    = (char*)LockResource(hRes);

 			if (pszMsg)

 			{

@@ -127,7 +127,7 @@ INT_PTR CALLBACK DlgProcAbout(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPar
 		case IDC_BUILDTIME:

 		case IDC_CREDITSFILE:

 		case IDC_DEVS:

-			SetTextColor((HDC)wParam,GetSysColor(COLOR_WINDOWTEXT));

+			SetTextColor((HDC)wParam, GetSysColor(COLOR_WINDOWTEXT));

 			break;

 		default:

 			return FALSE;

@@ -138,8 +138,8 @@ INT_PTR CALLBACK DlgProcAbout(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPar
 	case WM_DESTROY:

 		Window_FreeIcon_IcoLib( hwndDlg );

 		{	

-			HFONT hFont=(HFONT)SendDlgItemMessage(hwndDlg,IDC_VERSION,WM_GETFONT,0,0);

-			SendDlgItemMessage(hwndDlg,IDC_VERSION,WM_SETFONT,SendDlgItemMessage(hwndDlg,IDOK,WM_GETFONT,0,0),0);

+			HFONT hFont=(HFONT)SendDlgItemMessage(hwndDlg, IDC_VERSION, WM_GETFONT, 0, 0);

+			SendDlgItemMessage(hwndDlg, IDC_VERSION, WM_SETFONT, SendDlgItemMessage(hwndDlg, IDOK, WM_GETFONT, 0, 0), 0);

 			DeleteObject(hFont);				

 		}

 		break;

diff --git a/src/modules/help/help.cpp b/src/modules/help/help.cpp
index 32c6a8528d..d6035957b7 100644
--- a/src/modules/help/help.cpp
+++ b/src/modules/help/help.cpp
@@ -2,7 +2,7 @@
 

 Miranda IM: the free IM client for Microsoft* Windows*

 

-Copyright 2000-2009 Miranda ICQ/IM project,

+Copyright 2000-2009 Miranda ICQ/IM project, 

 all portions of this codebase are copyrighted to the people

 listed in contributors.txt.

 

@@ -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.

@@ -27,26 +27,26 @@ INT_PTR CALLBACK DlgProcAbout(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPar
 HWND hAboutDlg=NULL;

 static HANDLE hBugEvent = NULL;

 

-static INT_PTR AboutCommand(WPARAM wParam,LPARAM)

+static INT_PTR AboutCommand(WPARAM wParam, LPARAM)

 {

 	if (IsWindow(hAboutDlg)) {

 		SetForegroundWindow(hAboutDlg);

 		SetFocus(hAboutDlg);

 		return 0;

 	}

-	hAboutDlg=CreateDialog(hMirandaInst,MAKEINTRESOURCE(IDD_ABOUT),(HWND)wParam,DlgProcAbout);

+	hAboutDlg=CreateDialog(hMirandaInst, MAKEINTRESOURCE(IDD_ABOUT), (HWND)wParam, DlgProcAbout);

 	return 0;

 }

 

 static INT_PTR IndexCommand(WPARAM, LPARAM)

 {

-	CallService(MS_UTILS_OPENURL,1,(LPARAM)Translate("http://wiki.miranda-im.org/"));

+	CallService(MS_UTILS_OPENURL, 1, (LPARAM)Translate("http://wiki.miranda-im.org/"));

 	return 0;

 }

 

 static INT_PTR WebsiteCommand(WPARAM, LPARAM)

 {

-	CallService(MS_UTILS_OPENURL,1,(LPARAM)"http://www.miranda-im.org");

+	CallService(MS_UTILS_OPENURL, 1, (LPARAM)"http://www.miranda-im.org");

 	return 0;

 }

 

@@ -54,7 +54,7 @@ static int BugCommandEvent(WPARAM wParam, LPARAM lParam) {
     char *szUrl = (char*)lParam;

 

     if (szUrl) {

-        CallService(MS_UTILS_OPENURL,1,(LPARAM)szUrl);

+        CallService(MS_UTILS_OPENURL, 1, (LPARAM)szUrl);

     }

     return 0;

 }

@@ -75,12 +75,12 @@ int ShutdownHelpModule(WPARAM, LPARAM)
 

 int LoadHelpModule(void)

 {

-	HookEvent(ME_SYSTEM_PRESHUTDOWN,ShutdownHelpModule);

+	HookEvent(ME_SYSTEM_PRESHUTDOWN, ShutdownHelpModule);

 

-	CreateServiceFunction("Help/AboutCommand",AboutCommand);

-	CreateServiceFunction("Help/IndexCommand",IndexCommand);

-	CreateServiceFunction("Help/WebsiteCommand",WebsiteCommand);

-	CreateServiceFunction("Help/BugCommand",BugCommand);

+	CreateServiceFunction("Help/AboutCommand", AboutCommand);

+	CreateServiceFunction("Help/IndexCommand", IndexCommand);

+	CreateServiceFunction("Help/WebsiteCommand", WebsiteCommand);

+	CreateServiceFunction("Help/BugCommand", BugCommand);

 

 	hBugEvent = CreateHookableEvent(ME_HELP_BUGREPORT);

 	SetHookDefaultForHookableEvent(hBugEvent, BugCommandEvent);

@@ -94,24 +94,24 @@ int LoadHelpModule(void)
 	mi.position = 2000090000;

 	mi.pszName = LPGEN("&About...");

 	mi.pszService = "Help/AboutCommand";

-	CallService(MS_CLIST_ADDMAINMENUITEM,0,(LPARAM)&mi);

+	Menu_AddMainMenuItem(&mi);

 

 	mi.icolibItem = GetSkinIconHandle(SKINICON_OTHER_HELP);

 	mi.position = -500050000;

 	mi.pszName = LPGEN("&Support");

 	mi.pszService = "Help/IndexCommand";

-	CallService(MS_CLIST_ADDMAINMENUITEM,0,(LPARAM)&mi);

+	Menu_AddMainMenuItem(&mi);

 

 	mi.icolibItem = GetSkinIconHandle(SKINICON_OTHER_MIRANDAWEB);

 	mi.position = 2000050000;

 	mi.pszName = LPGEN("&Miranda IM Homepage");

 	mi.pszService = "Help/WebsiteCommand";

-	CallService(MS_CLIST_ADDMAINMENUITEM,0,(LPARAM)&mi);

+	Menu_AddMainMenuItem(&mi);

 

 	mi.icolibItem = GetSkinIconHandle(SKINICON_EVENT_URL);

 	mi.position = 2000040000;

 	mi.pszName = LPGEN("&Report Bug");

 	mi.pszService = "Help/BugCommand";

-	CallService(MS_CLIST_ADDMAINMENUITEM,0,(LPARAM)&mi);

+	Menu_AddMainMenuItem(&mi);

 	return 0;

 }