Change glob() API to accept a dir parameter.

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

diff --git a/src/frontends/gtk/GMathDelim.C b/src/frontends/gtk/GMathDelim.C
index 85a7cf22a6808648678befabe6ca53f8a2da4cd5..bf23037aa07191aac5a7ba94628e09993e99d3d7 100644 (file)
--- a/src/frontends/gtk/GMathDelim.C
+++ b/src/frontends/gtk/GMathDelim.C
@@ -9,9 +9,11 @@
  */
 
 #include <config.h>
-#include <gtkmm.h>
-#include <libglademm.h>
-#include <sstream>
+
+// Too hard to make concept checks work with this file
+#ifdef _GLIBCPP_CONCEPT_CHECKS
+#undef _GLIBCPP_CONCEPT_CHECKS
+#endif
 
 #include "ControlMath.h"
 #include "GMathDelim.h"
@@ -19,6 +21,10 @@
 
 #include "support/lstrings.h"
 
+#include <libglademm.h>
+
+#include <sstream>
+
 #include "delim.xbm"
 #include "delim0.xpm"
 
@@ -123,7 +129,7 @@ void GMathDelim::doBuild()
        rightSel_ = 1;
        xml_->get_widget("Box", box);
        delimTbl_.signalClicked().connect(
-               SigC::slot(*this, &GMathDelim::onDelimTblClicked));
+               sigc::mem_fun(*this, &GMathDelim::onDelimTblClicked));
        delimTbl_.show();
        box->children().push_back(
                Gtk::Box_Helpers::Element(delimTbl_));
@@ -133,11 +139,11 @@ void GMathDelim::doBuild()
        bcview().addReadOnly(both_);
        bcview().addReadOnly(demo_);
        left_->signal_clicked().connect(
-               SigC::slot(*this, &GMathDelim::onRadioClicked));
+               sigc::mem_fun(*this, &GMathDelim::onRadioClicked));
        right_->signal_clicked().connect(
-               SigC::slot(*this, &GMathDelim::onRadioClicked));
+               sigc::mem_fun(*this, &GMathDelim::onRadioClicked));
        both_->signal_clicked().connect(
-               SigC::slot(*this, &GMathDelim::onRadioClicked));
+               sigc::mem_fun(*this, &GMathDelim::onRadioClicked));
 }
 
 
@@ -147,7 +153,7 @@ void GMathDelim::setDemoPixmap()
        pixmap_ = Gdk::Pixmap::create_from_xpm(demo_->get_colormap(),
                                               mask_,
                                               delim0);
-       image = SigC::manage(new Gtk::Image(pixmap_, mask_));
+       image = Gtk::manage(new Gtk::Image(pixmap_, mask_));
        image->show();
        demo_->add(*image);
        gcMask_ = Gdk::GC::create(mask_);