diff options
| author | George Hazan <george.hazan@gmail.com> | 2012-11-02 14:11:01 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2012-11-02 14:11:01 +0000 |
| commit | 75b1ff75c42644eb36552762652e4b0c9ff071bc (patch) | |
| tree | 238f026ef373d30a395846f38c302a81961b14ac /plugins/FileAsMessage/src | |
| parent | 2caba72d51b09368801f23dd8951d589ab4dc809 (diff) | |
final switch to the typed icolib api
git-svn-id: http://svn.miranda-ng.org/main/trunk@2152 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/FileAsMessage/src')
| -rw-r--r-- | plugins/FileAsMessage/src/dialog.cpp | 4 | ||||
| -rw-r--r-- | plugins/FileAsMessage/src/main.cpp | 21 |
2 files changed, 6 insertions, 19 deletions
diff --git a/plugins/FileAsMessage/src/dialog.cpp b/plugins/FileAsMessage/src/dialog.cpp index f038b87a33..125952db8b 100644 --- a/plugins/FileAsMessage/src/dialog.cpp +++ b/plugins/FileAsMessage/src/dialog.cpp @@ -193,7 +193,7 @@ static int CALLBACK PopupDlgProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM case WM_COMMAND:
{
PUDeletePopUp(hWnd);
- CallService(MS_CLIST_REMOVEEVENT, (WPARAM)hContact, (LPARAM)0);
+ CallService(MS_CLIST_REMOVEEVENT, (WPARAM)hContact, 0);
if(IsWindow(hDlg))
{
@@ -665,7 +665,7 @@ void FILEECHO::onRecvTimer() if(DBGetContactSettingByte(NULL,"SRFile","AutoClose",0))
{
PostMessage(hDlg, WM_CLOSE, 0,0);
- CallService(MS_CLIST_REMOVEEVENT, (WPARAM)hContact, (LPARAM)0);
+ CallService(MS_CLIST_REMOVEEVENT, (WPARAM)hContact, 0);
}
SkinPlaySound("FileDone");
destroyTransfer();
diff --git a/plugins/FileAsMessage/src/main.cpp b/plugins/FileAsMessage/src/main.cpp index 681cd4f02a..41505dabf8 100644 --- a/plugins/FileAsMessage/src/main.cpp +++ b/plugins/FileAsMessage/src/main.cpp @@ -62,21 +62,8 @@ int iIconId[5] = {3,2,4,1,0}; //
int OnSkinIconsChanged(WPARAM wParam,LPARAM lParam)
{
- int indx;
-/*
- if(lParam == NULL)
- return 0;
- for(indx = 0; indx < ARRAY_SIZE(hIcons); indx++)
- {
- if(strcmp((char*)lParam, szIconId[indx]) == 0)
- {
- hIcons[indx] = (HICON)CallService(MS_SKIN2_GETICON, 0, (LPARAM)szIconId[indx]);
- break;
- }
- }
-*/
- for(indx = 0; indx < SIZEOF(hIcons); indx++)
- hIcons[indx] = (HICON)CallService(MS_SKIN2_GETICON, 0, (LPARAM)szIconId[indx]);
+ for(int indx = 0; indx < SIZEOF(hIcons); indx++)
+ hIcons[indx] = Skin_GetIcon(szIconId[indx]);
WindowList_Broadcast(hFileList, WM_FE_SKINCHANGE, 0,0);
@@ -234,7 +221,7 @@ int OnModulesLoaded(WPARAM wparam,LPARAM lparam) Skin_AddIcon(&sid);
}
for(indx = 0; indx < SIZEOF(hIcons); indx++)
- hIcons[indx] = (HICON)CallService(MS_SKIN2_GETICON, 0, (LPARAM)szIconId[indx]);
+ hIcons[indx] = Skin_GetIcon(szIconId[indx]);
hHookSkinIconsChanged = HookEvent(ME_SKIN2_ICONSCHANGED, OnSkinIconsChanged);
@@ -261,7 +248,7 @@ extern "C" __declspec(dllexport) int Load(void) // for(int indx = 0; indx < ARRAY_SIZE(hIcons); indx++)
// hIcons[indx] = (HICON)LoadImage(hInst,MAKEINTRESOURCE(idIcons[indx]),IMAGE_ICON,GetSystemMetrics(SM_CXSMICON),GetSystemMetrics(SM_CYSMICON),0);
-
+
hFileList = (HANDLE)CallService(MS_UTILS_ALLOCWINDOWLIST, 0, 0);
//CreateServiceFunction( SERVICE_NAME PS_GETCAPS, FEGetCaps );
|