- 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

1 files changed, 4 insertions, 8 deletions

diff --git a/plugins/BasicHistory/src/HistoryWindow.cpp b/plugins/BasicHistory/src/HistoryWindow.cpp
index a1ad2df7d8..8cc82337da 100644
--- a/plugins/BasicHistory/src/HistoryWindow.cpp
+++ b/plugins/BasicHistory/src/HistoryWindow.cpp
@@ -1006,8 +1006,8 @@ void HistoryWindow::Initialise()
 	ResetCList(m_hWnd);

 

 	RestorePos();

-	SendMessage(m_hWnd, WM_SETICON, ICON_BIG, (LPARAM)Skin_LoadIcon(SKINICON_OTHER_HISTORY, true));

-	SendMessage(m_hWnd, WM_SETICON, ICON_SMALL, (LPARAM)Skin_LoadIcon(SKINICON_OTHER_HISTORY));

+	Window_SetSkinIcon_IcoLib(m_hWnd, SKINICON_OTHER_HISTORY);

+

 	SendMessage(editWindow, EM_AUTOURLDETECT, TRUE, 0);

 	SendMessage(editWindow, EM_SETEVENTMASK, 0, ENM_LINK | ENM_SELCHANGE | ENM_KEYEVENTS | ENM_MOUSEEVENTS);

 	SendMessage(editWindow, EM_SETEDITSTYLE, SES_EXTENDBACKCOLOR, SES_EXTENDBACKCOLOR);

@@ -1098,13 +1098,9 @@ void HistoryWindow::Initialise()
 

 void HistoryWindow::Destroy()

 {

-	HICON hIcon = (HICON)SendMessage(m_hWnd, WM_SETICON, ICON_BIG, 0);

-	IcoLib_ReleaseIcon(hIcon);

-

-	hIcon = (HICON)SendMessage(m_hWnd, WM_SETICON, ICON_SMALL, 0);

-	IcoLib_ReleaseIcon(hIcon);

-

+	Window_FreeIcon_IcoLib(m_hWnd);

 	isDestroyed = true;

+

 	HistoryWindow::Close(this);

 }