From 57abc51aad272a656282a52a460a47abe24e07d6 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 20 Jun 2012 23:51:53 +0000 Subject: - MS_SKIN2_ADDICON replaced with Skin_AddIcon; - SKINICONDESC_SIZE* constants removed and replaced with sizeof(sid); - added SIDF_PATH_UNICODE for all plugins; - dynamic translation fixed in the icolib options dialog git-svn-id: http://svn.miranda-ng.org/main/trunk@507 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Variables/variables.cpp | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) (limited to 'plugins/Variables') diff --git a/plugins/Variables/variables.cpp b/plugins/Variables/variables.cpp index 5f81c35eb3..26190fb779 100644 --- a/plugins/Variables/variables.cpp +++ b/plugins/Variables/variables.cpp @@ -592,23 +592,23 @@ int LoadVarModule() { } hShowHelpService = CreateServiceFunction(MS_VARS_SHOWHELP, showHelpService); hShowHelpExService = CreateServiceFunction(MS_VARS_SHOWHELPEX, showHelpExService); - if (ServiceExists(MS_SKIN2_ADDICON)) { - SKINICONDESC sid; - char szFile[MAX_PATH]; - - ZeroMemory(&sid, sizeof(SKINICONDESC)); - sid.cbSize = sizeof(SKINICONDESC); - sid.ptszSection = TranslateT("Variables"); - sid.ptszDescription = TranslateT("Help"); - sid.pszName = "vars_help"; - GetModuleFileNameA(hInst, szFile, MAX_PATH); - sid.pszDefaultFile = szFile; - sid.iDefaultIndex = -IDI_V; - sid.cx = sid.cy = 16; - sid.flags = SIDF_TCHAR; - CallService(MS_SKIN2_ADDICON, (WPARAM)0, (LPARAM)&sid); - hIconsChangedHook = HookEvent(ME_SKIN2_ICONSCHANGED, iconsChanged); - } + + TCHAR szFile[MAX_PATH]; + GetModuleFileName(hInst, szFile, MAX_PATH); + + SKINICONDESC sid = { 0 }; + sid.cbSize = sizeof(SKINICONDESC); + sid.ptszSection = TranslateT("Variables"); + sid.ptszDescription = TranslateT("Help"); + sid.pszName = "vars_help"; + sid.ptszDefaultFile = szFile; + sid.iDefaultIndex = -IDI_V; + sid.cx = sid.cy = 16; + sid.flags = SIDF_ALL_TCHAR; + Skin_AddIcon(&sid); + + hIconsChangedHook = HookEvent(ME_SKIN2_ICONSCHANGED, iconsChanged); + hGetIconService = CreateServiceFunction(MS_VARS_GETSKINITEM, getSkinItemService); hOptionsHook = HookEvent(ME_OPT_INITIALISE, OptionsInit); -- cgit v1.2.3