diff options
| -rw-r--r-- | include/m_gui.h | 1 | ||||
| -rw-r--r-- | libs/win32/mir_core.lib | bin | 317544 -> 317222 bytes | |||
| -rw-r--r-- | libs/win64/mir_core.lib | bin | 318516 -> 318184 bytes | |||
| -rw-r--r-- | plugins/Scriver/src/input.cpp | 2 | ||||
| -rw-r--r-- | plugins/Scriver/src/msgdialog.cpp | 4 | ||||
| -rw-r--r-- | src/mir_core/src/CCtrlRichEdit.cpp | 17 | ||||
| -rw-r--r-- | src/mir_core/src/mir_core.def | 1 | ||||
| -rw-r--r-- | src/mir_core/src/mir_core64.def | 1 |
8 files changed, 3 insertions, 23 deletions
diff --git a/include/m_gui.h b/include/m_gui.h index 7a48523938..2c3bba960b 100644 --- a/include/m_gui.h +++ b/include/m_gui.h @@ -807,7 +807,6 @@ public: // returns a buffer that should be freed using mir_free() or ptrA/ptrW
char* GetRichTextRtf(bool bText = false, bool bSelection = false) const; // returns text with formatting
- char* GetRichTextUtf() const; // returns only text in utf8
wchar_t* GetRichText() const; // returns only text in ucs2
// these methods return text length in Unicode chars
diff --git a/libs/win32/mir_core.lib b/libs/win32/mir_core.lib Binary files differindex 34233a6070..4d146f0474 100644 --- a/libs/win32/mir_core.lib +++ b/libs/win32/mir_core.lib diff --git a/libs/win64/mir_core.lib b/libs/win64/mir_core.lib Binary files differindex ba1d3709a7..147ada0405 100644 --- a/libs/win64/mir_core.lib +++ b/libs/win64/mir_core.lib diff --git a/plugins/Scriver/src/input.cpp b/plugins/Scriver/src/input.cpp index 7b2c7d5379..f9d96235c6 100644 --- a/plugins/Scriver/src/input.cpp +++ b/plugins/Scriver/src/input.cpp @@ -207,7 +207,7 @@ int CScriverWindow::InputAreaShortcuts(HWND hwnd, UINT msg, WPARAM wParam, LPARA cmdListNew = tcmdlist_last(cmdList);
}
if (cmdListNew != nullptr) {
- char *textBuffer = m_message.GetRichTextUtf();
+ char *textBuffer = m_message.GetRichTextRtf(true);
if (textBuffer != nullptr)
// takes textBuffer to a queue, no leak here
cmdList = tcmdlist_append(cmdList, textBuffer, 20, TRUE);
diff --git a/plugins/Scriver/src/msgdialog.cpp b/plugins/Scriver/src/msgdialog.cpp index cebfea6c55..e692c47a26 100644 --- a/plugins/Scriver/src/msgdialog.cpp +++ b/plugins/Scriver/src/msgdialog.cpp @@ -391,7 +391,7 @@ void CSrmmWindow::OnDestroy() ReleaseSendQueueItems(m_hwnd);
if (g_dat.flags & SMF_SAVEDRAFTS) {
- ptrA szText(m_message.GetRichTextUtf());
+ ptrA szText(m_message.GetRichTextRtf(true));
if (szText)
db_set_utf(m_hContact, "SRMM", "SavedMsg", szText);
else
@@ -438,7 +438,7 @@ void CSrmmWindow::onClick_Ok(CCtrlButton *pButton) if (pf2.wEffects & PFE_RTLPARA)
msi.flags |= PREF_RTL;
- msi.sendBuffer = m_message.GetRichTextUtf();
+ msi.sendBuffer = m_message.GetRichTextRtf(true);
msi.sendBufferSize = (int)mir_strlen(msi.sendBuffer);
if (msi.sendBufferSize == 0)
return;
diff --git a/src/mir_core/src/CCtrlRichEdit.cpp b/src/mir_core/src/CCtrlRichEdit.cpp index 5fd2203d5d..1a1abc11fc 100644 --- a/src/mir_core/src/CCtrlRichEdit.cpp +++ b/src/mir_core/src/CCtrlRichEdit.cpp @@ -44,23 +44,6 @@ int CCtrlRichEdit::GetRichTextLength(int iCodePage) const return (int)SendMessage(m_hwnd, EM_GETTEXTLENGTHEX, (WPARAM)>l, 0); } -char* CCtrlRichEdit::GetRichTextUtf() const -{ - int textBufferSize = GetRichTextLength(CP_UTF8); - if (textBufferSize == 0) - return nullptr; - - textBufferSize++; - char *textBuffer = (char*)mir_alloc(textBufferSize+1); - - GETTEXTEX gt = {}; - gt.cb = textBufferSize; - gt.flags = GT_USECRLF; - gt.codepage = CP_UTF8; - SendMessage(m_hwnd, EM_GETTEXTEX, (WPARAM)>, (LPARAM)textBuffer); - return textBuffer; -} - int CCtrlRichEdit::SetRichText(const wchar_t *text) { SETTEXTEX st; diff --git a/src/mir_core/src/mir_core.def b/src/mir_core/src/mir_core.def index 5fd89d1bca..f5037de864 100644 --- a/src/mir_core/src/mir_core.def +++ b/src/mir_core/src/mir_core.def @@ -1045,7 +1045,6 @@ CallFunctionSync @1170 ?GetRichTextLength@CCtrlRichEdit@@QBEHH@Z @1232 NONAME
?SetRichText@CCtrlRichEdit@@QAEHPB_W@Z @1233 NONAME
?SetRichTextRtf@CCtrlRichEdit@@QAEHPBD@Z @1234 NONAME
-?GetRichTextUtf@CCtrlRichEdit@@QBEPADXZ @1235 NONAME
?GetRichTextRtf@CCtrlRichEdit@@QBEPAD_N0@Z @1236 NONAME
?SetReadOnly@CCtrlRichEdit@@QAEX_N@Z @1237 NONAME
?Hide@CDlgBase@@QAEXXZ @1238 NONAME
diff --git a/src/mir_core/src/mir_core64.def b/src/mir_core/src/mir_core64.def index 02fa033f13..31edd2dbea 100644 --- a/src/mir_core/src/mir_core64.def +++ b/src/mir_core/src/mir_core64.def @@ -1045,7 +1045,6 @@ CallFunctionSync @1170 ?GetRichTextLength@CCtrlRichEdit@@QEBAHH@Z @1232 NONAME
?SetRichText@CCtrlRichEdit@@QEAAHPEB_W@Z @1233 NONAME
?SetRichTextRtf@CCtrlRichEdit@@QEAAHPEBD@Z @1234 NONAME
-?GetRichTextUtf@CCtrlRichEdit@@QEBAPEADXZ @1235 NONAME
?GetRichTextRtf@CCtrlRichEdit@@QEBAPEAD_N0@Z @1236 NONAME
?SetReadOnly@CCtrlRichEdit@@QEAAX_N@Z @1237 NONAME
?Hide@CDlgBase@@QEAAXXZ @1238 NONAME
|