summaryrefslogtreecommitdiff
path: root/src/modules/extraicons
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2012-11-01 18:02:16 +0000
committerGeorge Hazan <george.hazan@gmail.com>2012-11-01 18:02:16 +0000
commit6b79e72bd8c5654b8eb6675809ceac45119ed8b6 (patch)
tree5f57fbc7dad7e56b98f9530dd65617e7e6596977 /src/modules/extraicons
parent434ea02f7c7e2d119ef5648402911259427fbe02 (diff)
duplicate icon eliminated
git-svn-id: http://svn.miranda-ng.org/main/trunk@2140 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'src/modules/extraicons')
-rw-r--r--src/modules/extraicons/options_ei.cpp4
-rw-r--r--src/modules/extraicons/res/empty.icobin766 -> 0 bytes
-rw-r--r--src/modules/extraicons/res/extraicons.rc1
3 files changed, 2 insertions, 3 deletions
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
--- a/src/modules/extraicons/res/empty.ico
+++ /dev/null
Binary files 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"
/////////////////////////////////////////////////////////////////////////////
//