Change glob() API to accept a dir parameter.

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

diff --git a/src/frontends/gtk/GText.C b/src/frontends/gtk/GText.C
index 8944ec227fc8c2bdfdac752de4c12d91b3d2808c..2f28716cd5280727163553415bbeab7956a93573 100644 (file)
--- a/src/frontends/gtk/GText.C
+++ b/src/frontends/gtk/GText.C
@@ -9,17 +9,26 @@
  */
 
 #include <config.h>
-#include <gtkmm.h>
-#include <libglademm.h>
 
-#include "support/lstrings.h"
-#include "support/filetools.h"
-#include "ControlCommand.h"
+// Too hard to make concept checks work with this file
+#ifdef _GLIBCPP_CONCEPT_CHECKS
+#undef _GLIBCPP_CONCEPT_CHECKS
+#endif
+
 #include "GText.h"
+#include "ControlCommand.h"
+#include "ghelpers.h"
 #include "IdSc.h"
 
+#include "support/lstrings.h"
+
+#include <gtkmm.h>
+#include <libglademm.h>
+
 using std::string;
 
+namespace lyx {
+namespace frontend {
 
 GText::GText(Dialog & parent, string const & title, string const & label)
        : GViewCB<ControlCommand, GViewGladeB>(parent, title),
@@ -27,23 +36,25 @@ GText::GText(Dialog & parent, string const & title, string const & label)
 {
 }
 
+
 void GText::apply()
 {
        string const contents = Glib::locale_from_utf8(entry_->get_text());
        controller().params().setContents(contents);
 }
 
+
 void GText::update()
 {
-       string const contents = lyx::support::trim(
+       string const contents = support::trim(
                controller().params().getContents());
        entry_->set_text(Glib::locale_to_utf8(contents));
 }
 
+
 void GText::doBuild()
 {
-       string const gladeName =
-               lyx::support::LibFileSearch("glade", "text", "glade");
+       string const gladeName = findGladeFile("text");
        xml_ = Gnome::Glade::Xml::create(gladeName);
        Gtk::Label * label;
        Gtk::Button * restore;
@@ -63,10 +74,14 @@ void GText::doBuild()
        setRestore(restore);
        bcview().addReadOnly(entry_);
        entry_->signal_changed().connect(
-               SigC::slot(*this, &GText::onEntryChanged));
+               sigc::mem_fun(*this, &GText::onEntryChanged));
 }
 
+
 void GText::onEntryChanged()
 {
        bc().valid(!entry_->get_text().empty());
 }
+
+} // namespace frontend
+} // namespace lyx