diff options
| author | George Hazan <george.hazan@gmail.com> | 2015-06-14 13:17:26 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2015-06-14 13:17:26 +0000 |
| commit | 02ed4455c23e3562d71bfc80a0e2c4fede8708f1 (patch) | |
| tree | 115a3d24e4a3877cd28bd4ff2d9d4011b790cc5f /plugins/Actman | |
| parent | c72584d6b934b37dbd18d5f15ffb24a140e1e3f2 (diff) | |
- 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
Diffstat (limited to 'plugins/Actman')
| -rw-r--r-- | plugins/Actman/dlgshare.pas | 2 | ||||
| -rw-r--r-- | plugins/Actman/i_opt_dlg2.inc | 2 | ||||
| -rw-r--r-- | plugins/Actman/ua/i_opt_dlg.inc | 6 | ||||
| -rw-r--r-- | plugins/Actman/ua/i_uaplaces.inc | 4 |
4 files changed, 6 insertions, 8 deletions
diff --git a/plugins/Actman/dlgshare.pas b/plugins/Actman/dlgshare.pas index 0fc89a975b..d66d059ae5 100644 --- a/plugins/Actman/dlgshare.pas +++ b/plugins/Actman/dlgshare.pas @@ -55,7 +55,7 @@ end; function OptSetButtonIcon(btn:HWND;num:integer):HICON;
begin
- result:=CallService(MS_SKIN2_GETICONBYHANDLE,0,LPARAM(Icons[num].hIcolib));
+ result:=IcoLib_GetIconByHandle(Icons[num].hIcolib,0);
SendMessage(btn,BM_SETIMAGE,IMAGE_ICON,result);
end;
diff --git a/plugins/Actman/i_opt_dlg2.inc b/plugins/Actman/i_opt_dlg2.inc index c9571f2ea8..fc76ba6fb0 100644 --- a/plugins/Actman/i_opt_dlg2.inc +++ b/plugins/Actman/i_opt_dlg2.inc @@ -239,7 +239,7 @@ begin while p<>nil do
begin
StrCopy(StrCopyE(@buf,IcoLibPrefix),p^.Name);
- ImageList_ReplaceIcon(il,-1,CallService(MS_SKIN2_GETICON,0,lparam(@buf)));
+ ImageList_ReplaceIcon(il,-1,IcoLib_GetIcon(@buf,0));
cbei.pszText :=TranslateW(FastAnsiToWideBuf(p^.Name,buf));
cbei.iItem :=i;
diff --git a/plugins/Actman/ua/i_opt_dlg.inc b/plugins/Actman/ua/i_opt_dlg.inc index 6e5cc4d117..99b12d44dc 100644 --- a/plugins/Actman/ua/i_opt_dlg.inc +++ b/plugins/Actman/ua/i_opt_dlg.inc @@ -192,8 +192,7 @@ begin li.iItem :=i;
li.lParam :=i;
li.pszText :=UActionList[i].szActDescr;
- li.iImage:=ImageList_ReplaceIcon(il, -1,
- HICON(CallService(MS_SKIN2_GETICONBYHANDLE,0,LPARAM(UActionList[i].hIcolibIcon))));
+ li.iImage :=ImageList_ReplaceIcon(il, -1, IcoLib_GetIconByHandle(UActionList[i].hIcolibIcon,0));
li.iItem :=SendMessageW(wnd,LVM_INSERTITEMW,0,LPARAM(@li));
for lmenu:=main_menu to HIGH(tMenuType) do
@@ -225,8 +224,7 @@ begin li.mask :=LVIF_IMAGE;
li.iSubItem:=0;
li.iItem :=i;
- li.iImage:=ImageList_ReplaceIcon(il, -1,
- HICON(CallService(MS_SKIN2_GETICONBYHANDLE,0,TLPARAM(UActionList[i].hIcolibIcon))));
+ li.iImage:=ImageList_ReplaceIcon(il, -1, IcoLib_GetIconByHandle(UActionList[i].hIcolibIcon,0));
SendMessageW(wnd,LVM_SETITEM,0,TLPARAM(@li));
end;
ImageList_Destroy(SendMessage(wnd,LVM_SETIMAGELIST,LVSIL_SMALL,il));
diff --git a/plugins/Actman/ua/i_uaplaces.inc b/plugins/Actman/ua/i_uaplaces.inc index 680566e2fc..9c508a167f 100644 --- a/plugins/Actman/ua/i_uaplaces.inc +++ b/plugins/Actman/ua/i_uaplaces.inc @@ -199,7 +199,7 @@ begin (ActionItem.hIcolibIconPressed<>ActionItem.hIcolibIcon) then
begin
StrCopy(StrCopyE(@buf1,ActionItem.szNameID),'_pressed');
- CallService(MS_SKIN2_REMOVEICON,0,LPARAM(@buf1));
+ IcoLib_RemoveIcon(@buf1);
ActionItem.hIcolibIconPressed:=ActionItem.hIcolibIcon;
end;
end;
@@ -207,7 +207,7 @@ end; procedure DeleteIcolibIcon(var ActionItem:tMyActionItem);
begin
DeleteIcolibIconP(ActionItem);
- CallService(MS_SKIN2_REMOVEICON,0,LPARAM(ActionItem.szNameID));
+ IcoLib_RemoveIcon(ActionItem.szNameID);
ActionItem.hIcolibIcon :=0;
ActionItem.hIcolibIconPressed:=0;
end;
|