From ef0abe4f9f67eeff4007f4839ba08a503472c74c Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Tue, 21 Jan 2014 23:24:02 +0000
Subject: - new typed helper, WindowList_Create, to create a window list - new
 service, WindowList_Destroy, to destroy a window list - internal
 windowlist.cpp implementation rewritten to LIST<>

git-svn-id: http://svn.miranda-ng.org/main/trunk@7823 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/Clist_modern/src/hdr/modern_commonprototypes.h | 1 +
 plugins/Clist_modern/src/init.cpp                      | 1 +
 plugins/Clist_modern/src/modern_tbbutton.cpp           | 7 ++++++-
 3 files changed, 8 insertions(+), 1 deletion(-)

(limited to 'plugins/Clist_modern')

diff --git a/plugins/Clist_modern/src/hdr/modern_commonprototypes.h b/plugins/Clist_modern/src/hdr/modern_commonprototypes.h
index 5f7b6cbf0e..7d8eb47536 100644
--- a/plugins/Clist_modern/src/hdr/modern_commonprototypes.h
+++ b/plugins/Clist_modern/src/hdr/modern_commonprototypes.h
@@ -267,6 +267,7 @@ HRESULT PreLoadContactListModule();
 HRESULT ClcLoadModule();
 HRESULT ToolbarLoadModule();
 HRESULT ToolbarButtonLoadModule();
+void    ToolbarButtonUnloadModule();
 
 // INTERFACES
 
diff --git a/plugins/Clist_modern/src/init.cpp b/plugins/Clist_modern/src/init.cpp
index bf39b955a6..7736c45cf6 100644
--- a/plugins/Clist_modern/src/init.cpp
+++ b/plugins/Clist_modern/src/init.cpp
@@ -110,6 +110,7 @@ extern "C" __declspec(dllexport) int Unload(void)
 	if (IsWindow(pcli->hwndContactList)) DestroyWindow(pcli->hwndContactList);
 	pcli->hwndContactList = NULL;
 
+	ToolbarButtonUnloadModule();
 	BackgroundsUnloadModule();
 	SkinEngineUnloadModule();
 	XPThemesUnloadModule();
diff --git a/plugins/Clist_modern/src/modern_tbbutton.cpp b/plugins/Clist_modern/src/modern_tbbutton.cpp
index 9d55684139..d9f4fd9e47 100644
--- a/plugins/Clist_modern/src/modern_tbbutton.cpp
+++ b/plugins/Clist_modern/src/modern_tbbutton.cpp
@@ -478,8 +478,13 @@ int Buttons_OnSkinModeSettingsChanged(WPARAM wParam, LPARAM lParam)
 
 HRESULT ToolbarButtonLoadModule()
 {
-	hButtonWindowList = (HANDLE) CallService(MS_UTILS_ALLOCWINDOWLIST, 0, 0);
+	hButtonWindowList = WindowList_Create();
 	hIconChangedHook = HookEvent(ME_SKIN2_ICONSCHANGED,OnIconLibIconChanged);
 	hBkgChangedHook = HookEvent(ME_BACKGROUNDCONFIG_CHANGED,Buttons_OnSkinModeSettingsChanged);
 	return S_OK;
 }
+
+void ToolbarButtonUnloadModule()
+{
+	WindowList_Destroy(hButtonWindowList);
+}
\ No newline at end of file
-- 
cgit v1.2.3