From e0e9dd5f90f4f5be48a439b310802c4b7443db0b Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Fri, 20 Sep 2013 18:40:36 +0000 Subject: using Uxtheme git-svn-id: http://svn.miranda-ng.org/main/trunk@6141 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Variables/Variables_10.vcxproj | 8 ++++---- plugins/Variables/Variables_11.vcxproj | 8 ++++---- plugins/Variables/src/help.cpp | 18 ++++++------------ plugins/Variables/src/variables.cpp | 7 ------- plugins/Variables/src/variables.h | 1 - 5 files changed, 14 insertions(+), 28 deletions(-) (limited to 'plugins/Variables') diff --git a/plugins/Variables/Variables_10.vcxproj b/plugins/Variables/Variables_10.vcxproj index 9a68ad3b0b..91cc5ca4dc 100644 --- a/plugins/Variables/Variables_10.vcxproj +++ b/plugins/Variables/Variables_10.vcxproj @@ -87,7 +87,7 @@ ..\..\include\msapi - pcred.lib;pdh.lib;Ws2_32.lib;%(AdditionalDependencies) + pcred.lib;pdh.lib;Ws2_32.lib;UxTheme.lib;%(AdditionalDependencies) true false $(IntDir)$(TargetName).lib @@ -114,7 +114,7 @@ ..\..\include\msapi - pcre.lib;pdh.lib;Ws2_32.lib;%(AdditionalDependencies) + pcre.lib;pdh.lib;Ws2_32.lib;UxTheme.lib;%(AdditionalDependencies) true true true @@ -140,7 +140,7 @@ false - pcre.lib;pdh.lib;Ws2_32.lib;%(AdditionalDependencies) + pcre.lib;pdh.lib;Ws2_32.lib;UxTheme.lib;%(AdditionalDependencies) true $(IntDir)$(TargetName).lib true @@ -168,7 +168,7 @@ false - pcred.lib;pdh.lib;Ws2_32.lib;%(AdditionalDependencies) + pcred.lib;pdh.lib;Ws2_32.lib;UxTheme.lib;%(AdditionalDependencies) true $(IntDir)$(TargetName).lib Windows diff --git a/plugins/Variables/Variables_11.vcxproj b/plugins/Variables/Variables_11.vcxproj index 576e79c52d..ea030eef88 100644 --- a/plugins/Variables/Variables_11.vcxproj +++ b/plugins/Variables/Variables_11.vcxproj @@ -91,7 +91,7 @@ ..\..\include\msapi - pcred.lib;pdh.lib;Ws2_32.lib;%(AdditionalDependencies) + pcred.lib;pdh.lib;Ws2_32.lib;UxTheme.lib;%(AdditionalDependencies) true false $(IntDir)$(TargetName).lib @@ -119,7 +119,7 @@ ..\..\include\msapi - pcre.lib;pdh.lib;Ws2_32.lib;%(AdditionalDependencies) + pcre.lib;pdh.lib;Ws2_32.lib;UxTheme.lib;%(AdditionalDependencies) true true true @@ -144,7 +144,7 @@ false - pcre.lib;pdh.lib;Ws2_32.lib;%(AdditionalDependencies) + pcre.lib;pdh.lib;Ws2_32.lib;UxTheme.lib;%(AdditionalDependencies) true $(IntDir)$(TargetName).lib true @@ -171,7 +171,7 @@ false - pcred.lib;pdh.lib;Ws2_32.lib;%(AdditionalDependencies) + pcred.lib;pdh.lib;Ws2_32.lib;UxTheme.lib;%(AdditionalDependencies) true $(IntDir)$(TargetName).lib Windows diff --git a/plugins/Variables/src/help.cpp b/plugins/Variables/src/help.cpp index 9e3ca13989..0f6d23b423 100644 --- a/plugins/Variables/src/help.cpp +++ b/plugins/Variables/src/help.cpp @@ -903,8 +903,7 @@ static INT_PTR CALLBACK helpDlgProc(HWND hwndDlg,UINT msg,WPARAM wParam,LPARAM l tci.mask = TCIF_TEXT|TCIF_PARAM; tci.pszText = TranslateT("Tokens"); hPage = CreateDialogParam(hInst, MAKEINTRESOURCE(IDD_TOKENS_DIALOG), hwndDlg, tokenHelpDlgProc, (LPARAM)GetParent(hwndDlg)); - if (pfnEnableThemeDialogTexture) - pfnEnableThemeDialogTexture(hPage, ETDT_ENABLETAB); + EnableThemeDialogTexture(hPage, ETDT_ENABLETAB); tci.lParam = (LPARAM)hPage; MoveWindow(hPage, (rcTabs.left - rcParent.left), (rcTabs.top - rcParent.top), (rcTabs.right - rcTabs.left) - 2*iFrameX, (rcTabs.bottom - rcTabs.top) - 2*iFrameY, TRUE); @@ -917,9 +916,8 @@ static INT_PTR CALLBACK helpDlgProc(HWND hwndDlg,UINT msg,WPARAM wParam,LPARAM l tci.mask = TCIF_TEXT|TCIF_PARAM; tci.pszText = TranslateT("Input"); dat->hwndInputDlg = hPage = CreateDialogParam(hInst, MAKEINTRESOURCE(IDD_INPUT_DIALOG), hwndDlg, inputDlgProc, (LPARAM)GetParent(hwndDlg)); - if (pfnEnableThemeDialogTexture) { - pfnEnableThemeDialogTexture(hPage, ETDT_ENABLETAB); - } + EnableThemeDialogTexture(hPage, ETDT_ENABLETAB); + tci.lParam = (LPARAM)hPage; MoveWindow(hPage, (rcTabs.left - rcParent.left), (rcTabs.top - rcParent.top), (rcTabs.right - rcTabs.left) - 2*iFrameX, (rcTabs.bottom - rcTabs.top) - 2*iFrameY, TRUE); ShowWindow(hPage, SW_HIDE); @@ -954,9 +952,7 @@ static INT_PTR CALLBACK helpDlgProc(HWND hwndDlg,UINT msg,WPARAM wParam,LPARAM l ((dat->vhs->flags&VHF_INPUT) && (((dat->vhs->fi != NULL) && (dat->vhs->fi->hContact != NULL)) || (dat->vhs->flags&VHF_SETLASTSUBJECT)))) { // subject window is created, but not necessarily shown dat->hwndSubjectDlg = hPage = CreateDialogParam(hInst, MAKEINTRESOURCE(IDD_CLIST_DIALOG), hwndDlg, clistDlgProc, (LPARAM)GetParent(hwndDlg)); - if (pfnEnableThemeDialogTexture) { - pfnEnableThemeDialogTexture(hPage, ETDT_ENABLETAB); - } + EnableThemeDialogTexture(hPage, ETDT_ENABLETAB); MoveWindow(hPage, (rcTabs.left - rcParent.left), (rcTabs.top - rcParent.top), (rcTabs.right - rcTabs.left) - 2*iFrameX, (rcTabs.bottom - rcTabs.top) - 2*iFrameY, TRUE); ShowWindow(hPage, SW_HIDE); @@ -979,8 +975,7 @@ static INT_PTR CALLBACK helpDlgProc(HWND hwndDlg,UINT msg,WPARAM wParam,LPARAM l ((dat->vhs->flags&VHF_INPUT) && (dat->vhs->fi != NULL) && (dat->vhs->fi->tszExtraText != NULL))) { // extratext window is created, but not necessarily shown dat->hwndExtraTextDlg = hPage = CreateDialogParam(hInst, MAKEINTRESOURCE(IDD_EXTRATEXT_DIALOG), hwndDlg, extratextDlgProc, (LPARAM)GetParent(hwndDlg)); - if (pfnEnableThemeDialogTexture) - pfnEnableThemeDialogTexture(hPage, ETDT_ENABLETAB); + EnableThemeDialogTexture(hPage, ETDT_ENABLETAB); MoveWindow(hPage, (rcTabs.left - rcParent.left), (rcTabs.top - rcParent.top), (rcTabs.right - rcTabs.left) - 2*iFrameX, (rcTabs.bottom - rcTabs.top) - 2*iFrameY, TRUE); ShowWindow(hPage, SW_HIDE); @@ -1009,8 +1004,7 @@ static INT_PTR CALLBACK helpDlgProc(HWND hwndDlg,UINT msg,WPARAM wParam,LPARAM l tci.mask = TCIF_TEXT|TCIF_PARAM; tci.pszText = TranslateT("Help"); hPage = CreateDialogParam(hInst, MAKEINTRESOURCE(IDD_HELPINFO_DIALOG), hwndDlg, helpInfoDlgProc, (LPARAM)GetParent(hwndDlg)); - if (pfnEnableThemeDialogTexture) - pfnEnableThemeDialogTexture(hPage, ETDT_ENABLETAB); + EnableThemeDialogTexture(hPage, ETDT_ENABLETAB); tci.lParam = (LPARAM)hPage; MoveWindow(hPage, (rcTabs.left - rcParent.left), (rcTabs.top - rcParent.top), (rcTabs.right - rcTabs.left) - 2*iFrameX, (rcTabs.bottom - rcTabs.top) - 2*iFrameY, TRUE); diff --git a/plugins/Variables/src/variables.cpp b/plugins/Variables/src/variables.cpp index 1b94664d1a..4e7ce05647 100644 --- a/plugins/Variables/src/variables.cpp +++ b/plugins/Variables/src/variables.cpp @@ -19,7 +19,6 @@ #include "variables.h" -BOOL (WINAPI *pfnEnableThemeDialogTexture)(HANDLE, DWORD) = 0; static BOOL bWarningShown = FALSE; // unicode on ansi warning /* some handles */ @@ -514,12 +513,6 @@ int LoadVarModule() // help dialog hCurSplitNS = LoadCursor(NULL, IDC_SIZENS); - if(IsWinVerXPPlus()) { - HMODULE hUxTheme = GetModuleHandle(_T("uxtheme.dll")); - if (hUxTheme) - pfnEnableThemeDialogTexture = (BOOL (WINAPI *)(HANDLE, DWORD))GetProcAddress(hUxTheme, "EnableThemeDialogTexture"); - } - hShowHelpService = CreateServiceFunction(MS_VARS_SHOWHELP, showHelpService); hShowHelpExService = CreateServiceFunction(MS_VARS_SHOWHELPEX, showHelpExService); diff --git a/plugins/Variables/src/variables.h b/plugins/Variables/src/variables.h index e76387924a..21c8bdef59 100644 --- a/plugins/Variables/src/variables.h +++ b/plugins/Variables/src/variables.h @@ -135,7 +135,6 @@ struct ParseOptions { BOOL bStripAll; }; -extern BOOL (WINAPI *pfnEnableThemeDialogTexture)(HANDLE, DWORD); extern HINSTANCE hInst; extern struct ParseOptions gParseOpts; extern int hLangpack; -- cgit v1.2.3