// -*- C++ -*-
/**
* \file XPainter.h
- * Copyright 1995-2002 the LyX Team
- * Read the file COPYING
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
*
* \author unknown
- * \author John Levon <moz@compsoc.man.ac.uk>
+ * \author John Levon
+ *
+ * Full author contact details are available in file CREDITS.
*/
#ifndef XPAINTER_H
#define XPAINTER_H
-#ifdef __GNUG__
-#pragma interface
-#endif
-
-#include <config.h>
-
#include "frontends/Painter.h"
-#include "LString.h"
#include <X11/Xlib.h>
class XPainter : public Painter {
public:
XPainter(XWorkArea &);
-
+
/// return the width of the work area in pixels
virtual int paperWidth() const;
/// return the height of the work area in pixels
/// draw a line from point to point
virtual Painter & line(
- int x1, int y1,
+ int x1, int y1,
int x2, int y2,
- LColor::color = LColor::foreground,
+ LColor_color,
line_style = line_solid,
line_width = line_thin);
* @param np size of the points array
*/
virtual Painter & lines(
- int const * xp,
- int const * yp,
+ int const * xp,
+ int const * yp,
int np,
- LColor::color = LColor::foreground,
+ LColor_color,
line_style = line_solid,
line_width = line_thin);
virtual Painter & rectangle(
int x, int y,
int w, int h,
- LColor::color = LColor::foreground,
+ LColor_color,
line_style = line_solid,
line_width = line_thin);
-
+
/// draw a filled rectangle
virtual Painter & fillRectangle(
int x, int y,
int w, int h,
- LColor::color);
-
+ LColor_color);
+
/// draw a filled (irregular) polygon
virtual Painter & fillPolygon(
- int const * xp,
- int const * yp,
+ int const * xp,
+ int const * yp,
int np,
- LColor::color = LColor::foreground);
-
+ LColor_color);
+
/// draw an arc
virtual Painter & arc(
int x, int y,
unsigned int w, unsigned int h,
int a1, int a2,
- LColor::color = LColor::foreground);
-
+ LColor_color);
+
/// draw a pixel
virtual Painter & point(
int x, int y,
- LColor::color = LColor::foreground);
-
+ LColor_color);
+
/// draw an image from the image cache
virtual Painter & image(int x, int y,
int w, int h,
- grfx::Image const & image);
-
+ lyx::graphics::Image const & image);
+
/// draw a string at position x, y (y is the baseline)
virtual Painter & text(int x, int y,
- string const & str, LyXFont const & f);
+ std::string const & str, LyXFont const & f);
/** Draw a string at position x, y (y is the baseline)
* This is just for fast drawing
char c, LyXFont const & f);
/// draw a wide string at position x, y
- Painter & text(int x, int y,
+ Painter & text(int x, int y,
XChar2b const * str, size_t l,
LyXFont const & f);
-
+
private:
/// our owner who we paint upon
XWorkArea & owner_;