enable Font cache only for MacOSX and inline width() for other platform.

[lyx.git] / src / frontends / Alert.C

diff --git a/src/frontends/Alert.C b/src/frontends/Alert.C
index 1806e8dc90839ccb79ef3c3aa160aa460eaa0346..3bae1126f40bc1bee8ae48f52e3de225448c702f 100644 (file)
--- a/src/frontends/Alert.C
+++ b/src/frontends/Alert.C
@@ -11,30 +11,33 @@
 #include <config.h>
 
 #include "Alert.h"
+#include "Alert_pimpl.h"
 
 #include "debug.h"
 #include "lyx_gui.h"
 
-#include "Alert_pimpl.h"
+using lyx::docstring;
 
 using std::endl;
-using std::pair;
 using std::make_pair;
+using std::pair;
+using std::string;
 
-int Alert::prompt(string const & title, string const & question,
-           int default_button, int escape_button,
-          string const & b1, string const & b2, string const & b3)
+
+int Alert::prompt(docstring const & title, docstring const & question,
+                 int default_button, int escape_button,
+                 docstring const & b1, docstring const & b2, docstring const & b3)
 {
        if (!lyx_gui::use_gui || lyxerr.debugging()) {
-               lyxerr << title
-                      << "----------------------------------------"
-                      << question << endl;
+               lyxerr << lyx::to_utf8(title) << '\n'
+                      << "----------------------------------------\n"
+                      << lyx::to_utf8(question) << endl;
 
                lyxerr << "Assuming answer is ";
                switch (default_button) {
-               case 0: lyxerr << b1 << endl;
-               case 1: lyxerr << b2 << endl;
-               case 2: lyxerr << b3 << endl;
+               case 0: lyxerr << lyx::to_utf8(b1) << endl;
+               case 1: lyxerr << lyx::to_utf8(b2) << endl;
+               case 2: lyxerr << lyx::to_utf8(b3) << endl;
                }
                if (!lyx_gui::use_gui)
                        return default_button;
@@ -46,51 +49,51 @@ int Alert::prompt(string const & title, string const & question,
 }
 
 
-void Alert::warning(string const & title, string const & message)
+void Alert::warning(docstring const & title, docstring const & message)
 {
        if (!lyx_gui::use_gui || lyxerr.debugging())
-               lyxerr << "Warning: " << title
-                      << "----------------------------------------"
-                      << message << endl;
+               lyxerr << "Warning: " << lyx::to_utf8(title) << '\n'
+                      << "----------------------------------------\n"
+                      << lyx::to_utf8(message) << endl;
        if (lyx_gui::use_gui)
                warning_pimpl(title, message);
 }
 
 
-void Alert::error(string const & title, string const & message)
+void Alert::error(docstring const & title, docstring const & message)
 {
        if (!lyx_gui::use_gui || lyxerr.debugging())
-               lyxerr << "Error: " << title << '\n'
+               lyxerr << "Error: " << lyx::to_utf8(title) << '\n'
                       << "----------------------------------------\n"
-                      << message << endl;
+                      << lyx::to_utf8(message) << endl;
 
        if (lyx_gui::use_gui)
                error_pimpl(title, message);
 }
 
 
-void Alert::information(string const & title, string const & message)
+void Alert::information(docstring const & title, docstring const & message)
 {
        if (!lyx_gui::use_gui || lyxerr.debugging())
-               lyxerr << title
-                      << "----------------------------------------"
-                      << message << endl;
+               lyxerr << lyx::to_utf8(title) << '\n'
+                      << "----------------------------------------\n"
+                      << lyx::to_utf8(message) << endl;
 
        if (lyx_gui::use_gui)
                information_pimpl(title, message);
 }
 
 
-pair<bool, string> const Alert::askForText(string const & msg,
-                                          string const & dflt)
+pair<bool, docstring> const Alert::askForText(docstring const & msg,
+                                          docstring const & dflt)
 {
        if (!lyx_gui::use_gui || lyxerr.debugging()) {
                lyxerr << "----------------------------------------\n"
-                      << msg << '\n'
-                      << "Assuming answer is " << dflt << '\n'
+                      << lyx::to_utf8(msg) << '\n'
+                      << "Assuming answer is " << lyx::to_utf8(dflt) << '\n'
                       << "----------------------------------------" << endl;
                if (!lyx_gui::use_gui)
-                       return make_pair<bool, string>(true, dflt);
+                       return make_pair<bool, docstring>(true, dflt);
        }
 
        return askForText_pimpl(msg, dflt);