*/
#include <config.h>
-#include <gtkmm.h>
-#include "support/std_string.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(
Glib::locale_to_utf8(b2.first.substr(0, pos)));
dir2_ = b2.second;
button2_.show();
- }
+ }*/
}
}
-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();
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);
}