diff options
author | George Hazan <george.hazan@gmail.com> | 2012-12-01 20:32:13 +0000 |
---|---|---|
committer | George Hazan <george.hazan@gmail.com> | 2012-12-01 20:32:13 +0000 |
commit | 1860018b201d995ed051c0affb72d5a1d09fa02e (patch) | |
tree | 1ee096c43578fdf5694e5487d672830f810f186c /plugins/Quotes | |
parent | 7300094417302d82aa4f3f6e469f91d8facf4f26 (diff) |
SKINICONDESC initialization - end of story
git-svn-id: http://svn.miranda-ng.org/main/trunk@2598 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/Quotes')
-rw-r--r-- | plugins/Quotes/src/IconLib.cpp | 35 |
1 files changed, 16 insertions, 19 deletions
diff --git a/plugins/Quotes/src/IconLib.cpp b/plugins/Quotes/src/IconLib.cpp index 9ac96599a5..e7caa1fd36 100644 --- a/plugins/Quotes/src/IconLib.cpp +++ b/plugins/Quotes/src/IconLib.cpp @@ -17,7 +17,7 @@ namespace {
struct CIconList
{
- TCHAR* szDescr;
+ char* szDescr;
char* szName;
int defIconID;
HANDLE hIconLibItem;
@@ -25,38 +25,35 @@ namespace CIconList iconList[] =
{
- { _T("Protocol icon"), ICON_STR_MAIN, IDI_ICON_MAIN },
- { _T("Quote/Rate up"), ICON_STR_QUOTE_UP, IDI_ICON_UP },
- { _T("Quote/Rate down"), ICON_STR_QUOTE_DOWN, IDI_ICON_DOWN },
- { _T("Quote/Rate not changed"), ICON_STR_QUOTE_NOT_CHANGED, IDI_ICON_NOTCHANGED },
- { _T("Quote Section"), ICON_STR_SECTION, IDI_ICON_SECTION },
- { _T("Quote"), ICON_STR_QUOTE, IDI_ICON_QUOTE },
- { _T("Currency Converter"), ICON_STR_CURRENCY_CONVERTER, IDI_ICON_CURRENCY_CONVERTER },
- { _T("Refresh"), ICON_STR_REFRESH, IDI_ICON_REFRESH },
- { _T("Export"), ICON_STR_EXPORT, IDI_ICON_EXPORT },
- { _T("Swap button"), ICON_STR_SWAP, IDI_ICON_SWAP },
- { _T("Import"), ICON_STR_IMPORT, IDI_ICON_IMPORT }
+ { LPGEN("Protocol icon"), ICON_STR_MAIN, IDI_ICON_MAIN },
+ { LPGEN("Quote/Rate up"), ICON_STR_QUOTE_UP, IDI_ICON_UP },
+ { LPGEN("Quote/Rate down"), ICON_STR_QUOTE_DOWN, IDI_ICON_DOWN },
+ { LPGEN("Quote/Rate not changed"), ICON_STR_QUOTE_NOT_CHANGED, IDI_ICON_NOTCHANGED },
+ { LPGEN("Quote Section"), ICON_STR_SECTION, IDI_ICON_SECTION },
+ { LPGEN("Quote"), ICON_STR_QUOTE, IDI_ICON_QUOTE },
+ { LPGEN("Currency Converter"), ICON_STR_CURRENCY_CONVERTER, IDI_ICON_CURRENCY_CONVERTER },
+ { LPGEN("Refresh"), ICON_STR_REFRESH, IDI_ICON_REFRESH },
+ { LPGEN("Export"), ICON_STR_EXPORT, IDI_ICON_EXPORT },
+ { LPGEN("Swap button"), ICON_STR_SWAP, IDI_ICON_SWAP },
+ { LPGEN("Import"), ICON_STR_IMPORT, IDI_ICON_IMPORT }
};
}
void Quotes_IconsInit()
{
- USES_CONVERSION;
-
- SKINICONDESC sid = {0};
TCHAR szFile[MAX_PATH];
::GetModuleFileName(g_hInstance, szFile, MAX_PATH);
- sid.cbSize = sizeof(SKINICONDESC);
+ SKINICONDESC sid = { sizeof(sid) };
sid.ptszDefaultFile = szFile;
sid.cx = sid.cy = 16;
- sid.flags = SIDF_ALL_TCHAR;
- sid.ptszSection = A2T(QUOTES_PROTOCOL_NAME);
+ sid.flags = SIDF_PATH_TCHAR;
+ sid.pszSection = QUOTES_PROTOCOL_NAME;
for (int i = 0; i < SIZEOF(iconList); i++) {
std::string sName = Quotes_MakeIconName( iconList[i].szName);
sid.pszName = const_cast<char*>(sName.c_str());
- sid.ptszDescription = iconList[i].szDescr;
+ sid.pszDescription = iconList[i].szDescr;
sid.iDefaultIndex = -iconList[i].defIconID;
iconList[i].hIconLibItem = Skin_AddIcon(&sid);
}
|