From 509f52fe07c0b035dfeea810b99edf92a9781380 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 20 Feb 2013 17:12:40 +0000 Subject: nicer+ status items list made dynamic git-svn-id: http://svn.miranda-ng.org/main/trunk@3654 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Clist_nicer/src/statusbar.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'plugins/Clist_nicer/src/statusbar.cpp') diff --git a/plugins/Clist_nicer/src/statusbar.cpp b/plugins/Clist_nicer/src/statusbar.cpp index 936f1f0b92..82c5a5e2e6 100644 --- a/plugins/Clist_nicer/src/statusbar.cpp +++ b/plugins/Clist_nicer/src/statusbar.cpp @@ -29,7 +29,6 @@ static POINT ptMouse = {0}; static RECT rcMouse = {0}; static int timer_set = 0, tooltip_active = 0; extern HANDLE hStatusBarShowToolTipEvent, hStatusBarHideToolTipEvent; -extern StatusItems_t *StatusItems; extern HBRUSH g_CLUISkinnedBkColor; extern HANDLE (WINAPI *MyOpenThemeData)(HWND, LPCWSTR); @@ -85,7 +84,7 @@ LRESULT CALLBACK NewStatusBarWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM break; case WM_PAINT: - if (cfg::shutDown || !StatusItems) + if (cfg::shutDown || arStatusItems.getCount() == 0) return 0; if (cfg::dat.bSkinnedStatusBar) { @@ -114,7 +113,7 @@ LRESULT CALLBACK NewStatusBarWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM SetBkMode(hdcMem, TRANSPARENT); hOldFont = reinterpret_cast(SelectObject(hdcMem, GetStockObject(DEFAULT_GUI_FONT))); BitBlt(hdcMem, 0, 0, rcClient.right, rcClient.bottom, cfg::dat.hdcBg, pt.x, pt.y, SRCCOPY); - item = &StatusItems[ID_EXTBKSTATUSBAR - ID_STATUS_OFFLINE]; + item = arStatusItems[ID_EXTBKSTATUSBAR - ID_STATUS_OFFLINE]; if ( !item->IGNORED) { RECT rc = rcClient; rc.left += item->MARGIN_LEFT; -- cgit v1.2.3