diff options
author | Kirill Volinsky <mataes2007@gmail.com> | 2013-09-20 12:59:56 +0000 |
---|---|---|
committer | Kirill Volinsky <mataes2007@gmail.com> | 2013-09-20 12:59:56 +0000 |
commit | 61e43dca25a80a451cf2b7dbbc4931a8f2a96d80 (patch) | |
tree | f7e3b3172aac403c678a71bdfb783358609c8119 /plugins/FTPFileYM/src | |
parent | 4e2b9eef0d9a530b633c69cfa03ee43359c3a213 (diff) |
using Uxtheme
git-svn-id: http://svn.miranda-ng.org/main/trunk@6137 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/FTPFileYM/src')
-rw-r--r-- | plugins/FTPFileYM/src/dialog.cpp | 3 | ||||
-rw-r--r-- | plugins/FTPFileYM/src/ftpfile.cpp | 8 | ||||
-rw-r--r-- | plugins/FTPFileYM/src/manager.cpp | 2 |
3 files changed, 2 insertions, 11 deletions
diff --git a/plugins/FTPFileYM/src/dialog.cpp b/plugins/FTPFileYM/src/dialog.cpp index 20cbeb3105..376dd204b1 100644 --- a/plugins/FTPFileYM/src/dialog.cpp +++ b/plugins/FTPFileYM/src/dialog.cpp @@ -24,13 +24,12 @@ UploadDialog *uDlg = NULL; Mutex UploadDialog::mutexTabs;
extern Options &opt;
-extern BOOL (WINAPI *MyEnableThemeDialogTexture)(HANDLE, DWORD);
UploadDialog::UploadDialog()
{
this->hwnd = CreateDialog(hInst, MAKEINTRESOURCE(IDD_DLG_UPLOAD), 0, UploadDlgProc);
this->hwndTabs = GetDlgItem(this->hwnd, IDC_TAB);
- MyEnableThemeDialogTexture(this->hwnd, ETDT_ENABLETAB);
+ EnableThemeDialogTexture(this->hwnd, ETDT_ENABLETAB);
MONITORINFO mi = {0};
mi.cbSize = sizeof(mi);
diff --git a/plugins/FTPFileYM/src/ftpfile.cpp b/plugins/FTPFileYM/src/ftpfile.cpp index 2ae9808654..225a1c6d82 100644 --- a/plugins/FTPFileYM/src/ftpfile.cpp +++ b/plugins/FTPFileYM/src/ftpfile.cpp @@ -32,7 +32,6 @@ extern DeleteTimer &deleteTimer; extern ServerList &ftpList;
extern Options &opt;
-BOOL (WINAPI *MyEnableThemeDialogTexture)(HANDLE, DWORD) = 0;
int PrebuildContactMenu(WPARAM wParam, LPARAM lParam);
void PrebuildMainMenu();
int TabsrmmButtonPressed(WPARAM wParam, LPARAM lParam);
@@ -478,13 +477,6 @@ extern "C" int __declspec(dllexport) Load(void) hServiceMainMenu = CreateServiceFunction(MS_FTPFILE_MAINMENU, MainMenuService);
hServiceShareFile = CreateServiceFunction(MS_FTPFILE_SHAREFILE, ShareFileService);
- if (IsWinVerXPPlus())
- {
- HMODULE hUxTheme = GetModuleHandle(_T("uxtheme.dll"));
- if (hUxTheme)
- MyEnableThemeDialogTexture = (BOOL (WINAPI *)(HANDLE, DWORD))GetProcAddress(hUxTheme, "EnableThemeDialogTexture");
- }
-
opt.loadOptions();
deleteTimer.init();
ftpList.init();
diff --git a/plugins/FTPFileYM/src/manager.cpp b/plugins/FTPFileYM/src/manager.cpp index 3befc801ce..13b8a8cd82 100644 --- a/plugins/FTPFileYM/src/manager.cpp +++ b/plugins/FTPFileYM/src/manager.cpp @@ -75,7 +75,7 @@ void Manager::initImageList() {
char buff[256];
- this->himlStates = ImageList_Create(16, 16, IsWinVerXPPlus() ? ILC_COLOR32 | ILC_MASK : ILC_COLOR8 | ILC_MASK, ServerList::FTP_COUNT + 4, 0);
+ this->himlStates = ImageList_Create(16, 16, ILC_COLOR32 | ILC_MASK, ServerList::FTP_COUNT + 4, 0);
ImageList_AddIcon(himlStates, LoadSkinnedIcon(SKINICON_OTHER_DELETE)); // image index 0 is useless for INDEXTOSTATEIMAGEMASK
ImageList_AddIcon(himlStates, LoadSkinnedIcon(SKINICON_OTHER_DELETE));
ImageList_AddIcon(himlStates, LoadSkinnedIcon(SKINICON_OTHER_NOTICK));
|