X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyx_gui_misc.C;h=1a937143ed6d3c84e2d4efadab669e332e00b9c6;hb=9f7498dbdf16f61cd5c9ee82e0cb6576d2bf620f;hp=539a3b1d56bd21765942d7331777ba4bbfc43fae;hpb=f65b7ff4ab2fe8ad0d9196c231064240e3fde81f;p=lyx.git

diff --git a/src/lyx_gui_misc.C b/src/lyx_gui_misc.C
index 539a3b1d56..1a937143ed 100644
--- a/src/lyx_gui_misc.C
+++ b/src/lyx_gui_misc.C
@@ -19,13 +19,10 @@
 #include "lyx_gui_misc.h"
 #include "BufferView.h"
 #include "buffer.h"
-#include "credits_form.h"
-#include "form1.h"
 #include "gettext.h"
-#include "lyx.h"
+#include "figure_form.h"
 #include "lyx_cb.h"
 #include "lyx_main.h"
-#include "mathed/math_forms.h"
 #include "minibuffer.h"
 #include "print_form.h"
 #include "sp_form.h"
@@ -40,16 +37,10 @@ using std::endl;
 
 extern BufferView * current_view;
 
-extern FD_form_credits * fd_form_credits;
 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 FD_panel  * fd_panel;
-extern FD_delim  * fd_delim;
-extern FD_deco   * fd_deco;
-extern FD_space  * fd_space;
-extern FD_matrix * fd_matrix;
 
 extern void HideFiguresPopups();
 
@@ -62,15 +53,6 @@ extern "C" int CancelCloseBoxCB(FL_FORM *, void *)
 // that the xform colors have been re-mapped).
 void RedrawAllBufferRelatedDialogs()
 {
-	if (fd_deco && fd_deco->deco->visible) {
-		fl_redraw_form(fd_deco->deco);
-	}
-	if (fd_delim && fd_delim->delim->visible) {
-		fl_redraw_form(fd_delim->delim);
-	}
-	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);
 	}
@@ -85,15 +67,6 @@ void RedrawAllBufferRelatedDialogs()
 	    fd_form_spell_options->form_spell_options->visible) {
 		fl_redraw_form(fd_form_spell_options->form_spell_options);
 	}
-	if (fd_matrix && fd_matrix->matrix->visible) {
-		fl_redraw_form(fd_matrix->matrix);
-	}
-	if (fd_panel && fd_panel->panel->visible) {
-		fl_redraw_form(fd_panel->panel);
-	}
-	if (fd_space && fd_space->space->visible) {
-		fl_redraw_form(fd_space->space);
-	}
 }
 
 // Prevents LyX from crashing when no buffers available
@@ -117,31 +90,6 @@ void CloseAllBufferRelatedDialogs()
 			fl_trigger_object(fd_form_spell_check->done);
 		}
 	}
-	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);
-		}
-	}
 	HideFiguresPopups();
 }
 
@@ -149,70 +97,6 @@ void CloseAllBufferRelatedDialogs()
 // Again the Signal/Slot mechanism is tailor made for this task.
 void updateAllVisibleBufferRelatedDialogs(bool)
 {
-	if (current_view->buffer() &&  current_view->buffer()->isReadonly()) {
-		// a little crude perhaps but it works. ARRae
-#ifndef ALWAYS_CLOSE_MATH_PANELS
-		// The math popups should be closed only if we switch
-		// to a readonly buffer
-		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
-	}
-
-	// 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();
 }