From 59cd198e89782263777c57dcd54704ecb1e10212 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 28 Jun 2015 17:41:48 +0000 Subject: finally CLISTEVENT removed completely git-svn-id: http://svn.miranda-ng.org/main/trunk@14430 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/FTPFileYM/src/ftpfile.cpp | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'plugins/FTPFileYM/src') diff --git a/plugins/FTPFileYM/src/ftpfile.cpp b/plugins/FTPFileYM/src/ftpfile.cpp index 90029b8159..8efff07d42 100644 --- a/plugins/FTPFileYM/src/ftpfile.cpp +++ b/plugins/FTPFileYM/src/ftpfile.cpp @@ -91,9 +91,9 @@ void InitMenuItems() { TCHAR stzName[256]; - CLISTMENUITEM mi = { 0 }; + TMO_MenuItem mi = { 0 }; mi.flags = CMIF_TCHAR; - mi.icolibItem = iconList[ServerList::FTP_COUNT].hIcolib; + mi.hIcolibItem = iconList[ServerList::FTP_COUNT].hIcolib; mi.position = 3000090001; mi.name.t = LPGENT("FTP File"); @@ -104,7 +104,7 @@ void InitMenuItems() memset(&mi, 0, sizeof(mi)); mi.name.t = stzName; - CLISTMENUITEM mi2 = { 0 }; + TMO_MenuItem mi2 = { 0 }; mi2.flags = CMIF_TCHAR; mi2.pszService = MS_FTPFILE_CONTACTMENU; @@ -114,53 +114,53 @@ void InitMenuItems() mir_sntprintf(stzName, _countof(stzName), TranslateT("FTP Server %d"), i + 1); mi.flags = CMIF_TCHAR; - mi.hParentMenu = (opt.bUseSubmenu) ? hMenu : 0; + mi.root = (opt.bUseSubmenu) ? hMenu : 0; - mi.icolibItem = iconList[i].hIcolib; + mi.hIcolibItem = iconList[i].hIcolib; hSubMenu[i] = Menu_AddContactMenuItem(&mi); Menu_ConfigureItem(hSubMenu[i], MCI_OPT_EXECPARAM, i + 1000); - mi.hParentMenu = hMainMenu; + mi.root = hMainMenu; hMainSubMenu[i] = Menu_AddMainMenuItem(&mi); - mi2.hParentMenu = hSubMenu[i]; + mi2.root = hSubMenu[i]; mi2.pszService = MS_FTPFILE_CONTACTMENU; mi2.name.t = LPGENT("Upload file(s)"); HGENMENU tmp = Menu_AddContactMenuItem(&mi2); Menu_ConfigureItem(tmp, MCI_OPT_EXECPARAM, mi2.position = i + UploadJob::FTP_RAWFILE); mi2.pszService = MS_FTPFILE_MAINMENU; - mi2.hParentMenu = hMainSubMenu[i]; + mi2.root = hMainSubMenu[i]; Menu_AddMainMenuItem(&mi2); - mi2.hParentMenu = hSubMenu[i]; + mi2.root = hSubMenu[i]; mi2.pszService = MS_FTPFILE_CONTACTMENU; mi2.name.t = LPGENT("Zip and upload file(s)"); tmp = Menu_AddContactMenuItem(&mi2); Menu_ConfigureItem(tmp, MCI_OPT_EXECPARAM, i + UploadJob::FTP_ZIPFILE); mi2.pszService = MS_FTPFILE_MAINMENU; - mi2.hParentMenu = hMainSubMenu[i]; + mi2.root = hMainSubMenu[i]; Menu_AddMainMenuItem(&mi2); - mi2.hParentMenu = hSubMenu[i]; + mi2.root = hSubMenu[i]; mi2.pszService = MS_FTPFILE_CONTACTMENU; mi2.name.t = LPGENT("Zip and upload folder"); tmp = Menu_AddContactMenuItem(&mi2); Menu_ConfigureItem(tmp, MCI_OPT_EXECPARAM, i + UploadJob::FTP_ZIPFOLDER); mi2.pszService = MS_FTPFILE_MAINMENU; - mi2.hParentMenu = hMainSubMenu[i]; + mi2.root = hMainSubMenu[i]; Menu_AddMainMenuItem(&mi2); } memset(&mi, 0, sizeof(mi)); mi.flags = CMIF_TCHAR; - mi.icolibItem = iconList[ServerList::FTP_COUNT].hIcolib; + mi.hIcolibItem = iconList[ServerList::FTP_COUNT].hIcolib; mi.position = 3000090001; mi.name.t = LPGENT("FTP File manager"); mi.pszService = MS_FTPFILE_SHOWMANAGER; - mi.hParentMenu = hMainMenu; + mi.root = hMainMenu; Menu_AddMainMenuItem(&mi); PrebuildMainMenu(); -- cgit v1.2.3