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/utils.cpp | |
| parent | 0fcb238c56ac3bc636c73c9ba51b9d66f8311479 (diff) | |
various code cleaning & name conflict resolution
Diffstat (limited to 'plugins/TabSRMM/src/utils.cpp')
| -rw-r--r-- | plugins/TabSRMM/src/utils.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/plugins/TabSRMM/src/utils.cpp b/plugins/TabSRMM/src/utils.cpp index 5d9f257857..a2cac5183f 100644 --- a/plugins/TabSRMM/src/utils.cpp +++ b/plugins/TabSRMM/src/utils.cpp @@ -271,7 +271,7 @@ bool Utils::FormatTitleBar(const CTabBaseDlg *dat, const wchar_t *szFormat, CMSt break;
case 'c':
- dest.Append(!mir_wstrcmp(dat->m_pContainer->szName, L"default") ? TranslateT("Default container") : dat->m_pContainer->szName);
+ dest.Append(!mir_wstrcmp(dat->m_pContainer->m_wszName, L"default") ? TranslateT("Default container") : dat->m_pContainer->m_wszName);
break;
case 'o':
@@ -695,11 +695,11 @@ HICON Utils::iconFromAvatar(const CTabBaseDlg *dat) RECT rc = { 0, 0, lIconSize, lIconSize };
- HDC hdc = ::GetDC(dat->m_pContainer->hwnd);
+ HDC hdc = ::GetDC(dat->m_pContainer->m_hwnd);
HDC dc = ::CreateCompatibleDC(hdc);
HDC dcResized = ::CreateCompatibleDC(hdc);
- ReleaseDC(dat->m_pContainer->hwnd, hdc);
+ ReleaseDC(dat->m_pContainer->m_hwnd, hdc);
HBITMAP hbmNew = CSkin::CreateAeroCompatibleBitmap(rc, dc);
HBITMAP hbmOld = reinterpret_cast<HBITMAP>(::SelectObject(dc, hbmNew));
@@ -788,9 +788,9 @@ int Utils::mustPlaySound(const CTabBaseDlg *dat) if (dat->m_pContainer->dwFlags & CNT_NOSOUND || nen_options.iNoSounds)
return 0;
- bool fActiveWindow = (dat->m_pContainer->hwnd == ::GetForegroundWindow() ? true : false);
- bool fActiveTab = (dat->m_pContainer->hwndActive == dat->GetHwnd() ? true : false);
- bool fIconic = (::IsIconic(dat->m_pContainer->hwnd) ? true : false);
+ bool fActiveWindow = (dat->m_pContainer->m_hwnd == ::GetForegroundWindow() ? true : false);
+ bool fActiveTab = (dat->m_pContainer->m_hwndActive == dat->GetHwnd() ? true : false);
+ bool fIconic = (::IsIconic(dat->m_pContainer->m_hwnd) ? true : false);
// window minimized, check if sound has to be played
if (fIconic)
|