Fix working of the spellchecker dialog with ispell when there are no

[lyx.git] / src / lyx_gui_misc.C

diff --git a/src/lyx_gui_misc.C b/src/lyx_gui_misc.C
index fc743db396a9a49fe0a0a2a3113dfb62fa9efcca..dc4c6ca53734e13cab33fbfd70e6eb2cfed4863a 100644 (file)
--- a/src/lyx_gui_misc.C
+++ b/src/lyx_gui_misc.C
@@ -23,11 +23,11 @@
 #include "lyx_cb.h"
 #include "lyx_main.h"
 #include "print_form.h"
-#include "sp_form.h"
 #include "LyXView.h"
 #include "bufferview_funcs.h"
 #include "support/filetools.h"
 #include "lyxrc.h"
+#include "debug.h"
 
 using std::pair;
 using std::make_pair;
@@ -37,16 +37,18 @@ extern BufferView * current_view;
 
 extern FD_form_figure * fd_form_figure;
 extern FD_form_sendto * fd_form_sendto;
-extern FD_form_spell_check * fd_form_spell_check;
-extern FD_form_spell_options * fd_form_spell_options;
 
 extern void HideFiguresPopups();
 
+
 // Prevents LyX from being killed when the close box is pressed in a popup.
-extern "C" int CancelCloseBoxCB(FL_FORM *, void *)
+extern "C"
+int CancelCloseBoxCB(FL_FORM *, void *)
 {
        return FL_CANCEL;
 }
+
+
 // Redraw the form (on receipt of a Signal indicating, for example,
 // that the xform colors have been re-mapped).
 void RedrawAllBufferRelatedDialogs()
@@ -57,14 +59,6 @@ void RedrawAllBufferRelatedDialogs()
        if (fd_form_sendto->form_sendto->visible) {
                fl_redraw_form(fd_form_sendto->form_sendto);
        }
-       if (fd_form_spell_check &&
-           fd_form_spell_check->form_spell_check->visible) {
-               fl_redraw_form(fd_form_spell_check->form_spell_check);
-       }
-       if (fd_form_spell_options &&
-           fd_form_spell_options->form_spell_options->visible) {
-               fl_redraw_form(fd_form_spell_options->form_spell_options);
-       }
 }
 
 // Prevents LyX from crashing when no buffers available
@@ -83,11 +77,6 @@ void CloseAllBufferRelatedDialogs()
        if (fd_form_sendto->form_sendto->visible) {
                fl_hide_form(fd_form_sendto->form_sendto);
        }
-       if (fd_form_spell_check) {
-               if (fd_form_spell_check->form_spell_check->visible) {
-                       fl_trigger_object(fd_form_spell_check->done);
-               }
-       }
        HideFiguresPopups();
 }
 
@@ -142,12 +131,12 @@ void WriteAlert(string const & s1, string const & s2, string const & s3)
                lview = current_view->owner();
        if (lview) {
                /// Write to minibuffer
-               ProhibitInput(current_view);
+               lview->prohibitInput();
                string const msg = s1 + ' ' + s2 + ' ' + s3;
                lview->message(msg);
                fl_set_resource("flAlert.dismiss.label", _("Dismiss"));
                fl_show_alert(s1.c_str(), s2.c_str(), s3.c_str(), 0);
-               AllowInput(current_view);
+               lview->allowInput();
        } else {
                /// Write to lyxerr
                lyxerr << "----------------------------------------" << endl