diff options
-rw-r--r-- | src/mir_app/src/IcoLib.h | 3 | ||||
-rw-r--r-- | src/mir_app/src/icolib.cpp | 17 | ||||
-rw-r--r-- | src/mir_app/src/skin2opts.cpp | 3 |
3 files changed, 0 insertions, 23 deletions
diff --git a/src/mir_app/src/IcoLib.h b/src/mir_app/src/IcoLib.h index 7b4ea76779..a1637d4f03 100644 --- a/src/mir_app/src/IcoLib.h +++ b/src/mir_app/src/IcoLib.h @@ -111,9 +111,6 @@ IconSourceItem* GetIconSourceItem(const wchar_t* file, int indx, int cxIcon, int IcolibItem* IcoLib_FindHIcon(HICON hIcon, bool &big);
IcolibItem* IcoLib_FindIcon(const char* pszIconName);
-void CreateImageLists();
-void DestroyImageLists();
-
int SkinOptionsInit(WPARAM, LPARAM);
extern mir_cs csIconList;
diff --git a/src/mir_app/src/icolib.cpp b/src/mir_app/src/icolib.cpp index bda29a14d8..e8605688c4 100644 --- a/src/mir_app/src/icolib.cpp +++ b/src/mir_app/src/icolib.cpp @@ -28,7 +28,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. static BOOL bModuleInitialized = FALSE;
static volatile LONG iStaticCount = 1;
-static HIMAGELIST himlSmall, hImlBig;
HANDLE hIconsChangedEvent;
HICON hIconBlank = nullptr;
@@ -65,18 +64,6 @@ LIST<IcolibItem> iconList(20, sttCompareIcons); /////////////////////////////////////////////////////////////////////////////////////////
// Utility functions
-void CreateImageLists()
-{
- himlSmall = ImageList_Create(g_iIconSX, g_iIconSY, ILC_COLOR32 | ILC_MASK, 50, 50);
- hImlBig = ImageList_Create(g_iIconX, g_iIconY, ILC_COLOR32 | ILC_MASK, 50, 50);
-}
-
-void DestroyImageLists()
-{
- ImageList_Destroy(himlSmall); himlSmall = 0;
- ImageList_Destroy(hImlBig); hImlBig = 0;
-}
-
void __fastcall SafeDestroyIcon(HICON &hIcon)
{
if (hIcon != nullptr) {
@@ -796,8 +783,6 @@ int LoadIcoLibModule(void) hIconsChangedEvent = CreateHookableEvent(ME_SKIN_ICONSCHANGED);
- CreateImageLists();
-
HookEvent(ME_OPT_INITIALISE, SkinOptionsInit);
return 0;
}
@@ -809,8 +794,6 @@ void UnloadIcoLibModule(void) DestroyHookableEvent(hIconsChangedEvent);
- DestroyImageLists();
-
for (auto &p : iconList)
delete p;
iconList.destroy();
diff --git a/src/mir_app/src/skin2opts.cpp b/src/mir_app/src/skin2opts.cpp index 24fe66819d..03aec37087 100644 --- a/src/mir_app/src/skin2opts.cpp +++ b/src/mir_app/src/skin2opts.cpp @@ -485,9 +485,6 @@ class CIcoLibOptsDlg : public CDlgBase {
UpdateIconsPreview();
- DestroyImageLists();
- CreateImageLists();
-
iconEventActive = 1; // Disable icon destroying - performance boost
NotifyEventHooks(hIconsChangedEvent, 0, 0);
iconEventActive = 0;
|