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 096f018f6501c97e2af1b82226700a6479745f1e..3cdc89e98cb72f337570f5bef3ffde6827e0ee9b 100644 (file)
--- a/src/frontends/gtk/FileDialogPrivate.C
+++ b/src/frontends/gtk/FileDialogPrivate.C
@@ -5,32 +5,36 @@
  *
  * \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>
 
-#include "LString.h"
+// Too hard to make concept checks work with this file
+#ifdef _GLIBCPP_CONCEPT_CHECKS
+#undef _GLIBCPP_CONCEPT_CHECKS
+#endif
 
 #include "FileDialogPrivate.h"
 
+using std::string;
+
 
 FileDialog::Private::Private(string const & title,
                             kb_action action,
-                            FileDialog::Button b1,
-                            FileDialog::Button b2) :
+                            FileDialog::Button /*b1*/,
+                            FileDialog::Button /*b2*/) :
        action_(action)
 {
        fileSelection_.set_title(title);
-       fileSelection_.get_button_area()->children().push_back(
+/*     fileSelection_.get_button_area()->children().push_back(
                Gtk::Box_Helpers::Element(button1_));
        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(
@@ -44,7 +48,7 @@ FileDialog::Private::Private(string const & title,
                        Glib::locale_to_utf8(b2.first.substr(0, pos)));
                dir2_ = b2.second;
                button2_.show();
-       }
+       }*/
 }
 
 
@@ -60,9 +64,10 @@ void FileDialog::Private::onButton2Clicked()
 }
 
 
-FileDialog::Result const FileDialog::Private::open(string const & path,
-                                                  string const & /*mask*/,
-                                                  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();
@@ -92,8 +97,8 @@ FileDialog::Result const FileDialog::Private::opendir(string const & path,
 
 
 FileDialog::Result const FileDialog::Private::save(string const & path,
-                                                  string const & mask,
+                                                  lyx::support::FileFilterList const & filters,
                                                   string const & suggested)
 {
-       return open(path, mask, suggested);
+       return open(path, filters, suggested);
 }