Change glob() API to accept a dir parameter.

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

diff --git a/src/frontends/gtk/GViewBase.h b/src/frontends/gtk/GViewBase.h
index e6113c1d82d522afced203852d6d061b4db90847..c289d5d3a0b1d3562a59383b70cc0bc38becba7f 100644 (file)
--- a/src/frontends/gtk/GViewBase.h
+++ b/src/frontends/gtk/GViewBase.h
@@ -12,18 +12,19 @@
 #ifndef GVIEWBASE_H
 #define GVIEWBASE_H
 
-#include <gtkmm.h>
-#include <libglademm.h>
-#include <boost/scoped_ptr.hpp>
 #include "Dialog.h"
 #include "ButtonPolicies.h"
 #include "GBC.h"
 
+#include <gtkmm.h>
+#include <libglademm.h>
+
+#include <boost/scoped_ptr.hpp>
+
 namespace lyx {
 namespace frontend {
 
-class GViewBase : public Dialog::View, public SigC::Object
-{
+class GViewBase : public Dialog::View, public sigc::trackable {
 public:
        GViewBase(Dialog &, std::string const &, bool allowResize);
        virtual ~GViewBase();
@@ -31,6 +32,8 @@ public:
        void setApply(Gtk::Button * apply);
        void setOK(Gtk::Button * ok);
        void setRestore(Gtk::Button * restore);
+       void setTitle(std::string const &);
+       bool readOnly() const;
 protected:
        // Build the dialog
        virtual void build();
@@ -53,12 +56,12 @@ private:
        bool allowResize_;
 };
 
+
 template <class Dialog>
-class GViewDB : public GViewBase
-{
+class GViewDB : public GViewBase {
 protected:
        GViewDB(Dialog &, std::string const &, bool allowResize);
-       virtual const Gtk::Window * window() const;
+       virtual Gtk::Window const * window() const;
        virtual Gtk::Window * window();
        boost::scoped_ptr<Dialog> dialog_;
 };
@@ -85,19 +88,17 @@ const Gtk::Window * GViewDB<Dialog>::window() const
 }
 
 
-class GViewGladeB : public GViewBase
-{
+class GViewGladeB : public GViewBase {
 protected:
        GViewGladeB(Dialog & parent, std::string const & t, bool allowResize);
-       virtual const Gtk::Window * window() const;
+       virtual Gtk::Window const * window() const;
        virtual Gtk::Window * window();
        Glib::RefPtr<Gnome::Glade::Xml> xml_;
 };
 
 
 template <class Controller, class Base>
-class GViewCB : public Base
-{
+class GViewCB : public Base {
 public:
        Controller & controller();
        Controller const & controller() const;
@@ -117,14 +118,14 @@ GViewCB<Controller, Base>::GViewCB(Dialog & parent, std::string const & t,
 template <class Controller, class Base>
 Controller & GViewCB<Controller, Base>::controller()
 {
-       return static_cast<Controller &>(getController());
+       return static_cast<Controller &>(this->getController());
 }
 
 
 template <class Controller, class Base>
 Controller const & GViewCB<Controller, Base>::controller() const
 {
-       return static_cast<Controller const &>(getController());
+       return static_cast<Controller const &>(this->getController());
 }
 
 } // namespace frontend