From b07648410d660c5d89868cf4a53a986a5c9e490f Mon Sep 17 00:00:00 2001 From: Myaamori Date: Sun, 22 Nov 2020 18:17:19 +0000 Subject: [PATCH] Correct wxStyledTextCtrl::StartStyling for wx 3.1 --- src/dialog_fonts_collector.cpp | 6 +++++- src/dialog_translation.cpp | 6 +++++- src/subs_edit_ctrl.cpp | 6 +++++- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/src/dialog_fonts_collector.cpp b/src/dialog_fonts_collector.cpp index 78ac20ef5..d4d675e8a 100644 --- a/src/dialog_fonts_collector.cpp +++ b/src/dialog_fonts_collector.cpp @@ -400,7 +400,11 @@ void DialogFontsCollector::OnAddText(ValueEvent &event) { auto const& utf8 = str.second.utf8_str(); collection_log->AppendTextRaw(utf8.data(), utf8.length()); if (str.first) { - collection_log->StartStyling(pos, 31); +#if wxVERSION_NUMBER >= 3100 + collection_log->StartStyling(pos); +#else + collection_log->StartStyling(pos, 255); +#endif collection_log->SetStyling(utf8.length(), str.first); } collection_log->GotoPos(pos + utf8.length()); diff --git a/src/dialog_translation.cpp b/src/dialog_translation.cpp index c953b6874..b47d01b4c 100644 --- a/src/dialog_translation.cpp +++ b/src/dialog_translation.cpp @@ -246,7 +246,11 @@ void DialogTranslation::UpdateDisplay() { int initial_pos = original_text->GetLength(); original_text->AppendTextRaw(block->GetText().c_str()); if (i == cur_block) { - original_text->StartStyling(initial_pos, 31); +#if wxVERSION_NUMBER >= 3100 + original_text->StartStyling(initial_pos); +#else + original_text->StartStyling(initial_pos, 255); +#endif original_text->SetStyling(block->GetText().size(), 1); } } diff --git a/src/subs_edit_ctrl.cpp b/src/subs_edit_ctrl.cpp index 4618ea409..d744900eb 100644 --- a/src/subs_edit_ctrl.cpp +++ b/src/subs_edit_ctrl.cpp @@ -261,7 +261,11 @@ void SubsTextEditCtrl::UpdateStyle() { cursor_pos = -1; UpdateCallTip(); - StartStyling(0,255); +#if wxVERSION_NUMBER >= 3100 + StartStyling(0); +#else + StartStyling(0, 255); +#endif if (!OPT_GET("Subtitle/Highlight/Syntax")->GetBool()) { SetStyling(line_text.size(), 0);