anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-09 18:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Partially extracted from r14281 from the younes branch.

Browse Source 
* 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
This commit is contained in:
Lars Gullik Bjønnes 2006-07-03 22:54:30 +00:00
parent b1a87cc778
commit ee1871ef71
5 changed files with 3 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/BufferView.C
View File

@ -90,12 +90,6 @@ LyXView * BufferView::owner() const
} }
lyx::frontend::Painter & BufferView::painter() const
{
return pimpl_->painter();
}
void BufferView::setBuffer(Buffer * b) void BufferView::setBuffer(Buffer * b)
{ {
pimpl_->setBuffer(b); pimpl_->setBuffer(b);

9
src/BufferView.h
View File

@ -35,12 +35,6 @@ class LyXText;
class LyXView; class LyXView;
class ParIterator; class ParIterator;
namespace lyx {
namespace frontend {
class Painter;
}
}
namespace Update { namespace Update {
enum flags { enum flags {
FitCursor = 1, FitCursor = 1,
@ -102,9 +96,6 @@ public:
/// return the buffer being viewed /// return the buffer being viewed
Buffer * buffer() const; Buffer * buffer() const;
/// return the painter object for drawing onto the view
lyx::frontend::Painter & painter() const;
/// return the owning main view /// return the owning main view
LyXView * owner() const; LyXView * owner() const;

7
src/BufferView_pimpl.C
View File

@ -64,7 +64,6 @@
#include "frontends/font_metrics.h" #include "frontends/font_metrics.h"
#include "frontends/Gui.h" #include "frontends/Gui.h"
#include "frontends/LyXView.h" #include "frontends/LyXView.h"
#include "frontends/Painter.h"
#include "frontends/WorkArea.h" #include "frontends/WorkArea.h"
#include "graphics/Previews.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 int BufferView::Pimpl::width() const
{ {
return width_; return width_;

3
src/BufferView_pimpl.h
View File

@ -39,7 +39,6 @@ class ViewMetricsInfo;
namespace lyx { namespace lyx {
namespace frontend { namespace frontend {
class Gui; class Gui;
class Painter;
} }
} }
@ -50,8 +49,6 @@ public:
/// ///
Pimpl(BufferView & bv, LyXView * owner); Pimpl(BufferView & bv, LyXView * owner);
/// ///
lyx::frontend::Painter & painter() const;
///
void setBuffer(Buffer * buf); void setBuffer(Buffer * buf);
/// ///
void resizeCurrentBuffer(); void resizeCurrentBuffer();

4
src/rowpainter.C
View File

@ -34,6 +34,8 @@
#include "frontends/font_metrics.h" #include "frontends/font_metrics.h"
#include "frontends/nullpainter.h" #include "frontends/nullpainter.h"
#include "frontends/LyXView.h"
#include "frontends/WorkArea.h"
#include "frontends/Painter.h" #include "frontends/Painter.h"
#include "insets/insettext.h" #include "insets/insettext.h"
@ -879,7 +881,7 @@ void paintPar
void paintText(BufferView const & bv, ViewMetricsInfo const & vi) void paintText(BufferView const & bv, ViewMetricsInfo const & vi)
{ {
Painter & pain = bv.painter(); Painter & pain = bv.owner()->workArea()->getPainter();
LyXText * const text = bv.text(); LyXText * const text = bv.text();
bool const select = bv.cursor().selection(); bool const select = bv.cursor().selection();