using Uxtheme

git-svn-id: http://svn.miranda-ng.org/main/trunk@6141 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

5 files changed, 14 insertions, 28 deletions

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 @@
       <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

-      <AdditionalDependencies>pcred.lib;pdh.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <AdditionalDependencies>pcred.lib;pdh.lib;Ws2_32.lib;UxTheme.lib;%(AdditionalDependencies)</AdditionalDependencies>

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

       <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>

@@ -114,7 +114,7 @@
       <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

-      <AdditionalDependencies>pcre.lib;pdh.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <AdditionalDependencies>pcre.lib;pdh.lib;Ws2_32.lib;UxTheme.lib;%(AdditionalDependencies)</AdditionalDependencies>

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <OptimizeReferences>true</OptimizeReferences>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

@@ -140,7 +140,7 @@
       <ExceptionHandling>false</ExceptionHandling>

     </ClCompile>

     <Link>

-      <AdditionalDependencies>pcre.lib;pdh.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <AdditionalDependencies>pcre.lib;pdh.lib;Ws2_32.lib;UxTheme.lib;%(AdditionalDependencies)</AdditionalDependencies>

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>

       <OptimizeReferences>true</OptimizeReferences>

@@ -168,7 +168,7 @@
       <ExceptionHandling>false</ExceptionHandling>

     </ClCompile>

     <Link>

-      <AdditionalDependencies>pcred.lib;pdh.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <AdditionalDependencies>pcred.lib;pdh.lib;Ws2_32.lib;UxTheme.lib;%(AdditionalDependencies)</AdditionalDependencies>

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>

       <SubSystem>Windows</SubSystem>

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 @@
       <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

-      <AdditionalDependencies>pcred.lib;pdh.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <AdditionalDependencies>pcred.lib;pdh.lib;Ws2_32.lib;UxTheme.lib;%(AdditionalDependencies)</AdditionalDependencies>

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

       <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>

@@ -119,7 +119,7 @@
       <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

-      <AdditionalDependencies>pcre.lib;pdh.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <AdditionalDependencies>pcre.lib;pdh.lib;Ws2_32.lib;UxTheme.lib;%(AdditionalDependencies)</AdditionalDependencies>

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <OptimizeReferences>true</OptimizeReferences>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

@@ -144,7 +144,7 @@
       <ExceptionHandling>false</ExceptionHandling>

     </ClCompile>

     <Link>

-      <AdditionalDependencies>pcre.lib;pdh.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <AdditionalDependencies>pcre.lib;pdh.lib;Ws2_32.lib;UxTheme.lib;%(AdditionalDependencies)</AdditionalDependencies>

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>

       <OptimizeReferences>true</OptimizeReferences>

@@ -171,7 +171,7 @@
       <ExceptionHandling>false</ExceptionHandling>

     </ClCompile>

     <Link>

-      <AdditionalDependencies>pcred.lib;pdh.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <AdditionalDependencies>pcred.lib;pdh.lib;Ws2_32.lib;UxTheme.lib;%(AdditionalDependencies)</AdditionalDependencies>

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>

       <SubSystem>Windows</SubSystem>

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;