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 --- protocols/Xfire/src/Xfire_game.cpp | 6 +++--- protocols/Xfire/src/Xfire_gamelist.cpp | 6 +++--- protocols/Xfire/src/main.cpp | 30 +++++++++++++++--------------- 3 files changed, 21 insertions(+), 21 deletions(-) (limited to 'protocols/Xfire/src') diff --git a/protocols/Xfire/src/Xfire_game.cpp b/protocols/Xfire/src/Xfire_game.cpp index 44feae968d..2ae07c6912 100644 --- a/protocols/Xfire/src/Xfire_game.cpp +++ b/protocols/Xfire/src/Xfire_game.cpp @@ -436,8 +436,8 @@ void Xfire_game::createMenuitem(unsigned int pos, int dbid) if (dbid < 0) dbid = pos; - CLISTMENUITEM mi = { 0 }; - mi.hParentMenu = Menu_CreateRoot(MO_MAIN, LPGENT("Start game"), 500084000); + TMO_MenuItem mi = { 0 }; + mi.root = Menu_CreateRoot(MO_MAIN, LPGENT("Start game"), 500084000); mir_snprintf(temp, _countof(temp), servicefunction, this->id); //wenn die servicefunktion schon exisitert vernichten, hehe @@ -446,7 +446,7 @@ void Xfire_game::createMenuitem(unsigned int pos, int dbid) CreateServiceFunctionParam(temp, StartGame, this->id); mi.pszService = temp; mi.position = 500090002 + pos; - mi.icolibItem = this->hicon ? this->hicon : LoadIcon(hinstance, MAKEINTRESOURCE(ID_OP)); + mi.hIcolibItem = this->hicon ? this->hicon : LoadIcon(hinstance, MAKEINTRESOURCE(ID_OP)); mi.name.a = menuitemtext(this->name); this->menuhandle = Menu_AddMainMenuItem(&mi); diff --git a/protocols/Xfire/src/Xfire_gamelist.cpp b/protocols/Xfire/src/Xfire_gamelist.cpp index 052f2fd624..a417177ad3 100644 --- a/protocols/Xfire/src/Xfire_gamelist.cpp +++ b/protocols/Xfire/src/Xfire_gamelist.cpp @@ -241,11 +241,11 @@ void Xfire_gamelist::clearGamelist() { //erstellt ein dummyeintrag void Xfire_gamelist::createDummyMenuItem() { - CLISTMENUITEM mi = { 0 }; - mi.hParentMenu = Menu_CreateRoot(MO_MAIN, LPGENT("Start game"), 500084000); + TMO_MenuItem mi = { 0 }; + mi.root = Menu_CreateRoot(MO_MAIN, LPGENT("Start game"), 500084000); mi.position = 500090001; mi.name.a = Translate("Please wait..."); - mi.icolibItem = LoadIcon(hinstance, MAKEINTRESOURCE(ID_OP)); + mi.hIcolibItem = LoadIcon(hinstance, MAKEINTRESOURCE(ID_OP)); dummymenuitem = Menu_AddMainMenuItem(&mi); } diff --git a/protocols/Xfire/src/main.cpp b/protocols/Xfire/src/main.cpp index 3be2481fef..e14629a20e 100644 --- a/protocols/Xfire/src/main.cpp +++ b/protocols/Xfire/src/main.cpp @@ -1113,10 +1113,10 @@ extern "C" __declspec(dllexport) int Load(void) CreateDirectoryA(AvatarsFolder, NULL); // erweiterte Kontextmenüpunkte - CLISTMENUITEM mi = { 0 }; + TMO_MenuItem mi = { 0 }; mi.position = 500090000; mi.name.a = protocolname; - mi.hParentMenu = Menu_AddContactMenuItem(&mi, protocolname); + mi.root = Menu_AddContactMenuItem(&mi, protocolname); mi.flags = CMIF_TCHAR; char servicefunction[100]; @@ -1124,42 +1124,42 @@ extern "C" __declspec(dllexport) int Load(void) // gotoprofilemenüpunkt CreateProtoServiceFunction(protocolname, "/GotoProfile", GotoProfile); mi.pszService = "/GotoProfile"; - mi.icolibItem = LoadIcon(hinstance, MAKEINTRESOURCE(ID_OP)); + mi.hIcolibItem = LoadIcon(hinstance, MAKEINTRESOURCE(ID_OP)); mi.name.t = LPGENT("&XFire Online Profile"); Menu_AddContactMenuItem(&mi, protocolname); // gotoxfireclansitemenüpunkt CreateProtoServiceFunction(protocolname, "/GotoXFireClanSite", GotoXFireClanSite); mi.pszService = "/GotoXFireClanSite"; - mi.icolibItem = LoadIcon(hinstance, MAKEINTRESOURCE(ID_OP)); + mi.hIcolibItem = LoadIcon(hinstance, MAKEINTRESOURCE(ID_OP)); mi.name.t = LPGENT("XFire &Clan Site"); gotoclansite = Menu_AddContactMenuItem(&mi, protocolname); // kopiermenüpunkt CreateProtoServiceFunction(protocolname, "/GetIPPort", GetIPPort); mi.pszService = "/GetIPPort"; - mi.icolibItem = LoadIcon(hinstance, MAKEINTRESOURCE(ID_OP)); + mi.hIcolibItem = LoadIcon(hinstance, MAKEINTRESOURCE(ID_OP)); mi.name.t = LPGENT("C&opy Server Address and Port"); copyipport = Menu_AddContactMenuItem(&mi, protocolname); // kopiermenüpunkt CreateProtoServiceFunction(protocolname, "/VoiceIPPort", GetVIPPort); mi.pszService = "/VoiceIPPort"; - mi.icolibItem = LoadIcon(hinstance, MAKEINTRESOURCE(ID_OP)); + mi.hIcolibItem = LoadIcon(hinstance, MAKEINTRESOURCE(ID_OP)); mi.name.t = LPGENT("Cop&y Voice Server Address and Port"); vipport = Menu_AddContactMenuItem(&mi, protocolname); // joinmenüpunkt CreateProtoServiceFunction(protocolname, "/JoinGame", JoinGame); mi.pszService = "/JoinGame"; - mi.icolibItem = LoadIcon(hinstance, MAKEINTRESOURCE(ID_OP)); + mi.hIcolibItem = LoadIcon(hinstance, MAKEINTRESOURCE(ID_OP)); mi.name.t = LPGENT("Join &Game..."); joingame = Menu_AddContactMenuItem(&mi, protocolname); // playmenüpunkt CreateProtoServiceFunction(protocolname, "/StartThisGame", StartThisGame); mi.pszService = "/StartThisGame"; - mi.icolibItem = LoadIcon(hinstance, MAKEINTRESOURCE(ID_OP)); + mi.hIcolibItem = LoadIcon(hinstance, MAKEINTRESOURCE(ID_OP)); mi.name.t = LPGENT("Play this game..."); startthisgame = Menu_AddContactMenuItem(&mi, protocolname); @@ -1167,25 +1167,25 @@ extern "C" __declspec(dllexport) int Load(void) CreateProtoServiceFunction(protocolname, "/RemoveFriend", RemoveFriend); mi.pszService = "/RemoveFriend"; mi.position = 2000070000; - mi.icolibItem = LoadIcon(hinstance, MAKEINTRESOURCE(ID_OP)); + mi.hIcolibItem = LoadIcon(hinstance, MAKEINTRESOURCE(ID_OP)); mi.name.t = LPGENT("Remove F&riend..."); removefriend = Menu_AddContactMenuItem(&mi, protocolname); // block user CreateProtoServiceFunction(protocolname, "/BlockFriend", BlockFriend); mi.pszService = "/BlockFriend"; - mi.icolibItem = LoadIcon(hinstance, MAKEINTRESOURCE(ID_OP)); + mi.hIcolibItem = LoadIcon(hinstance, MAKEINTRESOURCE(ID_OP)); mi.name.t = LPGENT("Block U&ser..."); blockfriend = Menu_AddContactMenuItem(&mi, protocolname); // main menu items // my fire profile - mi.hParentMenu = Menu_CreateRoot(MO_MAIN, _T(protocolname), 500090000); + mi.root = Menu_CreateRoot(MO_MAIN, _T(protocolname), 500090000); strncpy_s(servicefunction, protocolname, _TRUNCATE); strncat_s(servicefunction, "GotoProfile2", _TRUNCATE); CreateServiceFunction(servicefunction, GotoProfile2); mi.position = 500090000; - mi.icolibItem = LoadIcon(hinstance, MAKEINTRESOURCE(ID_OP)); + mi.hIcolibItem = LoadIcon(hinstance, MAKEINTRESOURCE(ID_OP)); mi.name.t = LPGENT("&My XFire Online Profile"); Menu_AddMainMenuItem(&mi); @@ -1193,7 +1193,7 @@ extern "C" __declspec(dllexport) int Load(void) strncpy_s(servicefunction, protocolname, _TRUNCATE); strncat_s(servicefunction, "GotoProfileAct", _TRUNCATE); CreateServiceFunction(servicefunction, GotoProfileAct); - mi.icolibItem = LoadIcon(hinstance, MAKEINTRESOURCE(ID_OP)); + mi.hIcolibItem = LoadIcon(hinstance, MAKEINTRESOURCE(ID_OP)); mi.name.t = LPGENT("&Activity Report"); Menu_AddMainMenuItem(&mi); @@ -1201,14 +1201,14 @@ extern "C" __declspec(dllexport) int Load(void) strncpy_s(servicefunction, protocolname, _TRUNCATE); strncat_s(servicefunction, "ReScanMyGames", _TRUNCATE); CreateServiceFunction(servicefunction, ReScanMyGames); - mi.icolibItem = LoadIcon(hinstance, MAKEINTRESOURCE(ID_OP)); + mi.hIcolibItem = LoadIcon(hinstance, MAKEINTRESOURCE(ID_OP)); mi.name.t = LPGENT("&Rescan my games..."); Menu_AddMainMenuItem(&mi); strncpy_s(servicefunction, protocolname, _TRUNCATE); strncat_s(servicefunction, "SetNick", _TRUNCATE); CreateServiceFunction(servicefunction, SetNickDlg); - mi.icolibItem = LoadIcon(hinstance, MAKEINTRESOURCE(ID_OP)); + mi.hIcolibItem = LoadIcon(hinstance, MAKEINTRESOURCE(ID_OP)); mi.name.t = LPGENT("Set &Nickname"); Menu_AddMainMenuItem(&mi); -- cgit v1.2.3