Commit 3574145b authored by kocienda's avatar kocienda

Additions to get khtml/rendering/render_frames.cpp to compile


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@102 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent ababfd33
......@@ -50,6 +50,7 @@ public:
NoPen,
SolidLine,
DotLine,
DashLine,
};
enum BrushStyle {
......@@ -82,7 +83,14 @@ public:
Key_Down = 0x1015,
};
enum RasterOp { // raster op mode
CopyROP,
OrROP,
XorROP,
};
static const QColor &black;
static const QColor &white;
static const QColor &darkGray;
static const QCursor &sizeAllCursor;
......
......@@ -32,9 +32,10 @@
#include "qbrush.h"
#include "qpen.h"
#include "qregion.h"
#include "qpoint.h"
#include "qfontmetrics.h"
class QFont;
class QFontMetrics;
class QPixmap;
class QWMatrix {
......@@ -51,6 +52,7 @@ public:
QFontMetrics fontMetrics() const;
const QPen &pen() const;
void setPen(const QPen &);
void setPen(PenStyle);
void setBrush(const QBrush &);
void setBrush(BrushStyle);
......@@ -58,18 +60,20 @@ public:
void drawRect(int, int, int, int);
void fillRect(int, int, int, int, const QBrush &);
void drawLine(int, int, int, int);
void drawEllipse(int, int, int, int);
void drawArc(int, int, int, int, int, int);
void drawPolygon(const QPointArray &, bool winding=FALSE, int index=0, int npoints=-1);
void drawPixmap(const QPoint &, const QPixmap &);
void drawPixmap(const QPoint &, const QPixmap &, const QRect &);
void drawTiledPixmap(int, int, int, int, const QPixmap &, int sx = 0, int
sy = 0);
void drawTiledPixmap(int, int, int, int, const QPixmap &, int sx = 0, int sy = 0);
void drawText(int, int, int, int, AlignmentFlags, const QString &);
void setClipping(bool);
void setClipRegion(const QRegion &);
const QRegion &clipRegion() const;
bool hasClipping() const;
RasterOp rasterOp() const;
void setRasterOp(RasterOp);
};
#endif
......@@ -48,6 +48,7 @@ class QPointArray {
public:
QPointArray(int);
void setPoint(uint, int, int);
bool setPoints(int nPoints, int firstx, int firsty, ... );
};
#endif
......@@ -50,6 +50,7 @@ public:
NoPen,
SolidLine,
DotLine,
DashLine,
};
enum BrushStyle {
......@@ -82,7 +83,14 @@ public:
Key_Down = 0x1015,
};
enum RasterOp { // raster op mode
CopyROP,
OrROP,
XorROP,
};
static const QColor &black;
static const QColor &white;
static const QColor &darkGray;
static const QCursor &sizeAllCursor;
......
......@@ -52,4 +52,6 @@ class QMovie;
class QTimer;
class QImage;
typedef int QCOORD;
#endif
......@@ -32,9 +32,10 @@
#include "qbrush.h"
#include "qpen.h"
#include "qregion.h"
#include "qpoint.h"
#include "qfontmetrics.h"
class QFont;
class QFontMetrics;
class QPixmap;
class QWMatrix {
......@@ -51,6 +52,7 @@ public:
QFontMetrics fontMetrics() const;
const QPen &pen() const;
void setPen(const QPen &);
void setPen(PenStyle);
void setBrush(const QBrush &);
void setBrush(BrushStyle);
......@@ -58,18 +60,20 @@ public:
void drawRect(int, int, int, int);
void fillRect(int, int, int, int, const QBrush &);
void drawLine(int, int, int, int);
void drawEllipse(int, int, int, int);
void drawArc(int, int, int, int, int, int);
void drawPolygon(const QPointArray &, bool winding=FALSE, int index=0, int npoints=-1);
void drawPixmap(const QPoint &, const QPixmap &);
void drawPixmap(const QPoint &, const QPixmap &, const QRect &);
void drawTiledPixmap(int, int, int, int, const QPixmap &, int sx = 0, int
sy = 0);
void drawTiledPixmap(int, int, int, int, const QPixmap &, int sx = 0, int sy = 0);
void drawText(int, int, int, int, AlignmentFlags, const QString &);
void setClipping(bool);
void setClipRegion(const QRegion &);
const QRegion &clipRegion() const;
bool hasClipping() const;
RasterOp rasterOp() const;
void setRasterOp(RasterOp);
};
#endif
......@@ -48,6 +48,7 @@ class QPointArray {
public:
QPointArray(int);
void setPoint(uint, int, int);
bool setPoints(int nPoints, int firstx, int firsty, ... );
};
#endif
......@@ -50,6 +50,7 @@ public:
NoPen,
SolidLine,
DotLine,
DashLine,
};
enum BrushStyle {
......@@ -82,7 +83,14 @@ public:
Key_Down = 0x1015,
};
enum RasterOp { // raster op mode
CopyROP,
OrROP,
XorROP,
};
static const QColor &black;
static const QColor &white;
static const QColor &darkGray;
static const QCursor &sizeAllCursor;
......
......@@ -52,4 +52,6 @@ class QMovie;
class QTimer;
class QImage;
typedef int QCOORD;
#endif
......@@ -32,9 +32,10 @@
#include "qbrush.h"
#include "qpen.h"
#include "qregion.h"
#include "qpoint.h"
#include "qfontmetrics.h"
class QFont;
class QFontMetrics;
class QPixmap;
class QWMatrix {
......@@ -51,6 +52,7 @@ public:
QFontMetrics fontMetrics() const;
const QPen &pen() const;
void setPen(const QPen &);
void setPen(PenStyle);
void setBrush(const QBrush &);
void setBrush(BrushStyle);
......@@ -58,18 +60,20 @@ public:
void drawRect(int, int, int, int);
void fillRect(int, int, int, int, const QBrush &);
void drawLine(int, int, int, int);
void drawEllipse(int, int, int, int);
void drawArc(int, int, int, int, int, int);
void drawPolygon(const QPointArray &, bool winding=FALSE, int index=0, int npoints=-1);
void drawPixmap(const QPoint &, const QPixmap &);
void drawPixmap(const QPoint &, const QPixmap &, const QRect &);
void drawTiledPixmap(int, int, int, int, const QPixmap &, int sx = 0, int
sy = 0);
void drawTiledPixmap(int, int, int, int, const QPixmap &, int sx = 0, int sy = 0);
void drawText(int, int, int, int, AlignmentFlags, const QString &);
void setClipping(bool);
void setClipRegion(const QRegion &);
const QRegion &clipRegion() const;
bool hasClipping() const;
RasterOp rasterOp() const;
void setRasterOp(RasterOp);
};
#endif
......@@ -48,6 +48,7 @@ class QPointArray {
public:
QPointArray(int);
void setPoint(uint, int, int);
bool setPoints(int nPoints, int firstx, int firsty, ... );
};
#endif
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment