MSVC does not define WIN32 but _WIN32.

[lyx.git] / src / TextMetrics.h

diff --git a/src/TextMetrics.h b/src/TextMetrics.h
index 617b716865dd01b9cd1579f2635ac3a3398d81c2..efedcb8c9917adcc93661072316a5af41a940fdb 100644 (file)
--- a/src/TextMetrics.h
+++ b/src/TextMetrics.h
@@ -4,7 +4,7 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author Lars Gullik Bjønnes
+ * \author Lars Gullik Bjønnes
  * \author John Levon
  * \author Abdelrazak Younes
  *
@@ -38,7 +38,7 @@ public:
        TextMetrics(BufferView *, Text *);
        
        ///
-       bool has(pit_type pit) const;
+       bool contains(pit_type pit) const;
        ///
        ParagraphMetrics const & parMetrics(pit_type) const;
        ///
@@ -68,8 +68,7 @@ public:
        /// The difference is that this one is used for displaying, and thus we
        /// are allowed to make cosmetic improvements. For instance make footnotes
        /// smaller. (Asger)
-       Font getDisplayFont(pit_type pit,
-               pos_type pos) const;
+       Font displayFont(pit_type pit, pos_type pos) const;
 
        /// There are currently two font mechanisms in LyX:
        /// 1. The font attributes in a lyxtext, and
@@ -161,8 +160,7 @@ private:
 
        /// draw selection for a single row
        void drawRowSelection(PainterInfo & pi, int x, Row const & row,
-               DocIterator const & beg, DocIterator const & end, 
-               bool drawOnBegMargin, bool drawOnEndMargin) const;
+               Cursor const & cur, pit_type const pit) const;
 
 // Temporary public:
 public:
@@ -212,10 +210,6 @@ public:
        int cursorY(CursorSlice const & cursor,
                bool boundary) const;
 
-       ///
-       void cursorPrevious(Cursor & cur);
-       ///
-       void cursorNext(Cursor & cur);
        ///
        bool cursorHome(Cursor & cur);
        ///
@@ -243,6 +237,10 @@ public:
        int leftMargin(int max_width, pit_type pit, pos_type pos) const;
        int leftMargin(int max_width, pit_type pit) const;
 
+       /// calculates the position of a completion popup
+       void completionPosAndDim(Cursor const & cur, int & x, int & y, 
+               Dimension & dim) const;
+
 private:
        friend class BufferView;