From 769b537b5e1a99fc53aa7296fd2b21dc77a4071c Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 16 Aug 2015 20:33:13 +0000 Subject: name conflicts solved git-svn-id: http://svn.miranda-ng.org/main/trunk@14971 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/NewEventNotify/src/menuitem.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'plugins/NewEventNotify/src/menuitem.cpp') diff --git a/plugins/NewEventNotify/src/menuitem.cpp b/plugins/NewEventNotify/src/menuitem.cpp index 19b4347ea1..d02ea6d2b6 100644 --- a/plugins/NewEventNotify/src/menuitem.cpp +++ b/plugins/NewEventNotify/src/menuitem.cpp @@ -40,9 +40,9 @@ static INT_PTR MenuitemNotifyCmd(WPARAM, LPARAM) int MenuitemUpdate(BOOL bStatus) { if (bStatus) - Menu_ModifyItem(hMenuitemNotify, _T(MENUITEM_DISABLE), LoadIcon(hInst, MAKEINTRESOURCE(IDI_ENABLED))); + Menu_ModifyItem(hMenuitemNotify, _T(MENUITEM_DISABLE), LoadIcon(g_hInst, MAKEINTRESOURCE(IDI_ENABLED))); else - Menu_ModifyItem(hMenuitemNotify, _T(MENUITEM_ENABLE), LoadIcon(hInst, MAKEINTRESOURCE(IDI_DISABLED))); + Menu_ModifyItem(hMenuitemNotify, _T(MENUITEM_ENABLE), LoadIcon(g_hInst, MAKEINTRESOURCE(IDI_DISABLED))); return 0; } @@ -53,7 +53,7 @@ int MenuitemInit(BOOL bStatus) CMenuItem mi; mi.root = Menu_CreateRoot(MO_MAIN, LPGENT("Popups"), 0); mi.position = 1; - mi.hIcolibItem = LoadIcon(hInst, MAKEINTRESOURCE(IDI_ENABLED)); + mi.hIcolibItem = LoadIcon(g_hInst, MAKEINTRESOURCE(IDI_ENABLED)); mi.pszService = MS_NEN_MENUNOTIFY; mi.flags = 0; hMenuitemNotify = Menu_AddMainMenuItem(&mi); -- cgit v1.2.3