- 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

4 files changed, 8 insertions, 10 deletions

diff --git a/plugins/QuickSearch/quicksearch.dpr b/plugins/QuickSearch/quicksearch.dpr
index b0041c2d66..764200acdc 100644
--- a/plugins/QuickSearch/quicksearch.dpr
+++ b/plugins/QuickSearch/quicksearch.dpr
@@ -54,15 +54,14 @@ begin
   FillChar(mi,SizeOf(mi),0);

   mi.cbSize:=sizeof(mi);

   mi.flags :=CMIM_ICON;

-

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

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

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

 

 // toptoolbar

   if ServiceExists(MS_TTB_GETBUTTONOPTIONS)<>0 then

   begin

     CallService(MS_TTB_GETBUTTONOPTIONS,(hTTBButton shl 16)+TTBO_ALLDATA,TLPARAM(@ttb));

-    ttb.hIconUp:=CallService(MS_SKIN2_GETICON,0,TLPARAM(QS_QS));

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

     ttb.hIconDn:=ttb.hIconUp;

     CallService(MS_TTB_SETBUTTONOPTIONS,(hTTBButton shl 16)+TTBO_ALLDATA,TLPARAM(@ttb));

   end;

diff --git a/plugins/QuickSearch/sr_frame.pas b/plugins/QuickSearch/sr_frame.pas
index 692692a5ad..63def5d015 100644
--- a/plugins/QuickSearch/sr_frame.pas
+++ b/plugins/QuickSearch/sr_frame.pas
@@ -176,7 +176,7 @@ begin
     begin

       cbSize  :=SizeOf(Frame);

       hWnd    :=FrameWnd;

-      hIcon   :=CallService(MS_SKIN2_GETICON,0,tlparam(QS_QS));

+      hIcon   :=IcoLib_GetIcon(QS_QS,0);

       align   :=alTop;

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

       Flags   :=F_NOBORDER or F_UNICODE;

diff --git a/plugins/QuickSearch/sr_global.pas b/plugins/QuickSearch/sr_global.pas
index c7cb5af022..b7431f54ca 100644
--- a/plugins/QuickSearch/sr_global.pas
+++ b/plugins/QuickSearch/sr_global.pas
@@ -225,7 +225,7 @@ begin
     ZeroMemory(@ttbopt,sizeof(ttbopt));

     ttbopt.cbSize    :=sizeof(ttbopt);

     ttbopt.pszService:=QS_SHOWSERVICE;

-    ttbopt.hIconUp   :=CallService(MS_SKIN2_GETICON,0,lparam(QS_QS));

+    ttbopt.hIconUp   :=IcoLib_GetIcon(QS_QS,0);

     ttbopt.hIconDn   :=ttbopt.hIconUp;

     ttbopt.dwFlags   :=TTBBF_VISIBLE;

     ttbopt.name      :=qs_module;

@@ -248,7 +248,7 @@ begin
 //    cmi.pszPopupName:=nil;

 //    cmi.flags       :=0;

   cmi.pszService  :=QS_SHOWSERVICE;

-  cmi.hIcon       :=CallService(MS_SKIN2_GETICON,0,lparam(QS_QS));

+  cmi.hIcon       :=IcoLib_GetIcon(QS_QS,0);

   MainMenuItem    :=Menu_AddMainMenuItem(@cmi);

 

   begin

diff --git a/plugins/QuickSearch/sr_window.pas b/plugins/QuickSearch/sr_window.pas
index 7fdfcbe373..17fbc25e57 100644
--- a/plugins/QuickSearch/sr_window.pas
+++ b/plugins/QuickSearch/sr_window.pas
@@ -1636,8 +1636,8 @@ begin
     end

     else if (setting_type=QST_CONTACTINFO) and (cnftype=CNF_GENDER) then

     begin

-      if hIconF=0 then hIconF:=CallService(MS_SKIN2_GETICON,0,tlparam(QS_FEMALE));

-      if hIconM=0 then hIconM:=CallService(MS_SKIN2_GETICON,0,tlparam(QS_MALE));

+      if hIconF=0 then hIconF:=IcoLib_GetIcon(QS_FEMALE,0);

+      if hIconM=0 then hIconM:=IcoLib_GetIcon(QS_MALE,0);

       flags:=flags or COL_GENDER;

       tstrMale   :=TranslateW('Male');

       tstrFemale :=TranslateW('Female');

@@ -1977,8 +1977,7 @@ begin
         tmp:=tmp and not WS_EX_TOOLWINDOW;

       SetWindowLongPtrW(Dialog,GWL_EXSTYLE,tmp);

 

-      SendMessage(Dialog,WM_SETICON,ICON_SMALL,//LoadIcon(hInstance,PAnsiChar(IDI_QS))

-        CallService(MS_SKIN2_GETICON,0,tlparam(QS_QS)));

+      SendMessage(Dialog,WM_SETICON,ICON_SMALL,IcoLib_GetIcon(QS_QS,0));

       grid:=GetDlgItem(Dialog,IDC_LIST);

 

       // ListView