X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FPainter.h;h=8d39c2ba02c72e75d74464b0fe9ac95fc41cb6bd;hb=21226de2b87a86be19fff025cace3d286a75aa76;hp=1becb41462cf5b8f83973d6d2e81985bff10a05a;hpb=797d87b4513088a66b17c7ac653b84e36ea80458;p=lyx.git diff --git a/src/Painter.h b/src/Painter.h index 1becb41462..8d39c2ba02 100644 --- a/src/Painter.h +++ b/src/Painter.h @@ -4,7 +4,7 @@ * * LyX, The Document Processor * - * Copyright 1995-2000 The LyX Team + * Copyright 1995-2001 The LyX Team * * ======================================================*/ @@ -15,14 +15,12 @@ #pragma interface #endif -#include "config.h" #include "LString.h" // This is only included to provide stuff for the non-public sections #include #include "PainterBase.h" -#include "LColor.h" class LyXFont; class WorkArea; @@ -75,9 +73,12 @@ public: /// Fill a rectangle PainterBase & fillRectangle(int x, int y, int w, int h, - LColor::color = LColor::background); + LColor::color); - /// For the figure inset + /// For the graphics inset. + PainterBase & image(int x, int y, int w, int h, LyXImage const * image); + + /// For the figinset PainterBase & pixmap(int x, int y, int w, int h, Pixmap bitmap); /// Draw a string at position x, y (y is the baseline) @@ -86,7 +87,7 @@ public: /** Draw a string at position x, y (y is the baseline) This is just for fast drawing */ - PainterBase & text(int x, int y, char const * str, int l, + PainterBase & text(int x, int y, char const * str, size_t l, LyXFont const & f); /// Draw a char at position x, y (y is the baseline)