Minipage is no more (long live the box inset)

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

diff --git a/src/frontends/Alert.h b/src/frontends/Alert.h
index f49d1d587ce103a9b137b6883dea8758026f26c7..3b5f3636aa51c60ec0257a51df21cb1eb129e5ce 100644 (file)
--- a/src/frontends/Alert.h
+++ b/src/frontends/Alert.h
@@ -6,7 +6,7 @@
  *
  * \author John Levon
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
 #ifndef LYX_ALERT_H
@@ -14,35 +14,35 @@
 
 #include "support/lstrings.h"
 
-#include <algorithm>
 
 namespace Alert {
 
 /**
  * Prompt for a question. Returns 0-2 for the chosen button.
- * Set default_button to a reasonable value. b1-b3 should have
- * accelerators marked with an '&'. title should be a short summary.
- * Strings should be gettextised. Please think about the poor user.
+ * Set default_button and cancel_button to reasonable values. b1-b3
+ * should have accelerators marked with an '&'. title should be
+ * a short summary. Strings should be gettextised.
+ * Please think about the poor user.
  *
  * Remember to use boost::format. If you make any of these buttons
  * "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,
-          string const & b1, string const & b2, string const & b3 = string());
+int prompt(std::string const & title, std::string const & question,
+           int default_button, int cancel_button,
+          std::string const & b1, std::string const & b2, std::string const & b3 = std::string());
 
 /**
  * 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(std::string const & title, std::string 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(std::string const & title, std::string const & message);
 
 /**
  * Informational message. Use very very sparingly. That is, you must
@@ -50,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(std::string const & title, std::string 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, std::string> const
+askForText(std::string const & msg,
+          std::string const & dflt = std::string());
 
 }