use wxOVERRIDE in wxMSW sources
This commit is contained in:
Paul Cornett
@@ -51,49 +51,49 @@ public:
|
||||
// implement base class pure virtuals
|
||||
// ----------------------------------
|
||||
|
||||
virtual void Clear();
|
||||
virtual void Clear() wxOVERRIDE;
|
||||
|
||||
virtual bool StartDoc(const wxString& message);
|
||||
virtual void EndDoc();
|
||||
virtual bool StartDoc(const wxString& message) wxOVERRIDE;
|
||||
virtual void EndDoc() wxOVERRIDE;
|
||||
|
||||
virtual void StartPage();
|
||||
virtual void EndPage();
|
||||
virtual void StartPage() wxOVERRIDE;
|
||||
virtual void EndPage() wxOVERRIDE;
|
||||
|
||||
virtual void SetFont(const wxFont& font);
|
||||
virtual void SetPen(const wxPen& pen);
|
||||
virtual void SetBrush(const wxBrush& brush);
|
||||
virtual void SetBackground(const wxBrush& brush);
|
||||
virtual void SetBackgroundMode(int mode);
|
||||
virtual void SetFont(const wxFont& font) wxOVERRIDE;
|
||||
virtual void SetPen(const wxPen& pen) wxOVERRIDE;
|
||||
virtual void SetBrush(const wxBrush& brush) wxOVERRIDE;
|
||||
virtual void SetBackground(const wxBrush& brush) wxOVERRIDE;
|
||||
virtual void SetBackgroundMode(int mode) wxOVERRIDE;
|
||||
#if wxUSE_PALETTE
|
||||
virtual void SetPalette(const wxPalette& palette);
|
||||
virtual void SetPalette(const wxPalette& palette) wxOVERRIDE;
|
||||
#endif // wxUSE_PALETTE
|
||||
|
||||
virtual void DestroyClippingRegion();
|
||||
virtual void DestroyClippingRegion() wxOVERRIDE;
|
||||
|
||||
virtual wxCoord GetCharHeight() const;
|
||||
virtual wxCoord GetCharWidth() const;
|
||||
virtual wxCoord GetCharHeight() const wxOVERRIDE;
|
||||
virtual wxCoord GetCharWidth() const wxOVERRIDE;
|
||||
|
||||
virtual bool CanDrawBitmap() const;
|
||||
virtual bool CanGetTextExtent() const;
|
||||
virtual int GetDepth() const;
|
||||
virtual wxSize GetPPI() const;
|
||||
virtual bool CanDrawBitmap() const wxOVERRIDE;
|
||||
virtual bool CanGetTextExtent() const wxOVERRIDE;
|
||||
virtual int GetDepth() const wxOVERRIDE;
|
||||
virtual wxSize GetPPI() const wxOVERRIDE;
|
||||
|
||||
|
||||
virtual void SetMapMode(wxMappingMode mode);
|
||||
virtual void SetUserScale(double x, double y);
|
||||
virtual void SetLogicalScale(double x, double y);
|
||||
virtual void SetLogicalOrigin(wxCoord x, wxCoord y);
|
||||
virtual void SetDeviceOrigin(wxCoord x, wxCoord y);
|
||||
virtual void SetAxisOrientation(bool xLeftRight, bool yBottomUp);
|
||||
virtual void SetMapMode(wxMappingMode mode) wxOVERRIDE;
|
||||
virtual void SetUserScale(double x, double y) wxOVERRIDE;
|
||||
virtual void SetLogicalScale(double x, double y) wxOVERRIDE;
|
||||
virtual void SetLogicalOrigin(wxCoord x, wxCoord y) wxOVERRIDE;
|
||||
virtual void SetDeviceOrigin(wxCoord x, wxCoord y) wxOVERRIDE;
|
||||
virtual void SetAxisOrientation(bool xLeftRight, bool yBottomUp) wxOVERRIDE;
|
||||
|
||||
#if wxUSE_DC_TRANSFORM_MATRIX
|
||||
virtual bool CanUseTransformMatrix() const;
|
||||
virtual bool SetTransformMatrix(const wxAffineMatrix2D& matrix);
|
||||
virtual wxAffineMatrix2D GetTransformMatrix() const;
|
||||
virtual void ResetTransformMatrix();
|
||||
virtual bool CanUseTransformMatrix() const wxOVERRIDE;
|
||||
virtual bool SetTransformMatrix(const wxAffineMatrix2D& matrix) wxOVERRIDE;
|
||||
virtual wxAffineMatrix2D GetTransformMatrix() const wxOVERRIDE;
|
||||
virtual void ResetTransformMatrix() wxOVERRIDE;
|
||||
#endif // wxUSE_DC_TRANSFORM_MATRIX
|
||||
|
||||
virtual void SetLogicalFunction(wxRasterOperationMode function);
|
||||
virtual void SetLogicalFunction(wxRasterOperationMode function) wxOVERRIDE;
|
||||
|
||||
// implementation from now on
|
||||
// --------------------------
|
||||
@@ -124,10 +124,10 @@ public:
|
||||
m_isClipBoxValid = false;
|
||||
}
|
||||
|
||||
void* GetHandle() const { return (void*)GetHDC(); }
|
||||
void* GetHandle() const wxOVERRIDE { return (void*)GetHDC(); }
|
||||
|
||||
const wxBitmap& GetSelectedBitmap() const { return m_selectedBitmap; }
|
||||
wxBitmap& GetSelectedBitmap() { return m_selectedBitmap; }
|
||||
const wxBitmap& GetSelectedBitmap() const wxOVERRIDE { return m_selectedBitmap; }
|
||||
wxBitmap& GetSelectedBitmap() wxOVERRIDE { return m_selectedBitmap; }
|
||||
|
||||
// update the internal clip box variables
|
||||
void UpdateClipBox();
|
||||
@@ -146,8 +146,8 @@ public:
|
||||
|
||||
// get or change the layout direction (LTR or RTL) for this dc,
|
||||
// wxLayout_Default is returned if layout direction is not supported
|
||||
virtual wxLayoutDirection GetLayoutDirection() const;
|
||||
virtual void SetLayoutDirection(wxLayoutDirection dir);
|
||||
virtual wxLayoutDirection GetLayoutDirection() const wxOVERRIDE;
|
||||
virtual void SetLayoutDirection(wxLayoutDirection dir) wxOVERRIDE;
|
||||
|
||||
protected:
|
||||
void Init()
|
||||
@@ -178,59 +178,59 @@ public:
|
||||
int *descent,
|
||||
int *internalLeading,
|
||||
int *externalLeading,
|
||||
int *averageWidth) const;
|
||||
int *averageWidth) const wxOVERRIDE;
|
||||
virtual void DoGetTextExtent(const wxString& string,
|
||||
wxCoord *x, wxCoord *y,
|
||||
wxCoord *descent = NULL,
|
||||
wxCoord *externalLeading = NULL,
|
||||
const wxFont *theFont = NULL) const;
|
||||
virtual bool DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) const;
|
||||
const wxFont *theFont = NULL) const wxOVERRIDE;
|
||||
virtual bool DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) const wxOVERRIDE;
|
||||
|
||||
virtual bool DoFloodFill(wxCoord x, wxCoord y, const wxColour& col,
|
||||
wxFloodFillStyle style = wxFLOOD_SURFACE);
|
||||
wxFloodFillStyle style = wxFLOOD_SURFACE) wxOVERRIDE;
|
||||
|
||||
virtual void DoGradientFillLinear(const wxRect& rect,
|
||||
const wxColour& initialColour,
|
||||
const wxColour& destColour,
|
||||
wxDirection nDirection = wxEAST);
|
||||
wxDirection nDirection = wxEAST) wxOVERRIDE;
|
||||
|
||||
virtual bool DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const;
|
||||
virtual bool DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const wxOVERRIDE;
|
||||
|
||||
virtual void DoDrawPoint(wxCoord x, wxCoord y);
|
||||
virtual void DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2);
|
||||
virtual void DoDrawPoint(wxCoord x, wxCoord y) wxOVERRIDE;
|
||||
virtual void DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2) wxOVERRIDE;
|
||||
|
||||
virtual void DoDrawArc(wxCoord x1, wxCoord y1,
|
||||
wxCoord x2, wxCoord y2,
|
||||
wxCoord xc, wxCoord yc);
|
||||
wxCoord xc, wxCoord yc) wxOVERRIDE;
|
||||
virtual void DoDrawCheckMark(wxCoord x, wxCoord y,
|
||||
wxCoord width, wxCoord height);
|
||||
wxCoord width, wxCoord height) wxOVERRIDE;
|
||||
virtual void DoDrawEllipticArc(wxCoord x, wxCoord y, wxCoord w, wxCoord h,
|
||||
double sa, double ea);
|
||||
double sa, double ea) wxOVERRIDE;
|
||||
|
||||
virtual void DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
|
||||
virtual void DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height) wxOVERRIDE;
|
||||
virtual void DoDrawRoundedRectangle(wxCoord x, wxCoord y,
|
||||
wxCoord width, wxCoord height,
|
||||
double radius);
|
||||
virtual void DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
|
||||
double radius) wxOVERRIDE;
|
||||
virtual void DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height) wxOVERRIDE;
|
||||
|
||||
#if wxUSE_SPLINES
|
||||
virtual void DoDrawSpline(const wxPointList *points);
|
||||
virtual void DoDrawSpline(const wxPointList *points) wxOVERRIDE;
|
||||
#endif
|
||||
|
||||
virtual void DoCrossHair(wxCoord x, wxCoord y);
|
||||
virtual void DoCrossHair(wxCoord x, wxCoord y) wxOVERRIDE;
|
||||
|
||||
virtual void DoDrawIcon(const wxIcon& icon, wxCoord x, wxCoord y);
|
||||
virtual void DoDrawIcon(const wxIcon& icon, wxCoord x, wxCoord y) wxOVERRIDE;
|
||||
virtual void DoDrawBitmap(const wxBitmap &bmp, wxCoord x, wxCoord y,
|
||||
bool useMask = false);
|
||||
bool useMask = false) wxOVERRIDE;
|
||||
|
||||
virtual void DoDrawText(const wxString& text, wxCoord x, wxCoord y);
|
||||
virtual void DoDrawText(const wxString& text, wxCoord x, wxCoord y) wxOVERRIDE;
|
||||
virtual void DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord y,
|
||||
double angle);
|
||||
double angle) wxOVERRIDE;
|
||||
|
||||
virtual bool DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
|
||||
wxDC *source, wxCoord xsrc, wxCoord ysrc,
|
||||
wxRasterOperationMode rop = wxCOPY, bool useMask = false,
|
||||
wxCoord xsrcMask = wxDefaultCoord, wxCoord ysrcMask = wxDefaultCoord);
|
||||
wxCoord xsrcMask = wxDefaultCoord, wxCoord ysrcMask = wxDefaultCoord) wxOVERRIDE;
|
||||
|
||||
virtual bool DoStretchBlit(wxCoord xdest, wxCoord ydest,
|
||||
wxCoord dstWidth, wxCoord dstHeight,
|
||||
@@ -238,25 +238,25 @@ public:
|
||||
wxCoord xsrc, wxCoord ysrc,
|
||||
wxCoord srcWidth, wxCoord srcHeight,
|
||||
wxRasterOperationMode rop = wxCOPY, bool useMask = false,
|
||||
wxCoord xsrcMask = wxDefaultCoord, wxCoord ysrcMask = wxDefaultCoord);
|
||||
wxCoord xsrcMask = wxDefaultCoord, wxCoord ysrcMask = wxDefaultCoord) wxOVERRIDE;
|
||||
|
||||
virtual void DoSetClippingRegion(wxCoord x, wxCoord y,
|
||||
wxCoord width, wxCoord height);
|
||||
virtual void DoSetDeviceClippingRegion(const wxRegion& region);
|
||||
wxCoord width, wxCoord height) wxOVERRIDE;
|
||||
virtual void DoSetDeviceClippingRegion(const wxRegion& region) wxOVERRIDE;
|
||||
virtual void DoGetClippingBox(wxCoord *x, wxCoord *y,
|
||||
wxCoord *w, wxCoord *h) const;
|
||||
wxCoord *w, wxCoord *h) const wxOVERRIDE;
|
||||
|
||||
virtual void DoGetSizeMM(int* width, int* height) const;
|
||||
virtual void DoGetSizeMM(int* width, int* height) const wxOVERRIDE;
|
||||
|
||||
virtual void DoDrawLines(int n, const wxPoint points[],
|
||||
wxCoord xoffset, wxCoord yoffset);
|
||||
wxCoord xoffset, wxCoord yoffset) wxOVERRIDE;
|
||||
virtual void DoDrawPolygon(int n, const wxPoint points[],
|
||||
wxCoord xoffset, wxCoord yoffset,
|
||||
wxPolygonFillMode fillStyle = wxODDEVEN_RULE);
|
||||
wxPolygonFillMode fillStyle = wxODDEVEN_RULE) wxOVERRIDE;
|
||||
virtual void DoDrawPolyPolygon(int n, const int count[], const wxPoint points[],
|
||||
wxCoord xoffset, wxCoord yoffset,
|
||||
wxPolygonFillMode fillStyle = wxODDEVEN_RULE);
|
||||
virtual wxBitmap DoGetAsBitmap(const wxRect *subrect) const
|
||||
wxPolygonFillMode fillStyle = wxODDEVEN_RULE) wxOVERRIDE;
|
||||
virtual wxBitmap DoGetAsBitmap(const wxRect *subrect) const wxOVERRIDE
|
||||
{
|
||||
return subrect == NULL ? GetSelectedBitmap()
|
||||
: GetSelectedBitmap().GetSubBitmap(*subrect);
|
||||
@@ -351,7 +351,7 @@ public:
|
||||
SetHDC((WXHDC)NULL);
|
||||
}
|
||||
|
||||
virtual void DoGetSize(int *w, int *h) const
|
||||
virtual void DoGetSize(int *w, int *h) const wxOVERRIDE
|
||||
{
|
||||
wxASSERT_MSG( m_size.IsFullySpecified(),
|
||||
wxT("size of this DC hadn't been set and is unknown") );
|
||||
|
||||
Reference in New Issue
Block a user