#include <config.h>
#include "XPainter.h"
-#include "LString.h"
-#include "debug.h"
-#include "XWorkArea.h"
-#include "xfont_metrics.h"
-#include "lyxfont.h"
-#include "ColorHandler.h"
-#include "lyxrc.h"
-#include "encoding.h"
-#include "language.h"
+#include "ColorHandler.h"
+#include "xfont_metrics.h"
#include "xformsImage.h"
+#include "XWorkArea.h"
-#include "support/LAssert.h"
-#include "support/lstrings.h"
+#include "font_metrics.h"
-#include <boost/scoped_array.hpp>
+#include "encoding.h"
+#include "language.h"
+#include "LColor.h"
+#include "lyxfont.h"
+#include "lyxrc.h"
-#include <cmath>
+#include "support/lstrings.h"
-using namespace lyx::support;
+using lyx::support::uppercase;
-using std::endl;
-using std::max;
+using std::string;
XPainter::XPainter(XWorkArea & xwa)
}
-Painter & XPainter::point(int x, int y, LColor::color c)
+Painter & XPainter::point(int x, int y, LColor_color c)
{
XDrawPoint(fl_get_display(), owner_.getPixmap(),
lyxColorHandler->getGCForeground(c), x, y);
Painter & XPainter::line(int x1, int y1,
int x2, int y2,
- LColor::color col,
+ LColor_color col,
line_style ls,
line_width lw)
{
Painter & XPainter::lines(int const * xp, int const * yp,
int np,
- LColor::color col,
+ LColor_color col,
line_style ls,
line_width lw)
{
Painter & XPainter::rectangle(int x, int y,
int w, int h,
- LColor::color col,
+ LColor_color col,
line_style ls,
line_width lw)
{
Painter & XPainter::fillRectangle(int x, int y,
int w, int h,
- LColor::color col)
+ LColor_color col)
{
XFillRectangle(fl_get_display(), owner_.getPixmap(),
lyxColorHandler->getGCForeground(col), x, y, w, h);
Painter & XPainter::fillPolygon(int const * xp, int const * yp,
- int np, LColor::color col)
+ int np, LColor_color col)
{
boost::scoped_array<XPoint> points(new XPoint[np]);
Painter & XPainter::arc(int x, int y,
unsigned int w, unsigned int h,
- int a1, int a2, LColor::color col)
+ int a1, int a2, LColor_color col)
{
XDrawArc(fl_get_display(), owner_.getPixmap(),
lyxColorHandler->getGCForeground(col),