X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyx_gui_misc.C;h=3d7983e67d2efea094034cb6e2518a5b520a9b97;hb=d4ee9c38b6aa45146f67658352623bcbc3e0ad9b;hp=99ea77f214fe3f29d36c5f7d4040dc9305ba9338;hpb=f6aaac088c411f6d03bab73695b14a5441ea85b1;p=lyx.git diff --git a/src/lyx_gui_misc.C b/src/lyx_gui_misc.C index 99ea77f214..3d7983e67d 100644 --- a/src/lyx_gui_misc.C +++ b/src/lyx_gui_misc.C @@ -19,10 +19,8 @@ #include "lyx_gui_misc.h" #include "BufferView.h" #include "buffer.h" -#include "credits_form.h" #include "form1.h" #include "gettext.h" -#include "layout_forms.h" #include "lyx.h" #include "lyx_cb.h" #include "lyx_main.h" @@ -41,10 +39,7 @@ using std::endl; extern BufferView * current_view; -extern FD_form_character * fd_form_character; -extern FD_form_credits * fd_form_credits; extern FD_form_figure * fd_form_figure; -extern FD_form_preamble * fd_form_preamble; 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; @@ -71,18 +66,9 @@ void RedrawAllBufferRelatedDialogs() if (fd_delim && fd_delim->delim->visible) { fl_redraw_form(fd_delim->delim); } - if (fd_form_character->form_character->visible) { - fl_redraw_form(fd_form_character->form_character); - } - if (fd_form_credits && fd_form_credits->form_credits->visible) { - fl_redraw_form(fd_form_credits->form_credits); - } if (fd_form_figure->form_figure->visible) { fl_redraw_form(fd_form_figure->form_figure); } - if (fd_form_preamble->form_preamble->visible) { - fl_redraw_form(fd_form_preamble->form_preamble); - } if (fd_form_sendto->form_sendto->visible) { fl_redraw_form(fd_form_sendto->form_sendto); } @@ -115,12 +101,6 @@ void CloseAllBufferRelatedDialogs() // have been created otherwise hiding one could cause a crash // need the visible check otherwise XForms prints a warning // if hiding an invisible form - if (fd_form_character->form_character->visible) { - fl_hide_form(fd_form_character->form_character); - } - if (fd_form_preamble->form_preamble->visible) { - fl_hide_form(fd_form_preamble->form_preamble); - } if (fd_form_figure->form_figure->visible) { fl_hide_form(fd_form_figure->form_figure); } @@ -164,15 +144,8 @@ void CloseAllBufferRelatedDialogs() // Again the Signal/Slot mechanism is tailor made for this task. void updateAllVisibleBufferRelatedDialogs(bool) { - if (fd_form_preamble->form_preamble->visible) { - UpdateLayoutPreamble(current_view); - } if (current_view->buffer() && current_view->buffer()->isReadonly()) { // a little crude perhaps but it works. ARRae - if (fd_form_character->form_character->visible) { - fl_hide_form(fd_form_character->form_character); - } -#ifndef ALWAYS_CLOSE_MATH_PANELS // The math popups should be closed only if we switch // to a readonly buffer if (fd_panel) { @@ -200,40 +173,7 @@ void updateAllVisibleBufferRelatedDialogs(bool) fl_hide_form(fd_matrix->matrix); } } -#endif - } - - // We have either changed buffers or changed the readonly status - // so the safest thing to do is hide all inset popups that - // are editting insets from the previous buffer or aren't - // allowed in readonly docs. -#ifdef ALWAYS_CLOSE_MATH_PANELS - if (fd_panel) { - if (fd_panel->panel->visible) { - fl_hide_form(fd_panel->panel); - } } - if (fd_delim) { - if (fd_delim->delim->visible) { - fl_hide_form(fd_delim->delim); - } - } - if (fd_deco) { - if (fd_deco->deco->visible) { - fl_hide_form(fd_deco->deco); - } - } - if (fd_space) { - if (fd_space->space->visible) { - fl_hide_form(fd_space->space); - } - } - if (fd_matrix) { - if (fd_matrix->matrix->visible) { - fl_hide_form(fd_matrix->matrix); - } - } -#endif HideFiguresPopups(); }