Dekel's patch -- I didn't fix the xforms-0.88 keysyms stuff so it still doesn't finis...

[lyx.git] / src / lyx_gui_misc.C

diff --git a/src/lyx_gui_misc.C b/src/lyx_gui_misc.C
index fd6cfd211948cc767c6522e64482c7d43f3ecc78..4e1ca11ebc0af9678417df38e656ae488257a2a3 100644 (file)
--- a/src/lyx_gui_misc.C
+++ b/src/lyx_gui_misc.C
@@ -33,7 +33,6 @@
 #include "minibuffer.h"
 #include "print_form.h"
 #include "sp_form.h"
-#include "insets/insetindex.h"
 #include "LyXView.h"
 #include "bufferview_funcs.h"
 #include "support/filetools.h"
@@ -54,7 +53,6 @@ extern FD_form_preamble * fd_form_preamble;
 extern FD_form_table * fd_form_table;
 extern FD_form_sendto * fd_form_sendto;
 extern FD_form_figure * fd_form_figure;
-extern FD_form_ref * fd_form_ref;
 extern FD_form_paragraph_extra * fd_form_paragraph_extra;
 extern FD_LaTeXLog * fd_latex_log;
 extern FD_form_spell_check * fd_form_spell_check;
@@ -66,7 +64,6 @@ extern FD_space  * fd_space;
 extern FD_matrix * fd_matrix;
 extern FD_bibitem_form * bibitem_form;
 extern FD_include * form;
-extern FD_index_form * index_form;
 
 extern void HideFiguresPopups();
 
@@ -118,9 +115,6 @@ void CloseAllBufferRelatedDialogs()
        if (fd_form_figure->form_figure->visible) {
                fl_hide_form(fd_form_figure->form_figure);
        }
-       if (fd_form_ref->form_ref->visible) {
-               fl_hide_form(fd_form_ref->form_ref);
-       }
        if (fd_form_paper->form_paper->visible) {
                fl_hide_form(fd_form_paper->form_paper);
        }
@@ -178,11 +172,6 @@ void CloseAllBufferRelatedDialogs()
                        fl_hide_form(form->include);
                }
        }
-       if (index_form) {
-               if (index_form->index_form->visible) {
-                       fl_hide_form(index_form->index_form);
-               }
-       }
        HideFiguresPopups();
 }
 
@@ -219,19 +208,6 @@ void updateAllVisibleBufferRelatedDialogs()
        if (fd_latex_log->LaTeXLog->visible) {
                LatexLogUpdate(0,0);
        }
-#ifdef ALWAYS_UPDATE_REF
-       // Ideally, the RefUpdateCB should be modified so that if the
-       // current document is a subdocument the reference list should come
-       // from master document (or even be a merger of references from all
-       // its sibling documents).  For now this has effectively been
-       // commented out to ensure that users of multipart documents can
-       // access the reference list of a different document.  This is
-       // of course a compromise and an annoyance for users switching
-       // between separate documents.  ARRae 241198
-       if (fd_form_ref->form_ref->visible) {
-               RefUpdateCB(0, 0);
-       }
-#endif
        if (current_view->buffer()->isReadonly()) {
                // a little crude perhaps but it works. ARRae
                if (fd_form_character->form_character->visible) {
@@ -241,14 +217,6 @@ void updateAllVisibleBufferRelatedDialogs()
                        fl_hide_form(fd_form_table->form_table);
                }
 
-#ifndef ALWAYS_UPDATE_REF
-               // We must update the popup in order to make the
-               // insert ref buttons insactive
-               if (fd_form_ref->form_ref->visible) {
-                       RefUpdateCB(0, 0);
-               }
-#endif
-
 #ifndef ALWAYS_CLOSE_MATH_PANELS
                // The math popups should be closed only if we switch
                // to a readonly buffer
@@ -321,11 +289,6 @@ void updateAllVisibleBufferRelatedDialogs()
                        fl_hide_form(form->include);
                }
        }
-       if (index_form) {
-               if (index_form->index_form->visible) {
-                       fl_hide_form(index_form->index_form);
-               }
-       }
        HideFiguresPopups();
 }
 
@@ -413,7 +376,8 @@ int AskConfirmation(string const & s1, string const & s2, string const & s3)
 
 
 // Asks for a text
-pair<bool, string> askForText(string const & msg, string const & dflt)
+pair<bool, string> const
+askForText(string const & msg, string const & dflt)
 {
        fl_set_resource("flInput.cancel.label", idex(_("Cancel|^[")));
        fl_set_resource("flInput.ok.label", idex(_("OK|#O")));