Change glob() API to accept a dir parameter.

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

diff --git a/src/frontends/gtk/GViewBase.C b/src/frontends/gtk/GViewBase.C
index c6782bfd289d20efa47ac24dc4c4c50d3e383c66..f7762c93c2b5e66220c56ed9cf048acde682ce28 100644 (file)
--- a/src/frontends/gtk/GViewBase.C
+++ b/src/frontends/gtk/GViewBase.C
@@ -9,13 +9,19 @@
  */
 
 #include <config.h>
-#include <gtkmm.h>
+
+// Too hard to make concept checks work with this file
+#ifdef _GLIBCPP_CONCEPT_CHECKS
+#undef _GLIBCPP_CONCEPT_CHECKS
+#endif
 
 #include "GViewBase.h"
 #include "support/filetools.h"
 
 using std::string;
 
+namespace lyx {
+namespace frontend {
 
 GViewBase::GViewBase(Dialog & parent, string const & t, bool allowResize) :
        Dialog::View(parent, t), allowResize_(allowResize)
@@ -38,11 +44,11 @@ void GViewBase::build()
 {
        doBuild();
        string const iconName =
-               lyx::support::LibFileSearch("images", "lyx", "xpm");
+               support::LibFileSearch("images", "lyx", "xpm");
        if (!iconName.empty())
                window()->set_icon_from_file(iconName);
        window()->signal_delete_event().connect(
-               SigC::slot(*this, &GViewBase::onDeleteEvent));
+               sigc::mem_fun(*this, &GViewBase::onDeleteEvent));
        window()->set_title(Glib::locale_to_utf8(getTitle()));
 }
 
@@ -52,6 +58,7 @@ void GViewBase::show()
        if (!window()) {
                build();
        }
+       update();
        window()->show();
 }
 
@@ -67,34 +74,52 @@ GBC & GViewBase::bcview()
        return static_cast<GBC &>(dialog().bc().view());
 }
 
+
 void GViewBase::setCancel(Gtk::Button * cancel)
 {
        bcview().setCancel(cancel);
        cancel->signal_clicked().connect(
-               SigC::slot(*this, &GViewBase::onCancel));
+               sigc::mem_fun(*this, &GViewBase::onCancel));
 }
 
+
 void GViewBase::setApply(Gtk::Button * apply)
 {
        bcview().setApply(apply);
        apply->signal_clicked().connect(
-               SigC::slot(*this, &GViewBase::onApply));
+               sigc::mem_fun(*this, &GViewBase::onApply));
 }
 
+
 void GViewBase::setOK(Gtk::Button * ok)
 {
        bcview().setOK(ok);
        ok->signal_clicked().connect(
-               SigC::slot(*this, &GViewBase::onOK));
+               sigc::mem_fun(*this, &GViewBase::onOK));
 }
 
+
 void GViewBase::setRestore(Gtk::Button * restore)
 {
        bcview().setRestore(restore);
        restore->signal_clicked().connect(
-               SigC::slot(*this, &GViewBase::onRestore));
+               sigc::mem_fun(*this, &GViewBase::onRestore));
 }
 
+
+void GViewBase::setTitle(std::string const & title)
+{
+       Dialog::View::setTitle(title);
+       window()->set_title(title);
+}
+
+
+bool GViewBase::readOnly() const
+{
+       return kernel().isBufferReadonly();
+}
+
+
 void GViewBase::onApply()
 {
        dialog().ApplyButton();
@@ -142,7 +167,7 @@ Gtk::Window * GViewGladeB::window()
 }
 
 
-const Gtk::Window * GViewGladeB::window() const
+Gtk::Window const * GViewGladeB::window() const
 {
        Gtk::Window * win;
        if (!xml_)
@@ -150,3 +175,6 @@ const Gtk::Window * GViewGladeB::window() const
        xml_->get_widget("dialog", win);
        return win;
 }
+
+} // namespace frontend
+} // namespace lyx