Change glob() API to accept a dir parameter.

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

diff --git a/src/frontends/gtk/GXpmBtnTbl.C b/src/frontends/gtk/GXpmBtnTbl.C
index a32e41eab3c687251d5e4673fb4fd5b24882e98f..73390e64b1c6e55a2c905fafc693859002584415 100644 (file)
--- a/src/frontends/gtk/GXpmBtnTbl.C
+++ b/src/frontends/gtk/GXpmBtnTbl.C
@@ -10,11 +10,16 @@
 
 #include <config.h>
 
+// Too hard to make concept checks work with this file
+#ifdef _GLIBCPP_CONCEPT_CHECKS
+#undef _GLIBCPP_CONCEPT_CHECKS
+#endif
+
 #include "GXpmBtnTbl.h"
 
 #include <gtkmm.h>
 
-#include <cassert>
+#include <boost/assert.hpp>
 
 
 void GXpmBtnTbl::GXpmBtn::setXpm(XpmData xpm)
@@ -23,7 +28,7 @@ void GXpmBtnTbl::GXpmBtn::setXpm(XpmData xpm)
        pixmap_ = Gdk::Pixmap::create_from_xpm(clrmap,
                                               mask_,
                                               xpm);
-       Gtk::Image * image = SigC::manage(new Gtk::Image(pixmap_, mask_));
+       Gtk::Image * image = Gtk::manage(new Gtk::Image(pixmap_, mask_));
        image->show();
        add(*image);
 }
@@ -34,7 +39,8 @@ void GXpmBtnTbl::GXpmBtn::setXpm(Glib::RefPtr<Gdk::Pixmap> pixmap,
 {
        pixmap_ = pixmap;
        mask_ = mask;
-       Gtk::Image * image = SigC::manage(new Gtk::Image(pixmap_, mask_));
+       Gtk::Image * image =
+               Gtk::manage(new Gtk::Image(pixmap_, mask_));
        image->show();
        add(*image);
 }
@@ -64,17 +70,17 @@ GXpmBtnTbl::~GXpmBtnTbl()
 
 void GXpmBtnTbl::construct()
 {
-       assert(rows_);
-       assert(cols_);
+       BOOST_ASSERT(rows_);
+       BOOST_ASSERT(cols_);
        btns_.reset(new GXpmBtn[rows_ * cols_]);
-       assert(btns_.get());
+       BOOST_ASSERT(btns_.get());
 
        for (int row = 0; row < rows_; ++row)
                for (int col = 0; col < cols_; ++col) {
                        GXpmBtn * btn = &btns_[index(row, col)];
                        btn->setRow(row);
                        btn->setCol(col);
-                       btn->signalClicked().connect(signalClicked_.slot());
+                       btn->signalClicked().connect(signalClicked_);
                        btn->show();
                        attach(*btn, col, col + 1,  row, row + 1);
                }
@@ -162,15 +168,12 @@ void GXpmBtnTbl::on_realize()
 
 void buttonSetXpm(Gtk::Button * btn, char const ** xpm)
 {
-       Glib::RefPtr<Gdk::Bitmap> mask;
-
        Glib::RefPtr<Gdk::Colormap> clrmap = btn->get_colormap();
 
+       Glib::RefPtr<Gdk::Bitmap> mask;
        Glib::RefPtr<Gdk::Pixmap> pixmap =
-               Gdk::Pixmap::create_from_xpm(clrmap,
-                                            mask,
-                                            xpm);
-       Gtk::Image * image = SigC::manage(new Gtk::Image(pixmap, mask));
+               Gdk::Pixmap::create_from_xpm(clrmap, mask, xpm);
+       Gtk::Image * image = Gtk::manage(new Gtk::Image(pixmap, mask));
        image->show();
        btn->add(*image);
 }