From 64c2fb8c4329d430a4894f154b47269693e31102 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Tue, 5 Sep 2023 16:03:58 +0300
Subject: CSrmmBaseDialog::SetMessageText - move all low-level stuff inside a
function
---
plugins/Scriver/src/infobar.cpp | 6 +++---
plugins/Scriver/src/msgdialog.cpp | 15 +++------------
plugins/Scriver/src/msgtimedout.cpp | 4 +---
3 files changed, 7 insertions(+), 18 deletions(-)
(limited to 'plugins/Scriver/src')
diff --git a/plugins/Scriver/src/infobar.cpp b/plugins/Scriver/src/infobar.cpp
index 08d80577bf..c9874f5428 100644
--- a/plugins/Scriver/src/infobar.cpp
+++ b/plugins/Scriver/src/infobar.cpp
@@ -77,17 +77,17 @@ void CMsgDialog::RefreshInfobar()
hIcon = (HICON)CallProtoService(m_szProto, PS_GETCUSTOMSTATUSICON, bXStatus, 0);
wchar_t szText[2048];
- SETTEXTEX st;
if (szXStatusMsg && *szXStatusMsg)
mir_snwprintf(szText, L"%s (%s)", TranslateW(szXStatusName), szXStatusMsg.get());
else if (szXStatusName && *szXStatusName)
wcsncpy_s(szText, TranslateW(szXStatusName), _TRUNCATE);
else
szText[0] = 0;
- st.flags = ST_DEFAULT;
- st.codepage = 1200;
+
+ SETTEXTEX st = { ST_DEFAULT, 1200 };
SendDlgItemMessage(m_hwndInfo, IDC_INFOBAR_NAME, EM_SETTEXTEX, (WPARAM)&st, (LPARAM)Clist_GetContactDisplayName(m_hContact));
SendDlgItemMessage(m_hwndInfo, IDC_INFOBAR_STATUS, EM_SETTEXTEX, (WPARAM)&st, (LPARAM)szContactStatusMsg);
+
hIcon = (HICON)SendDlgItemMessage(m_hwndInfo, IDC_XSTATUSICON, STM_SETICON, (WPARAM)hIcon, 0);
if (hIcon)
DestroyIcon(hIcon);
diff --git a/plugins/Scriver/src/msgdialog.cpp b/plugins/Scriver/src/msgdialog.cpp
index 22bd7c8a08..d062cf512a 100644
--- a/plugins/Scriver/src/msgdialog.cpp
+++ b/plugins/Scriver/src/msgdialog.cpp
@@ -380,14 +380,9 @@ void CMsgDialog::onClick_Quote(CCtrlButton*)
if (!hDbEventLast)
return;
- SETTEXTEX st;
- st.flags = ST_SELECTION;
- st.codepage = 1200;
-
wchar_t *buffer = m_pLog->GetSelection();
if (buffer != nullptr) {
- CMStringW quotedBuffer(Srmm_Quote(buffer));
- m_message.SendMsg(EM_SETTEXTEX, (WPARAM)&st, (LPARAM)quotedBuffer.c_str());
+ SetMessageText(Srmm_Quote(buffer));
mir_free(buffer);
}
else {
@@ -396,12 +391,8 @@ void CMsgDialog::onClick_Quote(CCtrlButton*)
return;
if (DbEventIsMessageOrCustom(dbei)) {
- buffer = DbEvent_GetTextW(&dbei, CP_ACP);
- if (buffer != nullptr) {
- CMStringW quotedBuffer(Srmm_Quote(buffer));
- m_message.SendMsg(EM_SETTEXTEX, (WPARAM)&st, (LPARAM)quotedBuffer.c_str());
- mir_free(buffer);
- }
+ ptrW wszText(DbEvent_GetTextW(&dbei, CP_ACP));
+ SetMessageText(Srmm_Quote(wszText));
}
}
SetFocus(m_message.GetHwnd());
diff --git a/plugins/Scriver/src/msgtimedout.cpp b/plugins/Scriver/src/msgtimedout.cpp
index 5595b5aaf6..2ea8412755 100644
--- a/plugins/Scriver/src/msgtimedout.cpp
+++ b/plugins/Scriver/src/msgtimedout.cpp
@@ -58,9 +58,7 @@ public:
m_errorText.SetText(m_wszDescr);
SetWindowText(m_hwnd, m_wszName);
- SETTEXTEX st = { 0 };
- st.flags = ST_DEFAULT;
- st.codepage = 1200;
+ SETTEXTEX st = { ST_DEFAULT, 1200 };
m_msgText.SendMsg(EM_SETTEXTEX, (WPARAM)&st, (LPARAM)m_wszText.get());
RECT rc, rcParent;
--
cgit v1.2.3