fix the smallcaps drawing, move xfont metrics functions out from LyXFont, move non...

[lyx.git] / src / lyx_gui_misc.C

diff --git a/src/lyx_gui_misc.C b/src/lyx_gui_misc.C
index 1bd09b6672771ce0196dec471cc782d2791d8648..96959eb131b77010bd5e319a122a645ddcb5f32c 100644 (file)
--- a/src/lyx_gui_misc.C
+++ b/src/lyx_gui_misc.C
@@ -5,7 +5,7 @@
  *           LyX, The Document Processor
  *        
  *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-1999 The LyX Team.
+ *           Copyright 1995-2000 The LyX Team.
  *
  * ====================================================== */
 
@@ -32,11 +32,13 @@
 #include "insets/insetindex.h"
 #include "LyXView.h"
 
+using std::pair;
+using std::make_pair;
+
 extern BufferView * current_view;
 
 extern FD_form_paragraph * fd_form_paragraph;
 extern FD_form_paragraph_extra * fd_form_paragraph_extra;
-extern FD_form_search * fd_form_search;
 extern FD_form_character * fd_form_character;
 extern FD_form_document * fd_form_document;
 extern FD_form_paper * fd_form_paper;
@@ -96,9 +98,6 @@ void CloseAllBufferRelatedPopups()
        if (fd_form_paragraph_extra->form_paragraph_extra->visible) {
                fl_hide_form(fd_form_paragraph_extra->form_paragraph_extra);
        }
-       if (fd_form_search->form_search->visible) {
-               fl_hide_form(fd_form_search->form_search);
-       }
        if (fd_form_character->form_character->visible) {
                fl_hide_form(fd_form_character->form_character);
        }
@@ -370,11 +369,7 @@ bool AskQuestion(string const & s1, string const & s2, string const & s3)
 {
        fl_set_resource("flQuestion.yes.label", idex(_("Yes|Yy#y")));
        fl_set_resource("flQuestion.no.label", idex(_("No|Nn#n")));
-#if FL_REVISION > 85
        return fl_show_question((s1 + "\n" + s2 + "\n" + s3).c_str(), 0);
-#else
-       return fl_show_question(s1.c_str(), s2.c_str(), s3.c_str());
-#endif
 }
 
 
@@ -384,18 +379,10 @@ int AskConfirmation(string const & s1, string const & s2, string const & s3)
        fl_set_choices_shortcut(scex(_("Yes|Yy#y")),
                                scex(_("No|Nn#n")),
                                scex(_("Cancel|^[")));
-#if FL_REVISION < 86
-        return fl_show_choice(s1.c_str(), s2.c_str(), s3.c_str(), 
-                             3, idex(_("Yes|Yy#y")),
-                             idex(_("No|Nn#n")),
-                             idex(_("Cancel|^[")));
-#endif
-#if FL_REVISION > 85
         return fl_show_choice(s1.c_str(), s2.c_str(), s3.c_str(), 
                              3, idex(_("Yes|Yy#y")),
                              idex(_("No|Nn#n")),
                               idex(_("Cancel|^[")), 3);
-#endif
 }