From 4ea2bf14db30f631eb1e44ce364cc54979c1e4ef Mon Sep 17 00:00:00 2001 From: Angus Leeming Date: Thu, 5 May 2005 21:08:18 +0000 Subject: [PATCH] Disable various spell thingies when USE_[AIP]SPELL is not defined. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9912 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/ChangeLog | 5 +++++ src/frontends/qt2/ChangeLog | 3 +++ src/frontends/qt2/QPrefsDialog.C | 4 ++++ src/frontends/xforms/ChangeLog | 5 +++++ src/frontends/xforms/FormPreferences.C | 4 ++++ src/lyx_cb.C | 2 +- src/lyxfunc.C | 8 ++++++-- 7 files changed, 28 insertions(+), 3 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index e6cecbda44..c91f25e73f 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2005-05-04 Angus Leeming + + * lyxfunc.C (getStatus): disable the spell checker dialog if + none of USE_[AIP]SPELL are defined. + 2005-05-05 Martin Vermeer * tabular.C (setWidthOfCell): remove obsolete comment diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog index 3aa95eb77d..fec180a074 100644 --- a/src/frontends/qt2/ChangeLog +++ b/src/frontends/qt2/ChangeLog @@ -1,5 +1,8 @@ 2005-05-04 Angus Leeming + * QPrefsDialog.C (QPrefsDialog): disable the spellCommandCO if + USE_ISPELL is not defined. + * ui/Makefile.am (CLEANFILES): add *Module.h and *Dialog.h. 2005-05-02 Jürgen Spitzmüller diff --git a/src/frontends/qt2/QPrefsDialog.C b/src/frontends/qt2/QPrefsDialog.C index 35b3401d99..695590e86e 100644 --- a/src/frontends/qt2/QPrefsDialog.C +++ b/src/frontends/qt2/QPrefsDialog.C @@ -257,7 +257,11 @@ QPrefsDialog::QPrefsDialog(QPrefs * form) connect(pathsModule->tempDirED, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor())); connect(pathsModule->lyxserverDirED, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor())); connect(pathsModule->pathPrefixED, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor())); +#if defined (USE_ISPELL) connect(spellcheckerModule->spellCommandCO, SIGNAL(activated(int)), this, SLOT(change_adaptor())); +#else + spellcheckerModule->spellCommandCO->setEnabled(false); +#endif connect(spellcheckerModule->altLanguageED, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor())); connect(spellcheckerModule->escapeCharactersED, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor())); connect(spellcheckerModule->persDictionaryED, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor())); diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog index e76130eaad..01c6492359 100644 --- a/src/frontends/xforms/ChangeLog +++ b/src/frontends/xforms/ChangeLog @@ -1,3 +1,8 @@ +2005-05-04 Angus Leeming + + * FormPreferences.C (SpellOptions::build): disable the + choice_spell_command if USE_ISPELL is not defined. + 2005-05-04 Michael Schmitt * forms/form_preferences.fd: fix capitalization. diff --git a/src/frontends/xforms/FormPreferences.C b/src/frontends/xforms/FormPreferences.C index a55055b026..8fa27dfdbe 100644 --- a/src/frontends/xforms/FormPreferences.C +++ b/src/frontends/xforms/FormPreferences.C @@ -2990,6 +2990,10 @@ void FormPreferences::SpellOptions::build() fl_set_input_return(dialog_->input_escape_chars, FL_RETURN_CHANGED); fl_set_input_return(dialog_->input_personal_dict, FL_RETURN_CHANGED); +#if !defined (USE_ISPELL) + setEnabled(dialog_->choice_spell_command, false); +#endif + // set up the feedback mechanism setPrehandler(dialog_->choice_spell_command); setPrehandler(dialog_->check_alt_lang); diff --git a/src/lyx_cb.C b/src/lyx_cb.C index 2112cda246..c58ee30d7f 100644 --- a/src/lyx_cb.C +++ b/src/lyx_cb.C @@ -44,7 +44,7 @@ #include "support/path.h" #include "support/systemcall.h" -#ifdef _WIN32 +#if !defined (HAVE_FORK) # define fork() -1 #endif diff --git a/src/lyxfunc.C b/src/lyxfunc.C index 2104c4a859..91d89b0df7 100644 --- a/src/lyxfunc.C +++ b/src/lyxfunc.C @@ -493,10 +493,14 @@ FuncStatus LyXFunc::getStatus(FuncRequest const & cmd) const && lyxrc.print_command != "none"; else if (name == "character" || name == "mathpanel") enable = cur.inset().lyxCode() != InsetBase::ERT_CODE; - else if (name == "vclog") - enable = buf->lyxvc().inUse(); else if (name == "latexlog") enable = IsFileReadable(buf->getLogName().second); +#if !defined (USE_ASPELL) && !defined (USE_ISPELL) && !defined (USE_PSPELL) + else if (name == "spellchecker") + enable = false; +#endif + else if (name == "vclog") + enable = buf->lyxvc().inUse(); break; } -- 2.39.5