Change glob() API to accept a dir parameter.

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

diff --git a/src/frontends/gtk/FileDialogPrivate.C b/src/frontends/gtk/FileDialogPrivate.C
index a1b3cc2d7ef9033d1a31c770684f41dc76968d30..3cdc89e98cb72f337570f5bef3ffde6827e0ee9b 100644 (file)
--- a/src/frontends/gtk/FileDialogPrivate.C
+++ b/src/frontends/gtk/FileDialogPrivate.C
@@ -9,7 +9,11 @@
  */
 
 #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 "FileDialogPrivate.h"
 
@@ -28,9 +32,9 @@ FileDialog::Private::Private(string const & title,
        fileSelection_.get_button_area()->children().push_back(
                Gtk::Box_Helpers::Element(button2_));
        button1_.signal_clicked().connect(
-               SigC::slot(*this, &FileDialog::Private::onButton1Clicked));
+               sigc::mem_fun(*this, &FileDialog::Private::onButton1Clicked));
        button2_.signal_clicked().connect(
-       SigC::slot(*this, &FileDialog::Private::onButton2Clicked));
+       sigc::mem_fun(*this, &FileDialog::Private::onButton2Clicked));
        if (!b1.first.empty() && !b1.second.empty()) {
                string::size_type pos = b1.first.find('|');
                button1_.set_label(
@@ -60,9 +64,10 @@ void FileDialog::Private::onButton2Clicked()
 }
 
 
-FileDialog::Result const FileDialog::Private::open(string const & path,
-                                                  lyx::support::FileFilterList const & /*filters*/,
-                                                  string const & /*suggested*/)
+FileDialog::Result const
+FileDialog::Private::open(string const & path,
+                         lyx::support::FileFilterList const & /*filters*/,
+                         string const & /*suggested*/)
 {
        fileSelection_.set_filename(path);
        fileSelection_.get_file_list()->get_parent()->show();