From 86eea20c7d00dfc223cf13217cf4dfc57202965e Mon Sep 17 00:00:00 2001 From: George Hazan Date: Thu, 9 Jul 2015 17:56:47 +0000 Subject: - various icon definition quirks; - code cleaning git-svn-id: http://svn.miranda-ng.org/main/trunk@14520 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/HistoryStats/src/mu_common.cpp | 19 +------------------ plugins/HistoryStats/src/mu_common.h | 3 +-- 2 files changed, 2 insertions(+), 20 deletions(-) (limited to 'plugins/HistoryStats/src') diff --git a/plugins/HistoryStats/src/mu_common.cpp b/plugins/HistoryStats/src/mu_common.cpp index f380b2a35e..812e0644e7 100644 --- a/plugins/HistoryStats/src/mu_common.cpp +++ b/plugins/HistoryStats/src/mu_common.cpp @@ -90,7 +90,7 @@ namespace mu return true; } - void addIcon(const TCHAR* szSection, const TCHAR* szDescription, const char* szIconName, const char* szDefaultFile, int iDefaultIndex, int cx /* = 16 */, int cy /* = 16 */) + void addIcon(const TCHAR* szSection, const TCHAR* szDescription, const char* szIconName, const char* szDefaultFile, int iDefaultIndex) { SKINICONDESC sid = { 0 }; sid.section.t = const_cast(szSection); @@ -98,23 +98,6 @@ namespace mu sid.pszName = const_cast(szIconName); sid.defaultFile.a = const_cast(szDefaultFile); sid.iDefaultIndex = iDefaultIndex; - sid.cx = cx; - sid.cy = cy; - sid.flags = SIDF_TCHAR; - IcoLib_AddIcon(&sid); - } - - void addIcon(const TCHAR* szSection, const TCHAR* szDescription, const char* szIconName, HICON hDefaultIcon, int cx /* = 16 */, int cy /* = 16 */) - { - SKINICONDESC sid = { 0 }; - sid.section.t = const_cast(szSection); - sid.description.t = const_cast(szDescription); - sid.pszName = const_cast(szIconName); - sid.defaultFile.a = NULL; - sid.iDefaultIndex = 0; - sid.hDefaultIcon = hDefaultIcon; - sid.cx = cx; - sid.cy = cy; sid.flags = SIDF_TCHAR; IcoLib_AddIcon(&sid); } diff --git a/plugins/HistoryStats/src/mu_common.h b/plugins/HistoryStats/src/mu_common.h index 6769414b0b..98bab3800e 100644 --- a/plugins/HistoryStats/src/mu_common.h +++ b/plugins/HistoryStats/src/mu_common.h @@ -45,8 +45,7 @@ namespace mu namespace icolib { bool _available(); - void addIcon(const TCHAR* szSection, const TCHAR* szDescription, const char* szIconName, const char* szDefaultFile, int iDefaultIndex, int cx = 16, int cy = 16); - void addIcon(const TCHAR* szSection, const TCHAR* szDescription, const char* szIconName, HICON hDefaultIcon, int cx = 16, int cy = 16); + void addIcon(const TCHAR* szSection, const TCHAR* szDescription, const char* szIconName, const char* szDefaultFile, int iDefaultIndex); HICON getIcon(const char* szIconName); } -- cgit v1.2.3