- all icolib services removed;

- IcoLib_* functions are bound directly to the code

git-svn-id: http://svn.miranda-ng.org/main/trunk@14161 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

3 files changed, 12 insertions, 13 deletions

diff --git a/plugins/mRadio/i_tray.inc b/plugins/mRadio/i_tray.inc
index 468cb47992..3d44553244 100644
--- a/plugins/mRadio/i_tray.inc
+++ b/plugins/mRadio/i_tray.inc
@@ -141,7 +141,7 @@ begin
   mi.cbSize  :=sizeof(mi);

   mi.flags   :=CMIF_UNICODE;

   mi.szName.w:=cPluginName;

-  mi.hIcon   :=CallService(MS_SKIN2_GETICON,0,lparam(IcoBtnSettings));

+  mi.hIcon   :=IcoLib_GetIcon(IcoBtnSettings,0);

   if doTray then

     trayradioparent:=Menu_AddTrayMenuItem(@mi)

   else

@@ -178,7 +178,7 @@ begin
     mi.flags:=CMIF_UNICODE or CMIF_ROOTHANDLE;

     ico:=IcoBtnOn;

   end;

-  mi.hIcon     :=CallService(MS_SKIN2_GETICON,0,tlparam(ico));

+  mi.hIcon     :=IcoLib_GetIcon(ico,0);

   mi.szName.w  :='Mute';

   mi.pszService:=MS_RADIO_MUTE;

   mi.position  :=1;

@@ -197,7 +197,6 @@ begin
   begin

     playstr:='Pause';

   end;

-//  mi.hIcon:=CallService(MS_SKIN2_GETICON,0,tlparam(ico));

   mi.szName.w  :=playstr;

   mi.position  :=2;

   srvtrayplaypause:=CreateServiceFunction('mRadio/TrayPlayPause',@TrayPlayPause);

@@ -219,7 +218,7 @@ begin
   mi.szName.w  :='Quick Open';

   mi.position  :=4;

   mi.pszService:=MS_RADIO_QUICKOPEN;

-  mi.hIcon     :=CallService(MS_SKIN2_GETICON,0,tlparam(IcoBtnOpen));

+  mi.hIcon     :=IcoLib_GetIcon(IcoBtnOpen,0);

   if doTray then

     Menu_AddTrayMenuItem(@mi)

   else

@@ -265,7 +264,7 @@ begin
     ico:=IcoBtnOn;

   end;

   mi.flags:=CMIM_FLAGS or CMIM_ICON;

-  mi.hIcon:=CallService(MS_SKIN2_GETICON,0,tlparam(ico));

+  mi.hIcon:=IcoLib_GetIcon(ico,0);

   CallService(MS_CLIST_MODIFYMENUITEM,traymute,tlparam(@mi));

   mi.hIcon:=0;

 

diff --git a/plugins/mRadio/i_visual.inc b/plugins/mRadio/i_visual.inc
index a2b6574df3..5f56bcd4c7 100644
--- a/plugins/mRadio/i_visual.inc
+++ b/plugins/mRadio/i_visual.inc
@@ -22,12 +22,12 @@ begin
     if THANDLE(hContact)<>ActiveContact then

     begin

       mi.szName.a:='Start broadcasting';

-      mi.hIcon:=CallService(MS_SKIN2_GETICON,0,tlparam(IcoBtnOn));

+      mi.hIcon:=IcoLib_GetIcon(IcoBtnOn,0);

     end

     else

     begin

       mi.szName.a:='Stop broadcasting';

-      mi.hIcon:=CallService(MS_SKIN2_GETICON,0,tlparam(IcoBtnOff));

+      mi.hIcon:=IcoLib_GetIcon(IcoBtnOff,0);

     end;

     CallService(MS_CLIST_MODIFYMENUITEM,hCMenuItemPlay,tlparam(@mi));

 

@@ -36,12 +36,12 @@ begin
     if Service_RadioRecord(0,1)<>0 then

     begin

       mi.szName.a:='Stop record';

-      mi.hIcon:=CallService(MS_SKIN2_GETICON,0,tlparam(IcoBtnRecDn));

+      mi.hIcon:=IcoLib_GetIcon(IcoBtnRecDn,0);

     end

     else

     begin

       mi.szName.a:='Start record';

-      mi.hIcon:=CallService(MS_SKIN2_GETICON,0,tlparam(IcoBtnRecUp));

+      mi.hIcon:=IcoLib_GetIcon(IcoBtnRecUp,0);

     end;

   end;

   CallService(MS_CLIST_MODIFYMENUITEM,hCMenuItemRec,tlparam(@mi));

@@ -60,7 +60,7 @@ begin
   hCMenuItemRec:=Menu_AddContactMenuItem(@mi);

 

 //!!  mi.flags        :=CMIF_NOTOFFLINE or CMIF_NOTOFFLIST;

-  mi.hIcon      :=CallService(MS_SKIN2_GETICON,0,lparam(IcoBtnOn));

+  mi.hIcon      :=IcoLib_GetIcon(IcoBtnOn,0);

   mi.pszService :=MS_RADIO_PLAYSTOP;

   mi.szName.a   :='Start/Stop broadcasting';

   hCMenuItemPlay:=Menu_AddContactMenuItem(@mi);

diff --git a/plugins/mRadio/rframeapi.pas b/plugins/mRadio/rframeapi.pas
index b00cab0e52..b875ab7ca9 100644
--- a/plugins/mRadio/rframeapi.pas
+++ b/plugins/mRadio/rframeapi.pas
@@ -124,7 +124,7 @@ begin
         IDC_RADIO_OPEN: begin

           result:=1;

           DrawIconEx(PDRAWITEMSTRUCT(lParam)^.hDC,0,0,

-              CallService(MS_SKIN2_GETICON,0,TLPARAM(IcoBtnOpen)),

+              IcoLib_GetIcon(IcoBtnOpen,0),

               16,16,0,hbr,DI_NORMAL);

         end;

 

@@ -135,7 +135,7 @@ begin
           else

             tmp:=IcoBtnOn;

           DrawIconEx(PDRAWITEMSTRUCT(lParam)^.hDC,0,0,

-              CallService(MS_SKIN2_GETICON,0,TLPARAM(tmp)),

+              IcoLib_GetIcon(tmp,0),

               16,16,0,hbr,DI_NORMAL);

         end;

       end;

@@ -232,7 +232,7 @@ begin
     begin

       cbSize  :=SizeOf(Frame);

       hWnd    :=FrameWnd;

-      hIcon   :=CallService(MS_SKIN2_GETICON,0,lparam(IcoBtnSettings));

+      hIcon   :=IcoLib_GetIcon(IcoBtnSettings,0);

       align   :=alTop;

       height  :=tr.bottom-tr.top+2;

       Flags   :=F_VISIBLE or F_NOBORDER or F_UNICODE;