- 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

1 files changed, 9 insertions, 15 deletions

diff --git a/plugins/Watrack/i_gui.inc b/plugins/Watrack/i_gui.inc
index 2a219c8140..709584b066 100644
--- a/plugins/Watrack/i_gui.inc
+++ b/plugins/Watrack/i_gui.inc
@@ -12,8 +12,8 @@ begin
   if DisablePlugin<>dsPermanent then

     ttb.dwFlags:=ttb.dwFlags or TTBBF_PUSHED;

 

-  ttb.hIconDn   :=CallService(MS_SKIN2_GETICON,0,tlparam(IcoBtnEnable));

-  ttb.hIconUp   :=CallService(MS_SKIN2_GETICON,0,tlparam(IcoBtnDisable));

+  ttb.hIconDn   :=IcoLib_GetIcon(IcoBtnEnable,0);

+  ttb.hIconUp   :=IcoLib_GetIcon(IcoBtnDisable,0);

   ttb.wParamUp  :=1;

 //  ttb.wParamDown    :=0;

   ttb.pszService:=MS_WAT_PLUGINSTATUS;

@@ -37,7 +37,7 @@ begin
   mi.cbSize       :=sizeof(mi);

   mi.szPopupName.a:=PluginShort;

 

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

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

   mi.szName.a     :='Disable WATrack';

   mi.pszService   :=MS_WAT_PLUGINSTATUS;

   mi.popupPosition:=MenuDisablePos;

@@ -54,12 +54,12 @@ begin
   mi.flags :=CMIM_NAME+CMIM_FLAGS+CMIM_ICON+f1;

   if f1<>0 then

   begin

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

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

     mi.szName.a:='Enable WATrack';

   end

   else

   begin

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

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

     mi.szName.a:='Disable WATrack';

   end;

   CallService(MS_CLIST_MODIFYMENUITEM,hMenuDisable,lparam(@mi));

@@ -91,21 +91,15 @@ begin
   mi.cbSize:=sizeof(mi);

   mi.flags :=CMIM_ICON;

 

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

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

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

 

-// toptoolbar

+  // toptoolbar

   if ServiceExists(MS_TTB_GETBUTTONOPTIONS)<>0 then

   begin

-{

-    CallService(MS_TTB_GETBUTTONOPTIONS,(ttbInfo shl 16)+TTBO_ALLDATA,tlparam(@ttb));

-    ttb.hIconUp:=CallService(MS_SKIN2_GETICON,0,tlparam(IcoBtnInfo));

-    ttb.hIconDn:=ttb.hIconUp;

-    CallService(MS_TTB_SETBUTTONOPTIONS,(ttbInfo shl 16)+TTBO_ALLDATA,tlparam(@ttb));

-}

     CallService(MS_TTB_GETBUTTONOPTIONS,(ttbState shl 16)+TTBO_ALLDATA,tlparam(@ttb));

-    ttb.hIconDn:=CallService(MS_SKIN2_GETICON,0,tlparam(IcoBtnEnable));

-    ttb.hIconUp:=CallService(MS_SKIN2_GETICON,0,tlparam(IcoBtnDisable));

+    ttb.hIconDn:=IcoLib_GetIcon(IcoBtnEnable,0);

+    ttb.hIconUp:=IcoLib_GetIcon(IcoBtnDisable,0);

     CallService(MS_TTB_SETBUTTONOPTIONS,(ttbState shl 16)+TTBO_ALLDATA,tlparam(@ttb));

   end;