From 6b79e72bd8c5654b8eb6675809ceac45119ed8b6 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Thu, 1 Nov 2012 18:02:16 +0000 Subject: duplicate icon eliminated git-svn-id: http://svn.miranda-ng.org/main/trunk@2140 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- src/modules/extraicons/options_ei.cpp | 4 ++-- src/modules/extraicons/res/empty.ico | Bin 766 -> 0 bytes src/modules/extraicons/res/extraicons.rc | 1 - src/resource.h | 1 - 4 files changed, 2 insertions(+), 4 deletions(-) delete mode 100644 src/modules/extraicons/res/empty.ico (limited to 'src') diff --git a/src/modules/extraicons/options_ei.cpp b/src/modules/extraicons/options_ei.cpp index 6376da316c..d796ecafb1 100644 --- a/src/modules/extraicons/options_ei.cpp +++ b/src/modules/extraicons/options_ei.cpp @@ -461,7 +461,7 @@ static INT_PTR CALLBACK OptionsDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LP int cx = GetSystemMetrics(SM_CXSMICON); HIMAGELIST hImageList = ImageList_Create(cx, cx, ILC_COLOR32 | ILC_MASK, 2, 2); - HICON hDefaultIcon = (HICON) LoadImage(hInst, MAKEINTRESOURCE(IDI_EMPTY), IMAGE_ICON, cx, cx, + HICON hDefaultIcon = (HICON) LoadImage(hInst, MAKEINTRESOURCE(IDI_BLANK), IMAGE_ICON, cx, cx, LR_DEFAULTCOLOR | LR_SHARED); ImageList_AddIcon(hImageList, hDefaultIcon); DestroyIcon(hDefaultIcon); @@ -474,7 +474,7 @@ static INT_PTR CALLBACK OptionsDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LP HICON hIcon = Skin_GetIcon(extra->getDescIcon()); if (hIcon == NULL) { - HICON hDefaultIcon = (HICON) LoadImage(hInst, MAKEINTRESOURCE(IDI_EMPTY), IMAGE_ICON, cx, cx, + HICON hDefaultIcon = (HICON) LoadImage(hInst, MAKEINTRESOURCE(IDI_BLANK), IMAGE_ICON, cx, cx, LR_DEFAULTCOLOR | LR_SHARED); ImageList_AddIcon(hImageList, hDefaultIcon); DestroyIcon(hDefaultIcon); diff --git a/src/modules/extraicons/res/empty.ico b/src/modules/extraicons/res/empty.ico deleted file mode 100644 index 8ba93283ac..0000000000 Binary files a/src/modules/extraicons/res/empty.ico and /dev/null differ diff --git a/src/modules/extraicons/res/extraicons.rc b/src/modules/extraicons/res/extraicons.rc index 4ffca8abd2..08e1d4bd9c 100644 --- a/src/modules/extraicons/res/extraicons.rc +++ b/src/modules/extraicons/res/extraicons.rc @@ -73,7 +73,6 @@ IDI_NEVERVIS ICON "NeverVis.ico" IDI_CHAT ICON "Chatchannel.ico" IDI_MALE ICON "male.ico" IDI_FEMALE ICON "female.ico" -IDI_EMPTY ICON "empty.ico" ///////////////////////////////////////////////////////////////////////////// // diff --git a/src/resource.h b/src/resource.h index 95d84b8462..91a816b4e1 100644 --- a/src/resource.h +++ b/src/resource.h @@ -58,7 +58,6 @@ #define IDI_CHAT 187 #define IDI_MALE 188 #define IDI_FEMALE 189 -#define IDI_EMPTY 190 #define IDR_OPT_POPUP 191 #define IDD_HISTORY_FIND 192 #define IDI_SENDEMAIL 193 -- cgit v1.2.3