fix to #241 and #300 from John

[lyx.git] / src / LyXView.h

diff --git a/src/LyXView.h b/src/LyXView.h
index 0027484b901bdaaa9393027fb52853f4914296db..425469ac881ca230a89b78dba943f86272fd89c6 100644 (file)
--- a/src/LyXView.h
+++ b/src/LyXView.h
@@ -11,7 +11,6 @@
 #include <sigc++/signal_system.h>
 
 #include "LString.h"
-#include "frontends/Timeout.h"
 #include "support/types.h"
 
 class Buffer;
@@ -23,6 +22,7 @@ class Menubar;
 class BufferView;
 class Dialogs;
 class LyXFunc;
+class Timeout;
 
 ///
 class LyXView : public SigC::Object, boost::noncopyable {
@@ -53,8 +53,7 @@ public:
        Toolbar * getToolbar() const;
 
        /// sets the layout in the toolbar layout combox
-       void setLayout(lyx::layout_type layout);
-
+       void setLayout(string const & layout);
        /// update the toolbar
        void updateToolbar();
 
@@ -70,7 +69,7 @@ public:
        void messagePush(string const & str);
        ///
        void messagePop();
-       
+
        ///
        Menubar * getMenubar() const;
 
@@ -101,24 +100,24 @@ public:
 protected:
        ///
        Menubar * menubar;
-       /// 
+       ///
        Toolbar * toolbar;
        /** This is supposed to be a pointer or a list of pointers to the
           BufferViews currently being shown in the LyXView. So far
           this is not used, but that should change pretty soon. (Lgb) */
        BufferView * bufferview;
-       /// 
+       ///
        MiniBuffer * minibuffer;
        ///
        Intl * intl;
        ///
-       Timeout autosave_timeout;
+       Timeout * autosave_timeout;
        /// A callback
        void AutoSave();
        ///
        void invalidateLayoutChoice();
 private:
-       /// 
+       ///
        LyXFunc * lyxfunc;
        ///
        Dialogs * dialogs_;