* src/frontends/GuiDocument.{cpp,h}:

[lyx.git] / src / TextMetrics.h

diff --git a/src/TextMetrics.h b/src/TextMetrics.h
index 1d6f479bc62bcf323fcb57b238f6f31646620b80..34eda6b2de971a1e01ddf60ebb75cabfab734896 100644 (file)
--- a/src/TextMetrics.h
+++ b/src/TextMetrics.h
@@ -15,14 +15,10 @@
 #define TEXT_METRICS_H
 
 #include "Font.h"
-// FIXME: We only need Point class definition, not the full CoordCache.
-#include "CoordCache.h"
 #include "ParagraphMetrics.h"
 
 #include "support/types.h"
 
-#include <boost/tuple/tuple.hpp>
-
 namespace lyx {
 
 class BufferView;
@@ -132,13 +128,6 @@ private:
        ///
        ParagraphMetrics & parMetrics(pit_type, bool redo_paragraph);
 
-       /// draw textselection.
-       /// FIXME: simplify to just to single row painting.
-       void drawSelection(PainterInfo & pi,
-               DocIterator const & beg, ///< selection begin.
-               DocIterator const & end, ///< selection end.
-               int x) const;
-
        /// the minimum space a manual label needs on the screen in pixels
        int labelFill(pit_type const pit, Row const & row) const;
 
@@ -161,8 +150,8 @@ private:
                pos_type const end
                ) const;
 
-       /// Calculate and set the height of the row
-       boost::tuple<int, int> rowHeight(
+       /// Calculate and set the height of the row (width member is set to 0)
+       Dimension rowHeight(
                pit_type const pit,
                pos_type const first,
                pos_type const end
@@ -253,6 +242,7 @@ public:
        int leftMargin(int max_width, pit_type pit) const;
 
 private:
+       friend class BufferView;
 
        /// The BufferView owner.
        BufferView * bv_;