fix typo that put too many include paths for most people

[lyx.git] / src / insets / insettext.h

diff --git a/src/insets/insettext.h b/src/insets/insettext.h
index 46f127660b60e1110ed4e66b8b46f54dbef7a315..cf5977a20a81022fd2941fa8ba54ed738a9469f3 100644 (file)
--- a/src/insets/insettext.h
+++ b/src/insets/insettext.h
@@ -1,7 +1,7 @@
 // -*- C++ -*-
 /* This file is part of
  * ======================================================
- * 
+ *
  *           LyX, The Document Processor
  *
  *           Copyright 1998 The LyX Team.
@@ -30,6 +30,7 @@
 class Painter;
 class BufferView;
 class Buffer;
+class BufferParams;
 class LyXCursor;
 class LyXText;
 class LyXScreen;
@@ -37,7 +38,7 @@ class Row;
 
 /**
  A text inset is like a TeX box to write full text
- (including styles and other insets) in a given space. 
+ (including styles and other insets) in a given space.
  @author: Jürgen Vigna
  */
 class InsetText : public UpdatableInset {
@@ -73,7 +74,7 @@ public:
                ALWAYS
        };
        ///
-       InsetText();
+       InsetText(BufferParams const &);
        ///
        explicit
        InsetText(InsetText const &, bool same_id = false);
@@ -169,7 +170,7 @@ public:
        ///
        void setFont(BufferView *, LyXFont const &,
                     bool toggleall = false,
-                    bool selectall = false);
+                    bool selectall = false);
        ///
        int getMaxWidth(BufferView *, UpdatableInset const *) const;
        ///
@@ -179,7 +180,7 @@ public:
        ///
        void setParagraphData(Paragraph *, bool same_id = false);
        ///
-       void setText(string const &);
+       void setText(string const &, LyXFont const &);
        ///
        void setAutoBreakRows(bool);
        ///
@@ -239,13 +240,17 @@ public:
        void toggleSelection(BufferView *, bool kill_selection);
        ///
        bool searchForward(BufferView *, string const &,
-                          bool = true, bool = false);
+                          bool = true, bool = false);
        ///
        bool searchBackward(BufferView *, string const &,
-                           bool = true, bool = false);
+                           bool = true, bool = false);
        ///
        bool checkInsertChar(LyXFont &);
        ///
+       void getDrawFont(LyXFont &) const;
+       ///
+       void appendParagraphs(BufferParams const & bparams, Paragraph *);
+       ///
        //
        // Public structures and variables
        ///
@@ -296,7 +301,7 @@ private:
                                               bool activate_inset = true,
                                               bool selecting = false);
        ///
-       UpdatableInset::RESULT moveLeftIntern(BufferView *, bool behind, 
+       UpdatableInset::RESULT moveLeftIntern(BufferView *, bool behind,
                                              bool activate_inset = true,
                                              bool selecting = false);
 
@@ -310,7 +315,7 @@ private:
        bool checkAndActivateInset(BufferView * bv, bool behind);
        ///
        bool checkAndActivateInset(BufferView * bv, int x = 0, int y = 0,
-                                  int button = 0);
+                                  int button = 0);
        ///
        void removeNewlines();
        ///
@@ -337,7 +342,9 @@ private:
        void restoreLyXTextState(BufferView *, LyXText *) const;
        ///
        void reinitLyXText() const;
-       
+       ///
+       void collapseParagraphs(BufferParams const & bparams) const;
+
        /* Private structures and variables */
        ///
        Paragraph * par;
@@ -398,7 +405,7 @@ private:
        };
        ///
        mutable save_state sstate;
-       
+
        ///
        // this is needed globally so we know that we're using it actually and
        // so the LyXText-Cache is not erased until used!
@@ -415,5 +422,10 @@ private:
        mutable BufferView * do_resize;
        mutable bool do_reinit;
        mutable bool in_insetAllowed;
+       ///
+       // these are used to check for mouse movement in Motion selection code
+       ///
+       int mouse_x;
+       int mouse_y;
 };
 #endif