From 30707c980d1560b358dbf2671a4d2a26a1e8173c Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Wed, 28 Nov 2012 21:45:37 +0000
Subject: various menu initialization quirks

git-svn-id: http://svn.miranda-ng.org/main/trunk@2552 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 src/modules/clist/clui.cpp          | 10 +++-------
 src/modules/clist/movetogroup.cpp   | 10 +++-------
 src/modules/options/options.cpp     |  3 +--
 src/modules/protocols/protoopts.cpp |  3 +--
 4 files changed, 8 insertions(+), 18 deletions(-)

(limited to 'src/modules')

diff --git a/src/modules/clist/clui.cpp b/src/modules/clist/clui.cpp
index 612be5cd8e..8fcc0a3120 100644
--- a/src/modules/clist/clui.cpp
+++ b/src/modules/clist/clui.cpp
@@ -91,17 +91,14 @@ static int MenuItem_PreBuild(WPARAM, LPARAM)
 	TCHAR cls[128];
 	HANDLE hItem;
 	HWND hwndClist = GetFocus();
-	CLISTMENUITEM mi;
 
-	ZeroMemory(&mi, sizeof(mi));
-	mi.cbSize = sizeof(mi);
+	CLISTMENUITEM mi = { sizeof(mi) };
 	mi.flags = CMIM_FLAGS;
 	GetClassName(hwndClist, cls, SIZEOF(cls));
 	hwndClist = ( !lstrcmp(CLISTCONTROL_CLASS, cls)) ? hwndClist : cli.hwndContactList;
 	hItem = (HANDLE) SendMessage(hwndClist, CLM_GETSELECTION, 0, 0);
-	if ( !hItem) {
+	if ( !hItem)
 		mi.flags = CMIM_FLAGS | CMIF_HIDDEN;
-	}
 	CallService(MS_CLIST_MODIFYMENUITEM, (WPARAM) hRenameMenuItem, (LPARAM) & mi);
 	return 0;
 }
@@ -356,8 +353,7 @@ int LoadCLUIModule(void)
 			0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE);
 	}
 	{
-		CLISTMENUITEM mi = { 0 };
-		mi.cbSize = sizeof(mi);
+		CLISTMENUITEM mi = { sizeof(mi) };
 
 		CreateServiceFunction("CList/DeleteContactCommand", MenuItem_DeleteContact);
 		mi.position = 2000070000;
diff --git a/src/modules/clist/movetogroup.cpp b/src/modules/clist/movetogroup.cpp
index 56a5e89ddb..0e5bfd5420 100644
--- a/src/modules/clist/movetogroup.cpp
+++ b/src/modules/clist/movetogroup.cpp
@@ -66,8 +66,7 @@ static TCHAR* PrepareGroupName(TCHAR* str)
 
 static void AddGroupItem(HGENMENU hRoot, TCHAR* name, int pos, WPARAM param, bool checked)
 {
-	CLISTMENUITEM mi = { 0 };
-	mi.cbSize = sizeof(mi);
+	CLISTMENUITEM mi = { sizeof(mi) };
 	mi.hParentMenu = hRoot;
 	mi.popupPosition = param; // param to pszService - only with CMIF_CHILDPOPUP !!!!!!
 	mi.position = pos;
@@ -87,11 +86,8 @@ static int OnContactMenuBuild(WPARAM wParam, LPARAM)
 	int i;
 	OBJLIST<GroupItemSort> groups(10, GroupItemSort::compare);	
 
-	if ( !hMoveToGroupItem)
-	{
-		CLISTMENUITEM mi = {0};
-
-		mi.cbSize = sizeof(mi);
+	if ( !hMoveToGroupItem) {
+		CLISTMENUITEM mi = { sizeof(mi) };
 		mi.position = 100000;
 		mi.pszName = LPGEN("&Move to Group");
 		mi.flags = CMIF_ROOTHANDLE | CMIF_ICONFROMICOLIB;
diff --git a/src/modules/options/options.cpp b/src/modules/options/options.cpp
index 4d8d71c438..4af9638e87 100644
--- a/src/modules/options/options.cpp
+++ b/src/modules/options/options.cpp
@@ -1417,8 +1417,7 @@ static INT_PTR AddOptionsPage(WPARAM wParam, LPARAM lParam)
 
 static int OptModulesLoaded(WPARAM, LPARAM)
 {
-	CLISTMENUITEM mi = { 0 };
-	mi.cbSize = sizeof(mi);
+	CLISTMENUITEM mi = { sizeof(mi) };
 	mi.flags = CMIF_ICONFROMICOLIB;
 	mi.icolibItem = GetSkinIconHandle(SKINICON_OTHER_OPTIONS);
 	mi.position = 1900000000;
diff --git a/src/modules/protocols/protoopts.cpp b/src/modules/protocols/protoopts.cpp
index 31f3302252..847fd15839 100644
--- a/src/modules/protocols/protoopts.cpp
+++ b/src/modules/protocols/protoopts.cpp
@@ -1033,8 +1033,7 @@ static INT_PTR OptProtosShow(WPARAM, LPARAM)
 
 int OptProtosLoaded(WPARAM, LPARAM)
 {
-	CLISTMENUITEM mi = { 0 };
-	mi.cbSize = sizeof(mi);
+	CLISTMENUITEM mi = { sizeof(mi) };
 	mi.flags = CMIF_ICONFROMICOLIB;
 	mi.icolibItem = GetSkinIconHandle(SKINICON_OTHER_ACCMGR);
 	mi.position = 1900000000;
-- 
cgit v1.2.3