Change glob() API to accept a dir parameter.

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

diff --git a/src/frontends/gtk/FileDialog.C b/src/frontends/gtk/FileDialog.C
index 53494db6b8dee939a81f73f14f86f77bb47ca73c..7aa48f8e2b907927b61c8cc14fdbd03686b55367 100644 (file)
--- a/src/frontends/gtk/FileDialog.C
+++ b/src/frontends/gtk/FileDialog.C
@@ -1,5 +1,5 @@
 /**
- * \file FileDialog.C
+ * \file gtk/FileDialog.C
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -9,10 +9,16 @@
  */
 
 #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"
 
+using std::string;
+
 
 FileDialog::FileDialog(string const & title,
                       kb_action action,
@@ -29,24 +35,27 @@ FileDialog::~FileDialog()
 }
 
 
-FileDialog::Result const FileDialog::open(string const & path,
-                                         string const & mask,
-                                         string const & suggested)
+FileDialog::Result const
+FileDialog::open(string const & path,
+                lyx::support::FileFilterList const & filters,
+                string const & suggested)
 {
-       return private_->open(path, mask, suggested);
+       return private_->open(path, filters, suggested);
 }
 
 
-FileDialog::Result const FileDialog::opendir(string const & path,
-                                            string const & suggested)
+FileDialog::Result const
+FileDialog::opendir(string const & path,
+                   string const & suggested)
 {
        return private_->opendir(path, suggested);
 }
 
 
-FileDialog::Result const FileDialog::save(string const & path,
-                                         string const & mask,
-                                         string const & suggested)
+FileDialog::Result const
+FileDialog::save(string const & path,
+                lyx::support::FileFilterList const & filters,
+                string const & suggested)
 {
-       return private_->save(path, mask, suggested);
+       return private_->save(path, filters, suggested);
 }