popups:

- internal implementation details & all service declarations moved to m_popup_int.h;
- all service calls removed and replaced with function calls;
- direct access to popup serttings replaced with Popup_Enable / Popup_Enabled;

1 files changed, 4 insertions, 4 deletions

diff --git a/plugins/Popup/src/popup_wnd2.cpp b/plugins/Popup/src/popup_wnd2.cpp
index 0b41e89e3c..e2dcc6bfce 100644
--- a/plugins/Popup/src/popup_wnd2.cpp
+++ b/plugins/Popup/src/popup_wnd2.cpp
@@ -677,7 +677,7 @@ void PopupWnd2::setIcon(HICON hNewIcon)
 	}

 }

 

-void PopupWnd2::updateData(POPUPDATAW_V2 *ppd)

+void PopupWnd2::updateData(POPUPDATAW *ppd)

 {

 	m_hContact = ppd->lchContact;

 

@@ -717,8 +717,8 @@ void PopupWnd2::updateData(POPUPDATA2 *ppd)
 	if (ppd->flags & PU2_UNICODE) {

 		if (m_textType == TT_NONE)

 			m_textType = TT_UNICODE;

-		replaceStrW(m_lptzTitle, ppd->lptzTitle);

-		replaceStrW(m_lptzText, ppd->lpwzText);

+		replaceStrW(m_lptzTitle, ppd->szTitle.w);

+		replaceStrW(m_lptzText, ppd->szText.w);

 	}

 	else {

 		replaceStrW(m_lptzTitle, nullptr);

@@ -1127,7 +1127,7 @@ LRESULT CALLBACK PopupWnd2::WindowProc(UINT message, WPARAM wParam, LPARAM lPara
 		switch (wParam) {

 		case CPT_TEXTW:  updateText((wchar_t *)lParam);       mir_free((void *)lParam); break;

 		case CPT_TITLEW: updateTitle((wchar_t *)lParam);      mir_free((void *)lParam); break;

-		case CPT_DATAW:  updateData((POPUPDATAW_V2 *)lParam);  mir_free((void *)lParam); break;

+		case CPT_DATAW:  updateData((POPUPDATAW *)lParam);  mir_free((void *)lParam); break;

 		}

 		update();

 		break;