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/Watrack/i_gui.inc | 5 ++--- plugins/Watrack/lastfm/lastfm.pas | 5 ++--- plugins/Watrack/myshows/myshows.pas | 5 ++--- plugins/Watrack/popup/popups.pas | 4 ++-- plugins/Watrack/proto/proto.pas | 4 ++-- plugins/Watrack/stat/statlog.pas | 4 ++-- 6 files changed, 12 insertions(+), 15 deletions(-) (limited to 'plugins/Watrack') diff --git a/plugins/Watrack/i_gui.inc b/plugins/Watrack/i_gui.inc index 2f2f249c14..3e41d6e6e9 100644 --- a/plugins/Watrack/i_gui.inc +++ b/plugins/Watrack/i_gui.inc @@ -27,11 +27,10 @@ end; procedure CreateMenus; var - mi:TCListMenuItem; + mi:TMO_MenuItem; begin FillChar(mi, sizeof(mi), 0); - mi.hParentMenu:=Menu_CreateRoot(MO_MAIN, 'Watrack', 0, 0, 0); - + mi.root :=Menu_CreateRoot(MO_MAIN, 'Watrack', 0, 0, 0); mi.hIcon :=IcoLib_GetIcon(IcoBtnEnable,0); mi.szName.a :='Disable WATrack'; mi.pszService:=MS_WAT_PLUGINSTATUS; diff --git a/plugins/Watrack/lastfm/lastfm.pas b/plugins/Watrack/lastfm/lastfm.pas index 8cb51a855c..def0009b08 100644 --- a/plugins/Watrack/lastfm/lastfm.pas +++ b/plugins/Watrack/lastfm/lastfm.pas @@ -166,7 +166,7 @@ end; procedure CreateMenus; var - mi:TCListMenuItem; + mi:TMO_MenuItem; sid:TSKINICONDESC; begin FillChar(sid,SizeOf(TSKINICONDESC),0); @@ -181,8 +181,7 @@ begin DestroyIcon(sid.hDefaultIcon); FillChar(mi, sizeof(mi), 0); - mi.hParentMenu:=Menu_CreateRoot(MO_MAIN, 'Watrack', 500050000, 0, 0); - + mi.root :=Menu_CreateRoot(MO_MAIN, 'Watrack', 500050000, 0, 0); mi.hIcon :=IcoLib_GetIcon(IcoLastFM,0); mi.szName.a :='Disable scrobbling'; mi.pszService:=MS_WAT_LASTFM; diff --git a/plugins/Watrack/myshows/myshows.pas b/plugins/Watrack/myshows/myshows.pas index 054d9a6010..28f8398cd3 100644 --- a/plugins/Watrack/myshows/myshows.pas +++ b/plugins/Watrack/myshows/myshows.pas @@ -197,7 +197,7 @@ end; procedure CreateMenus; var - mi:TCListMenuItem; + mi:TMO_MenuItem; sid:TSKINICONDESC; begin FillChar(sid,SizeOf(TSKINICONDESC),0); @@ -212,8 +212,7 @@ begin DestroyIcon(sid.hDefaultIcon); FillChar(mi, sizeof(mi), 0); - mi.hParentMenu:=Menu_CreateRoot(MO_MAIN, 'Watrack', 500050000, 0, 0); - + mi.root :=Menu_CreateRoot(MO_MAIN, 'Watrack', 500050000, 0, 0); mi.hIcon :=IcoLib_GetIcon(IcoMyShows,0); mi.szName.a :='Disable scrobbling'; mi.pszService:=MS_WAT_MYSHOWS; diff --git a/plugins/Watrack/popup/popups.pas b/plugins/Watrack/popup/popups.pas index fb6f9d1b53..4e1b041682 100644 --- a/plugins/Watrack/popup/popups.pas +++ b/plugins/Watrack/popup/popups.pas @@ -443,7 +443,7 @@ end; function InitProc(aGetStatus:boolean=false):integer; var - mi:TCListMenuItem; + mi:TMO_MenuItem; sid:TSKINICONDESC; begin if aGetStatus then @@ -472,7 +472,7 @@ begin HookEvent(ME_SKIN2_ICONSCHANGED,@IconChanged); FillChar(mi,SizeOf(mi),0); - mi.hParentMenu:=Menu_CreateRoot(MO_MAIN, 'Watrack', MenuInfoPos, 0, 0); + mi.root :=Menu_CreateRoot(MO_MAIN, 'Watrack', MenuInfoPos, 0, 0); mi.hIcon :=IcoLib_GetIcon(IcoBtnInfo,0); mi.szName.a :='Music Info'; mi.pszService:=MS_WAT_SHOWMUSICINFO; diff --git a/plugins/Watrack/proto/proto.pas b/plugins/Watrack/proto/proto.pas index 25408aeba0..c3d993f0ce 100644 --- a/plugins/Watrack/proto/proto.pas +++ b/plugins/Watrack/proto/proto.pas @@ -336,7 +336,7 @@ end; function InitProc(aGetStatus:boolean=false):integer; var - mi:TCListMenuItem; + mi:TMO_MenuItem; begin if aGetStatus then begin @@ -354,7 +354,7 @@ begin RegisterIcons; FillChar(mi, sizeof(mi), 0); - mi.hParentMenu:=Menu_CreateRoot(MO_MAIN, 'Watrack', 0, 0, 0); + mi.root :=Menu_CreateRoot(MO_MAIN, 'Watrack', 0, 0, 0); mi.flags :=CMIF_NOTOFFLINE or CMIF_NOTOFFLIST; mi.hIcon :=IcoLib_GetIcon(IcoBtnContext,0); mi.szName.a :='Get user''s Music Info'; diff --git a/plugins/Watrack/stat/statlog.pas b/plugins/Watrack/stat/statlog.pas index fe5418017f..ffa1626ac0 100644 --- a/plugins/Watrack/stat/statlog.pas +++ b/plugins/Watrack/stat/statlog.pas @@ -551,7 +551,7 @@ end; function InitProc(aGetStatus:boolean=false):integer; var - mi:TCListMenuItem; + mi:TMO_MenuItem; sid:TSKINICONDESC; begin if aGetStatus then @@ -582,7 +582,7 @@ begin DestroyIcon(sid.hDefaultIcon); FillChar(mi, sizeof(mi), 0); - mi.hParentMenu:=Menu_CreateRoot(MO_MAIN, 'Watrack', MenuReportPos, 0, 0); + mi.root :=Menu_CreateRoot(MO_MAIN, 'Watrack', MenuReportPos, 0, 0); mi.hIcon :=IcoLib_GetIcon(IcoBtnReport,0); mi.szName.a :='Create WATrack report'; mi.pszService:=MS_WAT_MAKEREPORT; -- cgit v1.2.3