Change glob() API to accept a dir parameter.

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

diff --git a/src/frontends/gtk/GPrint.C b/src/frontends/gtk/GPrint.C
index c31f79a3b6507240470eaff2f060f3e68ff81611..db3b2399eff43b8efaf14ccb957d3c0ce6d0b97a 100644 (file)
--- a/src/frontends/gtk/GPrint.C
+++ b/src/frontends/gtk/GPrint.C
@@ -9,17 +9,23 @@
  */
 
 #include <config.h>
-#include <gtkmm.h>
-#include <libglademm.h>
+
+// Too hard to make concept checks work with this file
+#ifdef _GLIBCPP_CONCEPT_CHECKS
+#undef _GLIBCPP_CONCEPT_CHECKS
+#endif
 
 #include "GPrint.h"
 #include "ControlPrint.h"
 #include "ghelpers.h"
 
 #include "PrinterParams.h"
+
 #include "support/lstrings.h"
 #include "support/tostr.h"
 
+#include <libglademm.h>
+
 using std::string;
 using namespace lyx::support;
 
@@ -147,25 +153,25 @@ void GPrint::doBuild()
 
        Gtk::Button * ok;
        Gtk::Button * cancel;
-       Gtk::Button * apply;
        xml_->get_widget("PrintButton", ok);
        xml_->get_widget("CancelButton", cancel);
+
        setOK(ok);
        setCancel(cancel);
 
        Gtk::Button * browse;
        xml_->get_widget("Browse", browse);
-       browse->signal_clicked().connect(SigC::slot(*this, &GPrint::onBrowse));
-
-       fileEntry_->signal_changed().connect(SigC::bind(SigC::slot(*this, &GPrint::onTargetEdit), fileEntry_));
-       printerEntry_->signal_changed().connect(SigC::bind(SigC::slot(*this, &GPrint::onTargetEdit), printerEntry_));
-       fromEntry_->signal_changed().connect(SigC::slot(*this, &GPrint::onFromToEdit));
-       toEntry_->signal_changed().connect(SigC::slot(*this, &GPrint::onFromToEdit));
-       printer_->signal_toggled().connect(SigC::slot(*this, &GPrint::updateUI));
-       file_->signal_toggled().connect(SigC::slot(*this, &GPrint::updateUI));
-       all_->signal_toggled().connect(SigC::slot(*this, &GPrint::updateUI));
-       fromTo_->signal_toggled().connect(SigC::slot(*this, &GPrint::updateUI));
-       number_->signal_changed().connect(SigC::slot(*this, &GPrint::updateUI));
+       browse->signal_clicked().connect(sigc::mem_fun(*this, &GPrint::onBrowse));
+
+       fileEntry_->signal_changed().connect(sigc::bind(sigc::mem_fun(*this, &GPrint::onTargetEdit), fileEntry_));
+       printerEntry_->signal_changed().connect(sigc::bind(sigc::mem_fun(*this, &GPrint::onTargetEdit), printerEntry_));
+       fromEntry_->signal_changed().connect(sigc::mem_fun(*this, &GPrint::onFromToEdit));
+       toEntry_->signal_changed().connect(sigc::mem_fun(*this, &GPrint::onFromToEdit));
+       printer_->signal_toggled().connect(sigc::mem_fun(*this, &GPrint::updateUI));
+       file_->signal_toggled().connect(sigc::mem_fun(*this, &GPrint::updateUI));
+       all_->signal_toggled().connect(sigc::mem_fun(*this, &GPrint::updateUI));
+       fromTo_->signal_toggled().connect(sigc::mem_fun(*this, &GPrint::updateUI));
+       number_->signal_changed().connect(sigc::mem_fun(*this, &GPrint::updateUI));
 
        controller().initialiseParams("");
        update();