Partially extracted from r14281 from the younes branch.

* BufferView, BufferView::Pimpl:
	- painter(): remove method
* rowpainter.C:
	- paintText(): get painter through LyXView and WorkArea

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14330 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/BufferView.C b/src/BufferView.C
index 677abdad0ab2d4c222409fcd6a1e94597059c29a..bedd197e5704d217873d69a65a014a52d97fc54c 100644 (file)
--- a/src/BufferView.C
+++ b/src/BufferView.C
@@ -90,12 +90,6 @@ LyXView * BufferView::owner() const
 }
 
 
-lyx::frontend::Painter & BufferView::painter() const
-{
-       return pimpl_->painter();
-}
-
-
 void BufferView::setBuffer(Buffer * b)
 {
        pimpl_->setBuffer(b);

diff --git a/src/BufferView.h b/src/BufferView.h
index 375683de7c61cfa6bf51d0e854c1c992aae98dd7..ec48a0ffcc9bb4f388c514530b057afdf200e764 100644 (file)
--- a/src/BufferView.h
+++ b/src/BufferView.h
@@ -35,12 +35,6 @@ class LyXText;
 class LyXView;
 class ParIterator;
 
-namespace lyx {
-namespace frontend {
-class Painter;
-}
-}
-
 namespace Update {
        enum flags {
                FitCursor = 1,
@@ -102,9 +96,6 @@ public:
        /// return the buffer being viewed
        Buffer * buffer() const;
 
-       /// return the painter object for drawing onto the view
-       lyx::frontend::Painter & painter() const;
-
        /// return the owning main view
        LyXView * owner() const;
 

diff --git a/src/BufferView_pimpl.C b/src/BufferView_pimpl.C
index 7fd68c85cd1644bd70e1c5a3ec97322e185da776..673332de9bba2eae367bbde9d902578064d0b53d 100644 (file)
--- a/src/BufferView_pimpl.C
+++ b/src/BufferView_pimpl.C
@@ -64,7 +64,6 @@
 #include "frontends/font_metrics.h"
 #include "frontends/Gui.h"
 #include "frontends/LyXView.h"
-#include "frontends/Painter.h"
 #include "frontends/WorkArea.h"
 
 #include "graphics/Previews.h"
@@ -319,12 +318,6 @@ lyx::frontend::Gui & BufferView::Pimpl::gui() const
 }
 
 
-lyx::frontend::Painter & BufferView::Pimpl::painter() const
-{
-       return owner_->workArea()->getPainter();
-}
-
-
 int BufferView::Pimpl::width() const
 {
        return width_;

diff --git a/src/BufferView_pimpl.h b/src/BufferView_pimpl.h
index 6359c26ed3e932f1d5a5c0174d33e91fc499fc41..7bf4d2cef64a65ae951b73f9265eafdb9cd6285b 100644 (file)
--- a/src/BufferView_pimpl.h
+++ b/src/BufferView_pimpl.h
@@ -39,7 +39,6 @@ class ViewMetricsInfo;
 namespace lyx {
 namespace frontend {
 class Gui;
-class Painter;
 }
 }
 
@@ -50,8 +49,6 @@ public:
        ///
        Pimpl(BufferView & bv, LyXView * owner);
        ///
-       lyx::frontend::Painter & painter() const;
-       ///
        void setBuffer(Buffer * buf);
        ///
        void resizeCurrentBuffer();

diff --git a/src/rowpainter.C b/src/rowpainter.C
index b04ca0f7e107b52894ffb941e678562c1eb6c94e..498d1c982f12a8fd6da67bd8aadf7f4460c036d0 100644 (file)
--- a/src/rowpainter.C
+++ b/src/rowpainter.C
@@ -34,6 +34,8 @@
 
 #include "frontends/font_metrics.h"
 #include "frontends/nullpainter.h"
+#include "frontends/LyXView.h"
+#include "frontends/WorkArea.h"
 #include "frontends/Painter.h"
 
 #include "insets/insettext.h"
@@ -879,7 +881,7 @@ void paintPar
 
 void paintText(BufferView const & bv, ViewMetricsInfo const & vi)
 {
-       Painter & pain = bv.painter();
+       Painter & pain = bv.owner()->workArea()->getPainter();
        LyXText * const text = bv.text();
        bool const select = bv.cursor().selection();