From 9b7ffb84428971f27a6b6e71ff927b2bf240fca3 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sat, 20 Oct 2012 21:47:46 +0000 Subject: fix for ODPF_DONTTRANSLATE flag in options git-svn-id: http://svn.miranda-ng.org/main/trunk@2005 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- src/modules/options/options.cpp | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'src/modules/options') diff --git a/src/modules/options/options.cpp b/src/modules/options/options.cpp index dbef784011..994a10735a 100644 --- a/src/modules/options/options.cpp +++ b/src/modules/options/options.cpp @@ -81,6 +81,12 @@ struct OptionsPageData int offsetX; int offsetY; + + __forceinline TCHAR* getString(TCHAR *ptszStr) + { if (flags & ODPF_DONTTRANSLATE) + return ptszStr; + return TranslateTH(hLangpack, ptszStr); + } }; struct OptionsDlgData @@ -843,9 +849,9 @@ static INT_PTR CALLBACK OptionsDlgProc(HWND hdlg, UINT message, WPARAM wParam, L continue; opd = dat->arOpd[i]; - TCHAR* ptszGroup = TranslateTH(opd->hLangpack, opd->ptszGroup); - TCHAR* ptszTitle = TranslateTH(opd->hLangpack, opd->ptszTitle); - TCHAR* ptszTab = TranslateTH(opd->hLangpack, opd->ptszTab); + TCHAR* ptszGroup = opd->getString(opd->ptszGroup); + TCHAR* ptszTitle = opd->getString(opd->ptszTitle); + TCHAR* ptszTab = opd->getString(opd->ptszTab); tvis.hParent = NULL; if (FilterInst != NULL) { @@ -1105,7 +1111,7 @@ static INT_PTR CALLBACK OptionsDlgProc(HWND hdlg, UINT message, WPARAM wParam, L if ( lstrcmp(opd->ptszTitle, p->ptszTitle) || lstrcmpnull(opd->ptszGroup, p->ptszGroup)) continue; - tie.pszText = TranslateTH(opd->hLangpack, opd->ptszTab); + tie.pszText = opd->getString(opd->ptszTab); tie.lParam = i; TabCtrl_InsertItem(hwndTab, pages, &tie); if ( !lstrcmp(opd->ptszTab, p->ptszTab)) -- cgit v1.2.3