projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add default constructor to wxGraphicsGradientStop.
[wxWidgets.git]
/
src
/
mgl
/
dc.cpp
diff --git
a/src/mgl/dc.cpp
b/src/mgl/dc.cpp
index 06ab0b335dd0d634960c1d9c054254987fbea740..5af342f8b776ffeb2853768a618d2998919d73df 100644
(file)
--- a/
src/mgl/dc.cpp
+++ b/
src/mgl/dc.cpp
@@
-220,7
+220,7
@@
void wxDC::DoSetClippingRegion(wxCoord cx, wxCoord cy, wxCoord cw, wxCoord ch)
DO_SET_CLIPPING_BOX(m_currentClippingRegion)
}
DO_SET_CLIPPING_BOX(m_currentClippingRegion)
}
-void wxDC::DoSet
ClippingRegionAs
Region(const wxRegion& region)
+void wxDC::DoSet
DeviceClipping
Region(const wxRegion& region)
{
wxCHECK_RET( Ok(), wxT("invalid dc") );
{
wxCHECK_RET( Ok(), wxT("invalid dc") );
@@
-319,17
+319,17
@@
void wxDC::Clear()
}
extern bool wxDoFloodFill(wxDC *dc, wxCoord x, wxCoord y,
}
extern bool wxDoFloodFill(wxDC *dc, wxCoord x, wxCoord y,
- const wxColour & col,
int
style);
+ const wxColour & col,
wxFloodFillStyle
style);
bool wxDC::DoFloodFill(wxCoord x, wxCoord y,
bool wxDC::DoFloodFill(wxCoord x, wxCoord y,
- const wxColour& col,
int
style)
+ const wxColour& col,
wxFloodFillStyle
style)
{
return wxDoFloodFill(this, x, y, col, style);
}
bool wxDC::DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const
{
{
return wxDoFloodFill(this, x, y, col, style);
}
bool wxDC::DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const
{
- wxCHECK_MSG( col, false,
_
T("NULL colour parameter in wxDC::GetPixel"));
+ wxCHECK_MSG( col, false,
wx
T("NULL colour parameter in wxDC::GetPixel"));
uchar r, g, b;
m_MGLDC->unpackColorFast(m_MGLDC->getPixel(XLOG2DEV(x), YLOG2DEV(y)),
uchar r, g, b;
m_MGLDC->unpackColorFast(m_MGLDC->getPixel(XLOG2DEV(x), YLOG2DEV(y)),
@@
-452,7
+452,7
@@
void wxDC::DoDrawPoint(wxCoord x, wxCoord y)
}
}
}
}
-void wxDC::DoDrawPolygon(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset,
int
WXUNUSED(fillStyle))
+void wxDC::DoDrawPolygon(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset,
wxPolygonFillMode
WXUNUSED(fillStyle))
{
wxCHECK_RET( Ok(), wxT("invalid dc") );
{
wxCHECK_RET( Ok(), wxT("invalid dc") );
@@
-983,7
+983,7
@@
void wxDC::SelectMGLFatPen(int style, int flag)
pixPattern->p[x][y][2]);
break;
default:
pixPattern->p[x][y][2]);
break;
default:
- wxFAIL_MSG(
_
T("invalid DC depth"));
+ wxFAIL_MSG(
wx
T("invalid DC depth"));
break;
}
m_MGLDC->setPenPixmapPattern(slot, &pix);
break;
}
m_MGLDC->setPenPixmapPattern(slot, &pix);
@@
-1141,7
+1141,7
@@
void wxDC::SetBackgroundMode(int mode)
m_MGLDC->setBackMode(MGL_TRANSPARENT_BACKGROUND);
}
m_MGLDC->setBackMode(MGL_TRANSPARENT_BACKGROUND);
}
-void wxDC::SetLogicalFunction(
int
function)
+void wxDC::SetLogicalFunction(
wxRasterOperationMode
function)
{
wxCHECK_RET( Ok(), wxT("invalid dc") );
{
wxCHECK_RET( Ok(), wxT("invalid dc") );
@@
-1298,7
+1298,7
@@
wxSize wxDC::GetPPI() const
bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest,
wxCoord width, wxCoord height,
wxDC *source, wxCoord xsrc, wxCoord ysrc,
bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest,
wxCoord width, wxCoord height,
wxDC *source, wxCoord xsrc, wxCoord ysrc,
-
int
rop, bool useMask,
+
wxRasterOperationMode
rop, bool useMask,
wxCoord xsrcMask, wxCoord ysrcMask)
{
wxCHECK_MSG( Ok(), false, wxT("invalid dc") );
wxCoord xsrcMask, wxCoord ysrcMask)
{
wxCHECK_MSG( Ok(), false, wxT("invalid dc") );