From cb0af6ca35832e453f4d966a8348ca8caef6a943 Mon Sep 17 00:00:00 2001 From: scx Date: Sat, 7 Sep 2019 23:38:06 +0200 Subject: [PATCH] Fix crash on right click due to no spell checker See: #131 --- src/spellchecker.cpp | 2 ++ src/subs_edit_ctrl.cpp | 15 ++++++++------- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/spellchecker.cpp b/src/spellchecker.cpp index 4e328ab22..3d99d4de1 100644 --- a/src/spellchecker.cpp +++ b/src/spellchecker.cpp @@ -22,10 +22,12 @@ #include #include +#ifdef __APPLE__ namespace agi { class OptionValue; std::unique_ptr CreateCocoaSpellChecker(OptionValue *opt); } +#endif std::unique_ptr SpellCheckerFactory::GetSpellChecker() { #ifdef __APPLE__ diff --git a/src/subs_edit_ctrl.cpp b/src/subs_edit_ctrl.cpp index 4618ea409..46193289b 100644 --- a/src/subs_edit_ctrl.cpp +++ b/src/subs_edit_ctrl.cpp @@ -366,15 +366,16 @@ void SubsTextEditCtrl::OnContextMenu(wxContextMenuEvent &event) { currentWord = line_text.substr(currentWordPos.first, currentWordPos.second); wxMenu menu; - if (spellchecker) + if (spellchecker) { AddSpellCheckerEntries(menu); - // Append language list - menu.Append(-1,_("Spell checker language"), GetLanguagesMenu( - EDIT_MENU_DIC_LANGS, - to_wx(OPT_GET("Tool/Spell Checker/Language")->GetString()), - to_wx(spellchecker->GetLanguageList()))); - menu.AppendSeparator(); + // Append language list + menu.Append(-1, _("Spell checker language"), GetLanguagesMenu( + EDIT_MENU_DIC_LANGS, + to_wx(OPT_GET("Tool/Spell Checker/Language")->GetString()), + to_wx(spellchecker->GetLanguageList()))); + menu.AppendSeparator(); + } AddThesaurusEntries(menu);