summaryrefslogtreecommitdiff
path: root/plugins/RecentContacts/RecentContacts.cpp
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2012-06-10 14:46:58 +0000
committerGeorge Hazan <george.hazan@gmail.com>2012-06-10 14:46:58 +0000
commit101ca36412b3e7b8851b6b48a4f6cbc17d9f9eff (patch)
treea846c60f7c2a7df17b694deba92e7f6df3bbb882 /plugins/RecentContacts/RecentContacts.cpp
parenta3fdadd09f12f6b246b11a5156bf6f0358e9a5f8 (diff)
bitmap operations were removed from TopToolBar and replaced with IcoLib
git-svn-id: http://svn.miranda-ng.org/main/trunk@379 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/RecentContacts/RecentContacts.cpp')
-rw-r--r--plugins/RecentContacts/RecentContacts.cpp23
1 files changed, 8 insertions, 15 deletions
diff --git a/plugins/RecentContacts/RecentContacts.cpp b/plugins/RecentContacts/RecentContacts.cpp
index af3a21f501..cbb77d8491 100644
--- a/plugins/RecentContacts/RecentContacts.cpp
+++ b/plugins/RecentContacts/RecentContacts.cpp
@@ -14,16 +14,11 @@ int hLangpack = 0;
MM_INTERFACE mmi;
LIST_INTERFACE li;
-HANDLE hMenu = NULL;
-HANDLE hPrebuildMenu = NULL;
-HANDLE hSystemModulesLoaded = NULL;
-HANDLE hTopToolbarLoaded = NULL;
-HANDLE hTopToolbarButtonShowList = NULL;
-HANDLE hMsgWndEvent = NULL;
-HANDLE hWindowList = NULL;
-HANDLE hMenuItemRemove = NULL;
-HANDLE hOptInitialise = NULL;
-HANDLE hContactSetting = NULL;
+HANDLE hTopToolbarButtonShowList;
+HANDLE hMsgWndEvent;
+HANDLE hWindowList;
+HANDLE hMenuItemRemove;
+HANDLE hIcon;
const INT_PTR boo = 0;
LIST<void> ServiceList(10,boo), HookList(10,boo);
@@ -466,10 +461,8 @@ int Create_TopToolbarShowList(WPARAM wParam, LPARAM lParam)
if (ServiceExists(MS_TTB_ADDBUTTON)) {
TTBButton ttbb = { 0 };
ttbb.cbSize = sizeof(ttbb);
- ttbb.hbBitmapUp =
- ttbb.hbBitmapDown = LoadBitmap(hInst, MAKEINTRESOURCE(IDB_CMD_SHOWLASTUSED));
- ttbb.pszServiceUp =
- ttbb.pszServiceDown = msLastUC_ShowList;
+ ttbb.hIconHandleDn = ttbb.hIconHandleDn = hIcon;
+ ttbb.pszServiceUp = ttbb.pszServiceDown = msLastUC_ShowList;
ttbb.dwFlags = TTBBF_VISIBLE|TTBBF_SHOWTOOLTIP|TTBBF_DRAWBORDER;
ttbb.name = Translate(msLastUC_ShowListName);
@@ -540,7 +533,7 @@ static void iconsInit(void)
sid.pszDescription = LPGEN("Main icon");
sid.pszName = "recent_main";
sid.iDefaultIndex = -IDI_SHOWRECENT;
- CallService(MS_SKIN2_ADDICON, 0, (LPARAM)&sid);
+ hIcon = Skin_AddIcon(&sid);
}
static int OnPrebuildContactMenu (WPARAM wParam, LPARAM lParam)