diff options
author | George Hazan <george.hazan@gmail.com> | 2013-02-20 17:12:40 +0000 |
---|---|---|
committer | George Hazan <george.hazan@gmail.com> | 2013-02-20 17:12:40 +0000 |
commit | 509f52fe07c0b035dfeea810b99edf92a9781380 (patch) | |
tree | 3a31ce4a6260801a9dfd47c2c50e2875171eab3c /plugins/Clist_nicer/src/statusbar.cpp | |
parent | 646d843cd5b1b3498e488f99d812ad344f746f81 (diff) |
nicer+ status items list made dynamic
git-svn-id: http://svn.miranda-ng.org/main/trunk@3654 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/Clist_nicer/src/statusbar.cpp')
-rw-r--r-- | plugins/Clist_nicer/src/statusbar.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
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<HFONT>(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;
|