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

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

diff --git a/src/frontends/Alert.h b/src/frontends/Alert.h
index b79c2e47e32a8a7bab233ecc532f781cc13a2f1c..716b1a700b867b15becd46879c1e6c5f18cc7943 100644 (file)
--- a/src/frontends/Alert.h
+++ b/src/frontends/Alert.h
@@ -14,7 +14,6 @@
 
 #include "support/lstrings.h"
 
-#include <algorithm>
 
 namespace Alert {
 
@@ -29,21 +28,21 @@ namespace Alert {
  * "Yes" or "No", I will personally come around to your house and
  * slap you with fish, and not in an enjoyable way either.
  */
-int prompt(string const & title, string const & question,
-           int default_button, int cancel_button,
-          string const & b1, string const & b2, string const & b3 = string());
+int prompt(lyx::docstring const & title, lyx::docstring const & question,
+          int default_button, int cancel_button,
+          lyx::docstring const & b1, lyx::docstring const & b2, lyx::docstring const & b3 = lyx::docstring());
 
 /**
  * Display a warning to the user. Title should be a short (general) summary.
  * Only use this if the user cannot perform some remedial action.
  */
-void warning(string const & title, string const & message);
+void warning(lyx::docstring const & title, lyx::docstring const & message);
 
 /**
  * Display a warning to the user. Title should be a short (general) summary.
  * Only use this if the user cannot perform some remedial action.
  */
-void error(string const & title, string const & message);
+void error(lyx::docstring const & title, lyx::docstring const & message);
 
 /**
  * Informational message. Use very very sparingly. That is, you must
@@ -51,12 +50,12 @@ void error(string const & title, string const & message);
  * and reciting the Nicene Creed, whilst running uphill and also
  * eating.
  */
-void information(string const & title, string const & message);
+void information(lyx::docstring const & title, lyx::docstring const & message);
 
 /// Asks for a text. DO NOT USE !!
-std::pair<bool, string> const
-askForText(string const & msg,
-          string const & dflt = string());
+std::pair<bool, lyx::docstring> const
+askForText(lyx::docstring const & msg,
+          lyx::docstring const & dflt = lyx::docstring());
 
 }