diff options
| author | George Hazan <george.hazan@gmail.com> | 2016-06-05 16:11:08 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2016-06-05 16:11:08 +0000 |
| commit | eec361608fde60d63fe4511e26e3b95c7f72be13 (patch) | |
| tree | 0263d1829438c7778a713ee2ae6bbda27c0d260a /plugins/NotesAndReminders | |
| parent | 7e822f45eccd034e7acd8d868ce5dc8c55458ff0 (diff) | |
- fix for #1059;
- direct unsafe work with icons replaces with Window_SetIcon_IcoLib / Window_SetSkinIcon_IcoLib;
- code cleaning
git-svn-id: http://svn.miranda-ng.org/main/trunk@16917 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/NotesAndReminders')
| -rw-r--r-- | plugins/NotesAndReminders/src/notes.cpp | 12 | ||||
| -rw-r--r-- | plugins/NotesAndReminders/src/reminders.cpp | 8 |
2 files changed, 5 insertions, 15 deletions
diff --git a/plugins/NotesAndReminders/src/notes.cpp b/plugins/NotesAndReminders/src/notes.cpp index b017f04e94..06e3c87cc0 100644 --- a/plugins/NotesAndReminders/src/notes.cpp +++ b/plugins/NotesAndReminders/src/notes.cpp @@ -1921,12 +1921,7 @@ INT_PTR CALLBACK DlgProcViewNotes(HWND Dialog,UINT Message,WPARAM wParam,LPARAM break; case WM_INITDIALOG: { - HWND H; - - HICON hIcon = IcoLib_GetIconByHandle(iconList[13].hIcolib, ICON_SMALL); - SendMessage(Dialog, WM_SETICON, (WPARAM)ICON_SMALL, (LPARAM)hIcon); - hIcon = IcoLib_GetIconByHandle(iconList[13].hIcolib, ICON_BIG); - SendMessage(Dialog, WM_SETICON, (WPARAM)ICON_BIG, (LPARAM)hIcon); + Window_SetIcon_IcoLib(Dialog, iconList[13].hIcolib); SetWindowText(Dialog, LPGENT("Notes")); @@ -1934,7 +1929,7 @@ INT_PTR CALLBACK DlgProcViewNotes(HWND Dialog,UINT Message,WPARAM wParam,LPARAM SetDlgItemText(Dialog,IDC_REMINDERDATA, _T("")); - H = GetDlgItem(Dialog,IDC_LISTREMINDERS); + HWND H = GetDlgItem(Dialog,IDC_LISTREMINDERS); lvCol.mask = LVCF_TEXT | LVCF_WIDTH; S = TranslateT("Note text"); @@ -1984,8 +1979,7 @@ INT_PTR CALLBACK DlgProcViewNotes(HWND Dialog,UINT Message,WPARAM wParam,LPARAM case WM_DESTROY: ListNotesVisible = FALSE; - IcoLib_ReleaseIcon((HICON)SendMessage(Dialog, WM_SETICON, ICON_BIG, 0)); - IcoLib_ReleaseIcon((HICON)SendMessage(Dialog, WM_SETICON, ICON_SMALL, 0)); + Window_FreeIcon_IcoLib(Dialog); return TRUE; case WM_NOTIFY: diff --git a/plugins/NotesAndReminders/src/reminders.cpp b/plugins/NotesAndReminders/src/reminders.cpp index 42f011736e..ffea8e7052 100644 --- a/plugins/NotesAndReminders/src/reminders.cpp +++ b/plugins/NotesAndReminders/src/reminders.cpp @@ -2398,10 +2398,7 @@ INT_PTR CALLBACK DlgProcViewReminders(HWND Dialog,UINT Message,WPARAM wParam,LPA break;
case WM_INITDIALOG:
{
- HICON hIcon = IcoLib_GetIconByHandle(iconList[6].hIcolib, ICON_SMALL);
- SendMessage(Dialog, WM_SETICON, (WPARAM)ICON_SMALL, (LPARAM)hIcon);
- hIcon = IcoLib_GetIconByHandle(iconList[6].hIcolib, ICON_BIG);
- SendMessage(Dialog, WM_SETICON, (WPARAM)ICON_BIG, (LPARAM)hIcon);
+ Window_SetIcon_IcoLib(Dialog, iconList[6].hIcolib);
TranslateDialogDefault(Dialog);
SetDlgItemText(Dialog,IDC_REMINDERDATA, _T(""));
@@ -2542,8 +2539,7 @@ INT_PTR CALLBACK DlgProcViewReminders(HWND Dialog,UINT Message,WPARAM wParam,LPA }
}
case WM_DESTROY:
- IcoLib_ReleaseIcon((HICON)SendMessage(Dialog, WM_SETICON, ICON_BIG, 0));
- IcoLib_ReleaseIcon((HICON)SendMessage(Dialog, WM_SETICON, ICON_SMALL, 0));
+ Window_FreeIcon_IcoLib(Dialog);
break;
}
return FALSE;
|