From d9b56badbf5f569a4e769db99b8d7abc83c4baa3 Mon Sep 17 00:00:00 2001
From: Thomas Goyne <plorkyeran@aegisub.org>
Date: Tue, 30 Oct 2012 05:50:41 -0700
Subject: [PATCH] Use wxSTC::GetTextRaw rather than converting utf-8 ->
wxString -> utf-8
---
aegisub/src/scintilla_text_ctrl.cpp | 2 +-
aegisub/src/subs_edit_ctrl.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/aegisub/src/scintilla_text_ctrl.cpp b/aegisub/src/scintilla_text_ctrl.cpp
index a664373d6..282a7a56f 100644
--- a/aegisub/src/scintilla_text_ctrl.cpp
+++ b/aegisub/src/scintilla_text_ctrl.cpp
@@ -52,7 +52,7 @@ int ScintillaTextCtrl::GetUnicodePosition(int pos) {
/// @brief Reverse unicode-compatible position
int ScintillaTextCtrl::GetReverseUnicodePosition(int pos) {
- wxCharBuffer buffer = GetText().utf8_str();
+ wxCharBuffer buffer = GetTextRaw();
// Limit position to it
if (pos > (signed)buffer.length()) pos = buffer.length();
diff --git a/aegisub/src/subs_edit_ctrl.cpp b/aegisub/src/subs_edit_ctrl.cpp
index 05cc194d8..14d357987 100644
--- a/aegisub/src/subs_edit_ctrl.cpp
+++ b/aegisub/src/subs_edit_ctrl.cpp
@@ -283,7 +283,7 @@ void SubsTextEditCtrl::SetStyles() {
void SubsTextEditCtrl::UpdateStyle() {
StartStyling(0,255);
- std::string text = STD_STR(GetText());
+ std::string text = GetTextRaw().data();
if (!OPT_GET("Subtitle/Highlight/Syntax")->GetBool()) {
SetStyling(text.size(), 0);
--
GitLab