fix scrolling bug: 3320 and 3652, maybe not perfect

[lyx.git] / src / frontends / LyXView.h

diff --git a/src/frontends/LyXView.h b/src/frontends/LyXView.h
index caa061a8d82038d49dd9238bb4a8150de2e1425e..dc9b6df169a063f49958c245ae29e8ba0462a0ad 100644 (file)
--- a/src/frontends/LyXView.h
+++ b/src/frontends/LyXView.h
@@ -16,7 +16,7 @@
 #include "frontends/Application.h"
 #include "frontends/Toolbars.h"
 
-#include "lyxfunc.h"
+#include "LyXFunc.h"
 #include <boost/scoped_ptr.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/signal.hpp>
@@ -30,13 +30,13 @@ namespace lyx {
 namespace support { class FileName; }
 
 class Buffer;
-class InsetBase;
+class Inset;
 class Menubar;
 
 class BufferView;
 class Dialogs;
 class LyXFunc;
-class LyXFont;
+class Font;
 class Timeout;
 class FuncRequest;
 
@@ -79,7 +79,7 @@ public:
 
        /// return the current WorkArea (the one that has the focus).
        frontend::WorkArea const * currentWorkArea() const;
-       /// FIXME: This non-const access is needed because of 
+       /// FIXME: This non-const access is needed because of
        /// a mis-designed \c ControlSpellchecker.
        frontend::WorkArea * currentWorkArea();
 
@@ -112,7 +112,7 @@ public:
        /// show busy cursor
        virtual void busy(bool) = 0;
 
-       virtual Toolbars::ToolbarPtr makeToolbar(ToolbarInfo const & tbb, bool newline) = 0;
+       virtual Toolbars::ToolbarPtr makeToolbar(ToolbarInfo const & tbinfo, bool newline) = 0;
 
        //@{ generic accessor functions
 
@@ -186,7 +186,7 @@ public:
        /** redraw \c inset in all the BufferViews in which it is currently
         *  visible. If successful return a pointer to the owning Buffer.
         */
-       Buffer const * const updateInset(InsetBase const *) const;
+       Buffer const * const updateInset(Inset const *) const;
 
        /// returns true if this view has the focus.
        virtual bool hasFocus() const = 0;
@@ -268,7 +268,7 @@ private:
        void showDialogWithData(std::string const & name,
                std::string const & data);
        void showInsetDialog(std::string const & name,
-               std::string const & data, InsetBase * inset);
+               std::string const & data, Inset * inset);
        void updateDialog(std::string const & name,
                std::string const & data);
        //@}