Introduce LFUN_PRINT.

[lyx.git] / src / frontends / xforms / Alert_pimpl.C

diff --git a/src/frontends/xforms/Alert_pimpl.C b/src/frontends/xforms/Alert_pimpl.C
index 298b4dfc1a13931f833d3b500113c6403bca2dde..02c62f84ecc43dd00d6343a20a3cacc9d681d6c8 100644 (file)
--- a/src/frontends/xforms/Alert_pimpl.C
+++ b/src/frontends/xforms/Alert_pimpl.C
@@ -5,53 +5,49 @@
  *
  * \author John Levon
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
 #include <config.h>
 
-
-#include "Alert.h"
 #include "Alert_pimpl.h"
+
 #include "forms_gettext.h"
-#include "gettext.h"
 #include "xforms_helpers.h"
 
-#include <algorithm>
+#include "debug.h"
+#include "gettext.h"
+
 #include <boost/tuple/tuple.hpp>
-#include FORMS_H_LOCATION
 
-using std::pair;
-using std::make_pair;
-using std::endl;
+#include "lyx_forms.h"
 
-void alert_pimpl(string const & s1, string const & s2, string const & s3)
-{
-       fl_set_resource("flAlert.dismiss.label", _("Dismiss"));
-       fl_show_alert(s1.c_str(), s2.c_str(), s3.c_str(), 0);
-}
+
+using std::make_pair;
+using std::pair;
+using std::string;
 
 
 void warning_pimpl(string const &, string const & message)
 {
-       fl_show_messages(message.c_str());
+       fl_show_messages(formatted(message, 300).c_str());
 }
 
 
 void error_pimpl(string const &, string const & message)
 {
-       fl_show_messages(message.c_str());
+       fl_show_messages(formatted(message, 300).c_str());
 }
 
 
 void information_pimpl(string const &, string const & message)
 {
-       fl_show_messages(message.c_str());
+       fl_show_messages(formatted(message, 300).c_str());
 }
 
 
 int prompt_pimpl(string const &, string const & question,
-           int default_button,
+           int default_button, int /*escape_button*/,
           string const & b1, string const & b2, string const & b3)
 {
        string b1label, b1sc;
@@ -60,15 +56,14 @@ int prompt_pimpl(string const &, string const & question,
        boost::tie(b1label, b1sc) = parse_shortcut(b1);
        boost::tie(b2label, b2sc) = parse_shortcut(b2);
        boost::tie(b3label, b3sc) = parse_shortcut(b3);
-       lyxerr  << "Parsed " << b1 << " as " << b1label << " and " << b1sc << endl;
 
        if (b3.empty()) {
                fl_set_choices_shortcut(b1sc.c_str(), b2sc.c_str(), "");
-               return fl_show_choices(question.c_str(),
+               return fl_show_choices(formatted(question, 300).c_str(),
                        2, b1label.c_str(), b2label.c_str(), "", default_button + 1) - 1;
        } else {
                fl_set_choices_shortcut(b1sc.c_str(), b2sc.c_str(), b3sc.c_str());
-               return fl_show_choices(question.c_str(),
+               return fl_show_choices(formatted(question, 300).c_str(),
                        3, b1label.c_str(), b2label.c_str(), b3label.c_str(),
                        default_button + 1) - 1;
        }