removed a warning from screen and added CFLAGS in lyx.spec.in.

[lyx.git] / src / lyx_gui_misc.C

diff --git a/src/lyx_gui_misc.C b/src/lyx_gui_misc.C
index a2ec1fa870120d62765f423d904a1116ec8d572a..0260d6d28268d68f4cc8e6a194620435976c01d8 100644 (file)
--- a/src/lyx_gui_misc.C
+++ b/src/lyx_gui_misc.C
@@ -1,17 +1,17 @@
 // -*- C++ -*-
 /* This file is part of
-* ======================================================
-* 
-*           LyX, The Document Processor
-*        
-*           Copyright (C) 1995 Matthias Ettrich
-*           Copyright (C) 1995-1998 The LyX Team.
-*
-*======================================================*/
+ * ======================================================
+ * 
+ *           LyX, The Document Processor
+ *        
+ *           Copyright 1995 Matthias Ettrich
+ *           Copyright 1995-1999 The LyX Team.
+ *
+ * ======================================================*/
 
 #include <config.h>
 
-#include <errno.h>
+#include <cerrno>
 #include "lyx_gui_misc.h"
 #include "BufferView.h"
 #include "bibforms.h"
@@ -33,12 +33,6 @@
 
 extern MiniBuffer *minibuffer;
 extern BufferView *current_view;
-//     $Id: lyx_gui_misc.C,v 1.1 1999/09/27 18:44:37 larsbj Exp $      
-
-#if !defined(lint) && !defined(WITH_WARNINGS)
-static char vcid[] = "$Id: lyx_gui_misc.C,v 1.1 1999/09/27 18:44:37 larsbj Exp $";
-#endif /* lint */
-
 
 extern FD_form_paragraph * fd_form_paragraph;
 extern FD_form_paragraph_extra * fd_form_paragraph_extra;
@@ -76,14 +70,14 @@ extern void TocUpdateCB();
 extern void HideFiguresPopups();
 
 // Prevents LyX from being killed when the close box is pressed in a popup.
-int CancelCloseBoxCB(FL_FORM *, void *)
+extern "C" int CancelCloseBoxCB(FL_FORM *, void *)
 {
        return FL_CANCEL;
 }
 
 
 // Prevents LyX from being killed when the close box is pressed in a popup.
-int IgnoreCloseBoxCB(FL_FORM *, void *)
+extern "C" int IgnoreCloseBoxCB(FL_FORM *, void *)
 {
        return FL_IGNORE;
 }
@@ -327,7 +321,7 @@ const char* flyx_shortcut_extract(const char*sc)
 
        if (sd[0]=='|') {
                sd++;
-               //fprintf(stderr, "%s\n", sd);
+               //lyxerr << sd << endl;
                return sd;
        }
        return "";
@@ -353,7 +347,7 @@ const char* flyx_ident_extract(const char *sc)
 }
 
 //
-void WriteAlert(LString const & s1, LString const & s2, LString const & s3)
+void WriteAlert(string const & s1, string const & s2, string const & s3)
 {
        if (minibuffer) {
                ProhibitInput();
@@ -369,13 +363,13 @@ void WriteAlert(LString const & s1, LString const & s2, LString const & s3)
 
 
 // Alarms user of something related to files
-void WriteFSAlert(LString const & s1, LString const & s2)
+void WriteFSAlert(string const & s1, string const & s2)
 {
        WriteAlert (s1, s2, strerror(errno));
 }
 
 
-bool AskQuestion(LString const & s1, LString const & s2, LString const & s3)
+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")));
@@ -387,7 +381,7 @@ bool AskQuestion(LString const & s1, LString const & s2, LString const & s3)
 }
 
 // Returns 1 for yes, 2 for no, 3 for cancel.
-int AskConfirmation(LString const & s1, LString const & s2, LString const & s3)
+int AskConfirmation(string const & s1, string const & s2, string const & s3)
 {
        fl_set_choices_shortcut(scex(_("Yes|Yy#y")),
                                scex(_("No|Nn#n")),
@@ -408,9 +402,9 @@ int AskConfirmation(LString const & s1, LString const & s2, LString const & s3)
 
 
 // Asks for a text
-LString askForText(LString const & msg, LString const & dflt)
+string askForText(string const & msg, string const & dflt)
 {
-       LString tmp;
+       string tmp;
        fl_set_resource("flInput.cancel.label", idex(_("Cancel|^[")));
        fl_set_resource("flInput.ok.label", idex(_("OK|#O")));
        fl_set_resource("flInput.clear.label", idex(_("Clear|#e")));