diff options
author | George Hazan <ghazan@miranda.im> | 2017-03-21 14:28:10 +0300 |
---|---|---|
committer | George Hazan <ghazan@miranda.im> | 2017-03-21 14:28:10 +0300 |
commit | 3dd1a999c9e643fd92fd34301d9e65a7f07d8c54 (patch) | |
tree | 66460c3df55d74eb37023a271e2c9884fa1b7d35 /plugins/TabSRMM/src/tabctrl.cpp | |
parent | 0fcb238c56ac3bc636c73c9ba51b9d66f8311479 (diff) |
various code cleaning & name conflict resolution
Diffstat (limited to 'plugins/TabSRMM/src/tabctrl.cpp')
-rw-r--r-- | plugins/TabSRMM/src/tabctrl.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/plugins/TabSRMM/src/tabctrl.cpp b/plugins/TabSRMM/src/tabctrl.cpp index b4d1b6947f..0d046179ba 100644 --- a/plugins/TabSRMM/src/tabctrl.cpp +++ b/plugins/TabSRMM/src/tabctrl.cpp @@ -288,7 +288,7 @@ static void DrawItemRect(TabControlData *tabdat, HDC dc, RECT *rcItem, int nHint CSkinItem *item = nHint & HINT_ACTIVE_ITEM ? &SkinItems[ID_EXTBKBUTTONSPRESSED] : (nHint & HINT_HOTTRACK ? &SkinItems[ID_EXTBKBUTTONSMOUSEOVER] : &SkinItems[ID_EXTBKBUTTONSNPRESSED]);
if (!item->IGNORED) {
- CSkin::SkinDrawBG(tabdat->hwnd, tabdat->pContainer->hwnd, tabdat->pContainer, rcItem, dc);
+ CSkin::SkinDrawBG(tabdat->hwnd, tabdat->pContainer->m_hwnd, tabdat->pContainer, rcItem, dc);
CSkin::DrawItem(dc, rcItem, item);
}
else
@@ -619,7 +619,7 @@ static void PaintWorker(HWND hwnd, TabControlData *tabdat) tabdat->helperDat = 0;
if (tabdat->fAeroTabs) {
- CSrmmWindow *dat = (CSrmmWindow*)GetWindowLongPtr(tabdat->pContainer->hwndActive, GWLP_USERDATA);
+ CSrmmWindow *dat = (CSrmmWindow*)GetWindowLongPtr(tabdat->pContainer->m_hwndActive, GWLP_USERDATA);
if (dat)
tabdat->helperDat = dat;
else
@@ -669,7 +669,7 @@ static void PaintWorker(HWND hwnd, TabControlData *tabdat) rctClip = rctPage;
if (CSkin::m_skinEnabled)
- CSkin::SkinDrawBG(hwnd, tabdat->pContainer->hwnd, tabdat->pContainer, &rctPage, hdc);
+ CSkin::SkinDrawBG(hwnd, tabdat->pContainer->m_hwnd, tabdat->pContainer, &rctPage, hdc);
else
CSkin::FillBack(hdc, &rctPage);
@@ -1424,7 +1424,7 @@ INT_PTR CALLBACK DlgProcTabConfig(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM ReloadTabConfig();
for (TContainerData *p = pFirstContainer; p; p = p->pNext) {
- HWND hwndTab = GetDlgItem(p->hwnd, IDC_MSGTABS);
+ HWND hwndTab = GetDlgItem(p->m_hwnd, IDC_MSGTABS);
TabCtrl_SetPadding(hwndTab, GetDlgItemInt(hwndDlg, IDC_HTABPADDING, nullptr, FALSE), GetDlgItemInt(hwndDlg, IDC_TABPADDING, nullptr, FALSE));
RedrawWindow(hwndTab, nullptr, nullptr, RDW_INVALIDATE | RDW_ERASE);
}
|