* Only enter inset which return true on isActive(). This is the behavior in the curso...

[lyx.git] / src / BufferView.h

diff --git a/src/BufferView.h b/src/BufferView.h
index 3929c6889276205efb1f439c8d16cfc5a2a820f4..7da1a08d94d54f4474118520b60d25b4b342bba5 100644 (file)
--- a/src/BufferView.h
+++ b/src/BufferView.h
@@ -42,7 +42,7 @@ class FuncRequest;
 class FuncStatus;
 class Intl;
 class Cursor;
-class LyXText;
+class Text;
 class ParIterator;
 class ParagraphMetrics;
 class ViewMetricsInfo;
@@ -72,7 +72,7 @@ struct ScrollbarParameters
  * is a sliding window of the entire document rendering.
  * It is the official interface between the LyX core and
  * the frontend WorkArea.
- * 
+ *
  * \sa WorkArea
  * \sa Buffer
  * \sa CoordCache
@@ -207,10 +207,10 @@ public:
        void updateMetrics(bool singlepar = false);
 
        ///
-       TextMetrics const & textMetrics(LyXText const * t) const;
-       TextMetrics & textMetrics(LyXText const * t);
+       TextMetrics const & textMetrics(Text const * t) const;
+       TextMetrics & textMetrics(Text const * t);
        ///
-       ParagraphMetrics const & parMetrics(LyXText const *, pit_type) const;
+       ParagraphMetrics const & parMetrics(Text const *, pit_type) const;
 
        ///
        CoordCache & coordCache() {
@@ -238,7 +238,7 @@ public:
 
        /// This signal is emitted when some inset dialogs needs to be shown.
        boost::signal<void(std::string name, std::string data,
-               InsetBase * inset)> showInsetDialog;
+               Inset * inset)> showInsetDialog;
 
        /// This signal is emitted when some dialogs needs to be updated.
        boost::signal<void(std::string name,
@@ -253,8 +253,8 @@ private:
 
        /// Search recursively for the the innermost inset that covers (x, y) position.
        /// \retval 0 if no inset is found.
-       InsetBase const * getCoveringInset(
-               LyXText const & text, //< The LyXText where we start searching.
+       Inset const * getCoveringInset(
+               Text const & text, //< The Text where we start searching.
                int x, //< x-coordinate on screen
                int y  //< y-coordinate on screen
                );
@@ -297,10 +297,10 @@ private:
        boost::scoped_ptr<Intl> const intl_;
 
        /// last visited inset (kept to send setMouseHover(false) )
-       InsetBase * last_inset_;
+       Inset * last_inset_;
 
-       /// A map from a LyXText to the associated text metrics
-       typedef std::map<LyXText const *, TextMetrics> TextMetricsCache;
+       /// A map from a Text to the associated text metrics
+       typedef std::map<Text const *, TextMetrics> TextMetricsCache;
        mutable TextMetricsCache text_metrics_;
 };