Change glob() API to accept a dir parameter.

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

diff --git a/src/frontends/gtk/Alert_pimpl.C b/src/frontends/gtk/Alert_pimpl.C
index d39033978f6e2593b2ea6047d61d70f75c258f64..00f9c433e2c63d3e4329387ce590f8312b235149 100644 (file)
--- a/src/frontends/gtk/Alert_pimpl.C
+++ b/src/frontends/gtk/Alert_pimpl.C
@@ -1,19 +1,27 @@
 /**
- * \file Alert_pimpl.C
+ * \file gtk/Alert_pimpl.C
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
  * \author Huang Ying
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
 #include <config.h>
-#include <gtkmm.h>
+
+// Too hard to make concept checks work with this file
+#ifdef _GLIBCPP_CONCEPT_CHECKS
+#undef _GLIBCPP_CONCEPT_CHECKS
+#endif
 
 #include "frontends/Alert.h"
 #include "frontends/Alert_pimpl.h"
 
+#include <gtkmm.h>
+
+using std::string;
+
 
 namespace {
 
@@ -35,8 +43,8 @@ string translateShortcut(string const & str)
 void warning_pimpl(string const &, string const & message)
 {
        Gtk::MessageDialog dlg(Glib::locale_to_utf8(message),
-                              Gtk::MESSAGE_WARNING,
-                              Gtk::BUTTONS_CLOSE, true, true);
+                              true, Gtk::MESSAGE_WARNING,
+                              Gtk::BUTTONS_CLOSE, true);
        dlg.run();
 }
 
@@ -44,8 +52,8 @@ void warning_pimpl(string const &, string const & message)
 void error_pimpl(string const &, string const & message)
 {
        Gtk::MessageDialog dlg(Glib::locale_to_utf8(message),
-                              Gtk::MESSAGE_ERROR,
-                              Gtk::BUTTONS_CLOSE, true, true);
+                              true, Gtk::MESSAGE_ERROR,
+                              Gtk::BUTTONS_CLOSE, true);
        dlg.run();
 }
 
@@ -53,8 +61,8 @@ void error_pimpl(string const &, string const & message)
 void information_pimpl(string const &, string const & message)
 {
        Gtk::MessageDialog dlg(Glib::locale_to_utf8(message),
-                              Gtk::MESSAGE_INFO,
-                              Gtk::BUTTONS_CLOSE, true, true);
+                              true, Gtk::MESSAGE_INFO,
+                              Gtk::BUTTONS_CLOSE, true);
        dlg.run();
 }
 
@@ -69,8 +77,8 @@ int prompt_pimpl(string const &, string const & question,
        if (!b3.empty())
                gb3 = Glib::locale_to_utf8(translateShortcut(b3));
        Gtk::MessageDialog dlg(Glib::locale_to_utf8(question),
-                              Gtk::MESSAGE_QUESTION,
-                              Gtk::BUTTONS_NONE, true, true);
+                              true, Gtk::MESSAGE_QUESTION,
+                              Gtk::BUTTONS_NONE, true);
        dlg.add_button(gb1, 0);
        dlg.add_button(gb2, 1);
        if (!b3.empty())
@@ -84,9 +92,9 @@ std::pair<bool, string> const askForText_pimpl(string const & msg,
                                               string const & dflt)
 {
        Gtk::MessageDialog dlg(Glib::locale_to_utf8(msg),
-                              Gtk::MESSAGE_QUESTION,
+                              true, Gtk::MESSAGE_QUESTION,
                               Gtk::BUTTONS_OK_CANCEL,
-                              true, true);
+                              true);
        Gtk::Entry entry;
        entry.set_text(Glib::locale_to_utf8(dflt));
        entry.set_position(-1);