From 9fb53308fb29d51429927579fb45d171e2ce6c07 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sat, 25 Mar 2023 19:13:31 +0300 Subject: code cleaning to avoid visual name conflict --- src/core/stdmsg/src/msgs.cpp | 6 +++--- src/core/stdmsg/src/msgs.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/core/stdmsg') diff --git a/src/core/stdmsg/src/msgs.cpp b/src/core/stdmsg/src/msgs.cpp index 077504cfe0..c7303ce01d 100644 --- a/src/core/stdmsg/src/msgs.cpp +++ b/src/core/stdmsg/src/msgs.cpp @@ -88,14 +88,14 @@ static int MessageEventAdded(WPARAM hContact, LPARAM hDbEvent) if (!pDlg) { if (bPopup) { pDlg = GetContainer()->AddPage(hContact, nullptr, true); - pContainer = pDlg->getContainer(); + pContainer = pDlg->getOwner(); } Skin_PlaySound("AlertMsg"); Srmm_AddEvent(hContact, hDbEvent); } else { - pContainer = pDlg->getContainer(); + pContainer = pDlg->getOwner(); if (bPopup) ShowWindow(pContainer->GetHwnd(), SW_RESTORE); @@ -152,7 +152,7 @@ INT_PTR SendMessageCmd(MCONTACT hContact, wchar_t *pwszInitialText) } else { auto *pDlg = GetContainer()->AddPage(hContact, pwszInitialText, false); - hwndContainer = pDlg->getContainer()->GetHwnd(); + hwndContainer = pDlg->getOwner()->GetHwnd(); } ShowWindow(hwndContainer, SW_RESTORE); diff --git a/src/core/stdmsg/src/msgs.h b/src/core/stdmsg/src/msgs.h index 9a72a2ca55..aa6e028f74 100644 --- a/src/core/stdmsg/src/msgs.h +++ b/src/core/stdmsg/src/msgs.h @@ -139,7 +139,7 @@ public: return ((CLogWindow *)m_pLog); } - __forceinline CTabbedWindow* getContainer() const { + __forceinline CTabbedWindow* getOwner() const { return m_pOwner; } -- cgit v1.2.3