From b3506557a58f53ed0fc3a96c4ec4a3b8098a542d Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 22 Jun 2015 13:35:02 +0000 Subject: - CLISTMENUITEM::cbSize - atavism removed; - code cleaning git-svn-id: http://svn.miranda-ng.org/main/trunk@14325 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/BasicHistory/src/BasicHistory.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'plugins/BasicHistory') diff --git a/plugins/BasicHistory/src/BasicHistory.cpp b/plugins/BasicHistory/src/BasicHistory.cpp index 1f103b66d0..4da30e3d49 100644 --- a/plugins/BasicHistory/src/BasicHistory.cpp +++ b/plugins/BasicHistory/src/BasicHistory.cpp @@ -96,7 +96,7 @@ int ToolbarModuleLoaded(WPARAM wParam,LPARAM lParam) void InitMenuItems() { - CLISTMENUITEM mi = { sizeof(mi) }; + CLISTMENUITEM mi = { 0 }; mi.position = 1000090000; mi.icolibItem = Skin_GetIconHandle(SKINICON_OTHER_HISTORY); mi.pszName = LPGEN("View &History"); @@ -119,7 +119,7 @@ void InitMenuItems() void InitTaskMenuItems() { if (Options::instance->taskOptions.size() > 0) { - CLISTMENUITEM mi = { sizeof(mi) }; + CLISTMENUITEM mi = { 0 }; if (hTaskMainMenu == NULL) { mi.position = 500060005; mi.flags = CMIF_ROOTPOPUP; @@ -132,7 +132,6 @@ void InitTaskMenuItems() std::vector::iterator it = taskMenus.begin(); for (; it != taskMenus.end() && taskIt != Options::instance->taskOptions.end(); ++it, ++taskIt) { memset(&mi, 0, sizeof(mi)); - mi.cbSize = sizeof(mi); mi.flags = CMIM_FLAGS | CMIM_NAME | CMIF_CHILDPOPUP | CMIF_ROOTHANDLE | CMIF_TCHAR | CMIF_KEEPUNTRANSLATED; mi.hParentMenu = hTaskMainMenu; mi.ptszName = (TCHAR*)taskIt->taskName.c_str(); @@ -141,7 +140,6 @@ void InitTaskMenuItems() for (; it != taskMenus.end(); ++it) { memset(&mi, 0, sizeof(mi)); - mi.cbSize = sizeof(mi); mi.flags = CMIM_FLAGS | CMIF_CHILDPOPUP | CMIF_ROOTHANDLE | CMIF_TCHAR | CMIF_KEEPUNTRANSLATED | CMIF_HIDDEN; mi.hParentMenu = hTaskMainMenu; Menu_ModifyItem((HGENMENU)*it, &mi); @@ -150,7 +148,6 @@ void InitTaskMenuItems() int pos = (int)taskMenus.size(); for (; taskIt != Options::instance->taskOptions.end(); ++taskIt) { memset(&mi, 0, sizeof(mi)); - mi.cbSize = sizeof(mi); mi.flags = CMIF_CHILDPOPUP | CMIF_ROOTHANDLE | CMIF_TCHAR | CMIF_KEEPUNTRANSLATED; mi.pszService = MS_HISTORY_EXECUTE_TASK; mi.hParentMenu = hTaskMainMenu; @@ -161,7 +158,7 @@ void InitTaskMenuItems() } } else if (hTaskMainMenu != NULL) { - CLISTMENUITEM mi = { sizeof(mi) }; + CLISTMENUITEM mi = { 0 }; mi.flags = CMIM_FLAGS | CMIF_ROOTPOPUP | CMIF_HIDDEN; Menu_ModifyItem(hTaskMainMenu, &mi); } -- cgit v1.2.3