use wxOVERRIDE in wxMSW sources
This commit is contained in:
Paul Cornett
@@ -131,33 +131,33 @@ public :
|
||||
wxGDIPlusPathData(wxGraphicsRenderer* renderer, GraphicsPath* path = NULL);
|
||||
~wxGDIPlusPathData();
|
||||
|
||||
virtual wxGraphicsObjectRefData *Clone() const;
|
||||
virtual wxGraphicsObjectRefData *Clone() const wxOVERRIDE;
|
||||
|
||||
//
|
||||
// These are the path primitives from which everything else can be constructed
|
||||
//
|
||||
|
||||
// begins a new subpath at (x,y)
|
||||
virtual void MoveToPoint( wxDouble x, wxDouble y );
|
||||
virtual void MoveToPoint( wxDouble x, wxDouble y ) wxOVERRIDE;
|
||||
|
||||
// adds a straight line from the current point to (x,y)
|
||||
virtual void AddLineToPoint( wxDouble x, wxDouble y );
|
||||
virtual void AddLineToPoint( wxDouble x, wxDouble y ) wxOVERRIDE;
|
||||
|
||||
// adds a cubic Bezier curve from the current point, using two control points and an end point
|
||||
virtual void AddCurveToPoint( wxDouble cx1, wxDouble cy1, wxDouble cx2, wxDouble cy2, wxDouble x, wxDouble y );
|
||||
virtual void AddCurveToPoint( wxDouble cx1, wxDouble cy1, wxDouble cx2, wxDouble cy2, wxDouble x, wxDouble y ) wxOVERRIDE;
|
||||
|
||||
|
||||
// adds an arc of a circle centering at (x,y) with radius (r) from startAngle to endAngle
|
||||
virtual void AddArc( wxDouble x, wxDouble y, wxDouble r, wxDouble startAngle, wxDouble endAngle, bool clockwise ) ;
|
||||
virtual void AddArc( wxDouble x, wxDouble y, wxDouble r, wxDouble startAngle, wxDouble endAngle, bool clockwise ) wxOVERRIDE;
|
||||
|
||||
// gets the last point of the current path, (0,0) if not yet set
|
||||
virtual void GetCurrentPoint( wxDouble* x, wxDouble* y) const;
|
||||
virtual void GetCurrentPoint( wxDouble* x, wxDouble* y) const wxOVERRIDE;
|
||||
|
||||
// adds another path
|
||||
virtual void AddPath( const wxGraphicsPathData* path );
|
||||
virtual void AddPath( const wxGraphicsPathData* path ) wxOVERRIDE;
|
||||
|
||||
// closes the current sub-path
|
||||
virtual void CloseSubpath();
|
||||
virtual void CloseSubpath() wxOVERRIDE;
|
||||
|
||||
//
|
||||
// These are convenience functions which - if not available natively will be assembled
|
||||
@@ -179,18 +179,18 @@ public :
|
||||
*/
|
||||
|
||||
// returns the native path
|
||||
virtual void * GetNativePath() const { return m_path; }
|
||||
virtual void * GetNativePath() const wxOVERRIDE { return m_path; }
|
||||
|
||||
// give the native path returned by GetNativePath() back (there might be some deallocations necessary)
|
||||
virtual void UnGetNativePath(void * WXUNUSED(path)) const {}
|
||||
virtual void UnGetNativePath(void * WXUNUSED(path)) const wxOVERRIDE {}
|
||||
|
||||
// transforms each point of this path by the matrix
|
||||
virtual void Transform( const wxGraphicsMatrixData* matrix ) ;
|
||||
virtual void Transform( const wxGraphicsMatrixData* matrix ) wxOVERRIDE;
|
||||
|
||||
// gets the bounding box enclosing all points (possibly including control points)
|
||||
virtual void GetBox(wxDouble *x, wxDouble *y, wxDouble *w, wxDouble *h) const;
|
||||
virtual void GetBox(wxDouble *x, wxDouble *y, wxDouble *w, wxDouble *h) const wxOVERRIDE;
|
||||
|
||||
virtual bool Contains( wxDouble x, wxDouble y, wxPolygonFillMode fillStyle = wxODDEVEN_RULE) const;
|
||||
virtual bool Contains( wxDouble x, wxDouble y, wxPolygonFillMode fillStyle = wxODDEVEN_RULE) const wxOVERRIDE;
|
||||
|
||||
private :
|
||||
GraphicsPath* m_path;
|
||||
@@ -206,53 +206,53 @@ public :
|
||||
wxGDIPlusMatrixData(wxGraphicsRenderer* renderer, Matrix* matrix = NULL) ;
|
||||
virtual ~wxGDIPlusMatrixData() ;
|
||||
|
||||
virtual wxGraphicsObjectRefData* Clone() const ;
|
||||
virtual wxGraphicsObjectRefData* Clone() const wxOVERRIDE;
|
||||
|
||||
// concatenates the matrix
|
||||
virtual void Concat( const wxGraphicsMatrixData *t );
|
||||
virtual void Concat( const wxGraphicsMatrixData *t ) wxOVERRIDE;
|
||||
|
||||
// sets the matrix to the respective values
|
||||
virtual void Set(wxDouble a=1.0, wxDouble b=0.0, wxDouble c=0.0, wxDouble d=1.0,
|
||||
wxDouble tx=0.0, wxDouble ty=0.0);
|
||||
wxDouble tx=0.0, wxDouble ty=0.0) wxOVERRIDE;
|
||||
|
||||
// gets the component valuess of the matrix
|
||||
virtual void Get(wxDouble* a=NULL, wxDouble* b=NULL, wxDouble* c=NULL,
|
||||
wxDouble* d=NULL, wxDouble* tx=NULL, wxDouble* ty=NULL) const;
|
||||
wxDouble* d=NULL, wxDouble* tx=NULL, wxDouble* ty=NULL) const wxOVERRIDE;
|
||||
|
||||
// makes this the inverse matrix
|
||||
virtual void Invert();
|
||||
virtual void Invert() wxOVERRIDE;
|
||||
|
||||
// returns true if the elements of the transformation matrix are equal ?
|
||||
virtual bool IsEqual( const wxGraphicsMatrixData* t) const ;
|
||||
virtual bool IsEqual( const wxGraphicsMatrixData* t) const wxOVERRIDE;
|
||||
|
||||
// return true if this is the identity matrix
|
||||
virtual bool IsIdentity() const;
|
||||
virtual bool IsIdentity() const wxOVERRIDE;
|
||||
|
||||
//
|
||||
// transformation
|
||||
//
|
||||
|
||||
// add the translation to this matrix
|
||||
virtual void Translate( wxDouble dx , wxDouble dy );
|
||||
virtual void Translate( wxDouble dx , wxDouble dy ) wxOVERRIDE;
|
||||
|
||||
// add the scale to this matrix
|
||||
virtual void Scale( wxDouble xScale , wxDouble yScale );
|
||||
virtual void Scale( wxDouble xScale , wxDouble yScale ) wxOVERRIDE;
|
||||
|
||||
// add the rotation to this matrix (radians)
|
||||
virtual void Rotate( wxDouble angle );
|
||||
virtual void Rotate( wxDouble angle ) wxOVERRIDE;
|
||||
|
||||
//
|
||||
// apply the transforms
|
||||
//
|
||||
|
||||
// applies that matrix to the point
|
||||
virtual void TransformPoint( wxDouble *x, wxDouble *y ) const;
|
||||
virtual void TransformPoint( wxDouble *x, wxDouble *y ) const wxOVERRIDE;
|
||||
|
||||
// applies the matrix except for translations
|
||||
virtual void TransformDistance( wxDouble *dx, wxDouble *dy ) const;
|
||||
virtual void TransformDistance( wxDouble *dx, wxDouble *dy ) const wxOVERRIDE;
|
||||
|
||||
// returns the native representation
|
||||
virtual void * GetNativeMatrix() const;
|
||||
virtual void * GetNativeMatrix() const wxOVERRIDE;
|
||||
private:
|
||||
Matrix* m_matrix ;
|
||||
} ;
|
||||
@@ -316,7 +316,7 @@ public:
|
||||
~wxGDIPlusBitmapData ();
|
||||
|
||||
virtual Bitmap* GetGDIPlusBitmap() { return m_bitmap; }
|
||||
virtual void* GetNativeBitmap() const { return m_bitmap; }
|
||||
virtual void* GetNativeBitmap() const wxOVERRIDE { return m_bitmap; }
|
||||
|
||||
#if wxUSE_IMAGE
|
||||
wxImage ConvertToImage() const;
|
||||
@@ -367,69 +367,69 @@ public:
|
||||
|
||||
virtual ~wxGDIPlusContext();
|
||||
|
||||
virtual void Clip( const wxRegion ®ion );
|
||||
virtual void Clip( const wxRegion ®ion ) wxOVERRIDE;
|
||||
// clips drawings to the rect
|
||||
virtual void Clip( wxDouble x, wxDouble y, wxDouble w, wxDouble h );
|
||||
virtual void Clip( wxDouble x, wxDouble y, wxDouble w, wxDouble h ) wxOVERRIDE;
|
||||
|
||||
// resets the clipping to original extent
|
||||
virtual void ResetClip();
|
||||
virtual void ResetClip() wxOVERRIDE;
|
||||
|
||||
// returns bounding box of the clipping region
|
||||
virtual void GetClipBox(wxDouble* x, wxDouble* y, wxDouble* w, wxDouble* h) wxOVERRIDE;
|
||||
|
||||
virtual void * GetNativeContext();
|
||||
virtual void * GetNativeContext() wxOVERRIDE;
|
||||
|
||||
virtual void StrokePath( const wxGraphicsPath& p );
|
||||
virtual void FillPath( const wxGraphicsPath& p , wxPolygonFillMode fillStyle = wxODDEVEN_RULE );
|
||||
virtual void StrokePath( const wxGraphicsPath& p ) wxOVERRIDE;
|
||||
virtual void FillPath( const wxGraphicsPath& p , wxPolygonFillMode fillStyle = wxODDEVEN_RULE ) wxOVERRIDE;
|
||||
|
||||
virtual void DrawRectangle( wxDouble x, wxDouble y, wxDouble w, wxDouble h );
|
||||
virtual void DrawRectangle( wxDouble x, wxDouble y, wxDouble w, wxDouble h ) wxOVERRIDE;
|
||||
|
||||
// stroke lines connecting each of the points
|
||||
virtual void StrokeLines( size_t n, const wxPoint2DDouble *points);
|
||||
virtual void StrokeLines( size_t n, const wxPoint2DDouble *points) wxOVERRIDE;
|
||||
|
||||
// We don't have any specific implementation for this one in wxMSW but
|
||||
// override it just to avoid warnings about hiding the base class virtual.
|
||||
virtual void StrokeLines( size_t n, const wxPoint2DDouble *beginPoints, const wxPoint2DDouble *endPoints)
|
||||
virtual void StrokeLines( size_t n, const wxPoint2DDouble *beginPoints, const wxPoint2DDouble *endPoints) wxOVERRIDE
|
||||
{
|
||||
wxGraphicsContext::StrokeLines(n, beginPoints, endPoints);
|
||||
}
|
||||
|
||||
// draws a polygon
|
||||
virtual void DrawLines( size_t n, const wxPoint2DDouble *points, wxPolygonFillMode fillStyle = wxODDEVEN_RULE );
|
||||
virtual void DrawLines( size_t n, const wxPoint2DDouble *points, wxPolygonFillMode fillStyle = wxODDEVEN_RULE ) wxOVERRIDE;
|
||||
|
||||
virtual bool SetAntialiasMode(wxAntialiasMode antialias);
|
||||
virtual bool SetAntialiasMode(wxAntialiasMode antialias) wxOVERRIDE;
|
||||
|
||||
virtual bool SetInterpolationQuality(wxInterpolationQuality interpolation);
|
||||
virtual bool SetInterpolationQuality(wxInterpolationQuality interpolation) wxOVERRIDE;
|
||||
|
||||
virtual bool SetCompositionMode(wxCompositionMode op);
|
||||
virtual bool SetCompositionMode(wxCompositionMode op) wxOVERRIDE;
|
||||
|
||||
virtual void BeginLayer(wxDouble opacity);
|
||||
virtual void BeginLayer(wxDouble opacity) wxOVERRIDE;
|
||||
|
||||
virtual void EndLayer();
|
||||
virtual void EndLayer() wxOVERRIDE;
|
||||
|
||||
virtual void Translate( wxDouble dx , wxDouble dy );
|
||||
virtual void Scale( wxDouble xScale , wxDouble yScale );
|
||||
virtual void Rotate( wxDouble angle );
|
||||
virtual void Translate( wxDouble dx , wxDouble dy ) wxOVERRIDE;
|
||||
virtual void Scale( wxDouble xScale , wxDouble yScale ) wxOVERRIDE;
|
||||
virtual void Rotate( wxDouble angle ) wxOVERRIDE;
|
||||
|
||||
// concatenates this transform with the current transform of this context
|
||||
virtual void ConcatTransform( const wxGraphicsMatrix& matrix );
|
||||
virtual void ConcatTransform( const wxGraphicsMatrix& matrix ) wxOVERRIDE;
|
||||
|
||||
// sets the transform of this context
|
||||
virtual void SetTransform( const wxGraphicsMatrix& matrix );
|
||||
virtual void SetTransform( const wxGraphicsMatrix& matrix ) wxOVERRIDE;
|
||||
|
||||
// gets the matrix of this context
|
||||
virtual wxGraphicsMatrix GetTransform() const;
|
||||
virtual wxGraphicsMatrix GetTransform() const wxOVERRIDE;
|
||||
|
||||
virtual void DrawBitmap( const wxGraphicsBitmap &bmp, wxDouble x, wxDouble y, wxDouble w, wxDouble h );
|
||||
virtual void DrawBitmap( const wxBitmap &bmp, wxDouble x, wxDouble y, wxDouble w, wxDouble h );
|
||||
virtual void DrawIcon( const wxIcon &icon, wxDouble x, wxDouble y, wxDouble w, wxDouble h );
|
||||
virtual void PushState();
|
||||
virtual void PopState();
|
||||
virtual void DrawBitmap( const wxGraphicsBitmap &bmp, wxDouble x, wxDouble y, wxDouble w, wxDouble h ) wxOVERRIDE;
|
||||
virtual void DrawBitmap( const wxBitmap &bmp, wxDouble x, wxDouble y, wxDouble w, wxDouble h ) wxOVERRIDE;
|
||||
virtual void DrawIcon( const wxIcon &icon, wxDouble x, wxDouble y, wxDouble w, wxDouble h ) wxOVERRIDE;
|
||||
virtual void PushState() wxOVERRIDE;
|
||||
virtual void PopState() wxOVERRIDE;
|
||||
|
||||
virtual void GetTextExtent( const wxString &str, wxDouble *width, wxDouble *height,
|
||||
wxDouble *descent, wxDouble *externalLeading ) const;
|
||||
virtual void GetPartialTextExtents(const wxString& text, wxArrayDouble& widths) const;
|
||||
virtual bool ShouldOffset() const;
|
||||
wxDouble *descent, wxDouble *externalLeading ) const wxOVERRIDE;
|
||||
virtual void GetPartialTextExtents(const wxString& text, wxArrayDouble& widths) const wxOVERRIDE;
|
||||
virtual bool ShouldOffset() const wxOVERRIDE;
|
||||
virtual void GetSize( wxDouble* width, wxDouble *height );
|
||||
|
||||
Graphics* GetGraphics() const { return m_context; }
|
||||
@@ -443,7 +443,7 @@ protected:
|
||||
void Init(Graphics* graphics, int width, int height);
|
||||
|
||||
private:
|
||||
virtual void DoDrawText(const wxString& str, wxDouble x, wxDouble y);
|
||||
virtual void DoDrawText(const wxString& str, wxDouble x, wxDouble y) wxOVERRIDE;
|
||||
|
||||
Graphics* m_context;
|
||||
wxStack<GraphicsState> m_stateStack;
|
||||
@@ -537,75 +537,75 @@ public :
|
||||
|
||||
// Context
|
||||
|
||||
virtual wxGraphicsContext * CreateContext( const wxWindowDC& dc);
|
||||
virtual wxGraphicsContext * CreateContext( const wxWindowDC& dc) wxOVERRIDE;
|
||||
|
||||
virtual wxGraphicsContext * CreateContext( const wxMemoryDC& dc);
|
||||
virtual wxGraphicsContext * CreateContext( const wxMemoryDC& dc) wxOVERRIDE;
|
||||
|
||||
#if wxUSE_PRINTING_ARCHITECTURE
|
||||
virtual wxGraphicsContext * CreateContext( const wxPrinterDC& dc);
|
||||
virtual wxGraphicsContext * CreateContext( const wxPrinterDC& dc) wxOVERRIDE;
|
||||
#endif
|
||||
|
||||
#if wxUSE_ENH_METAFILE
|
||||
virtual wxGraphicsContext * CreateContext( const wxEnhMetaFileDC& dc);
|
||||
virtual wxGraphicsContext * CreateContext( const wxEnhMetaFileDC& dc) wxOVERRIDE;
|
||||
#endif
|
||||
|
||||
virtual wxGraphicsContext * CreateContextFromNativeContext( void * context );
|
||||
virtual wxGraphicsContext * CreateContextFromNativeContext( void * context ) wxOVERRIDE;
|
||||
|
||||
virtual wxGraphicsContext * CreateContextFromNativeWindow( void * window );
|
||||
virtual wxGraphicsContext * CreateContextFromNativeWindow( void * window ) wxOVERRIDE;
|
||||
|
||||
virtual wxGraphicsContext * CreateContext( wxWindow* window );
|
||||
virtual wxGraphicsContext * CreateContext( wxWindow* window ) wxOVERRIDE;
|
||||
|
||||
#if wxUSE_IMAGE
|
||||
virtual wxGraphicsContext * CreateContextFromImage(wxImage& image);
|
||||
virtual wxGraphicsContext * CreateContextFromImage(wxImage& image) wxOVERRIDE;
|
||||
#endif // wxUSE_IMAGE
|
||||
|
||||
virtual wxGraphicsContext * CreateMeasuringContext();
|
||||
virtual wxGraphicsContext * CreateMeasuringContext() wxOVERRIDE;
|
||||
|
||||
// Path
|
||||
|
||||
virtual wxGraphicsPath CreatePath();
|
||||
virtual wxGraphicsPath CreatePath() wxOVERRIDE;
|
||||
|
||||
// Matrix
|
||||
|
||||
virtual wxGraphicsMatrix CreateMatrix( wxDouble a=1.0, wxDouble b=0.0, wxDouble c=0.0, wxDouble d=1.0,
|
||||
wxDouble tx=0.0, wxDouble ty=0.0);
|
||||
wxDouble tx=0.0, wxDouble ty=0.0) wxOVERRIDE;
|
||||
|
||||
|
||||
virtual wxGraphicsPen CreatePen(const wxPen& pen) ;
|
||||
virtual wxGraphicsPen CreatePen(const wxPen& pen) wxOVERRIDE;
|
||||
|
||||
virtual wxGraphicsBrush CreateBrush(const wxBrush& brush ) ;
|
||||
virtual wxGraphicsBrush CreateBrush(const wxBrush& brush ) wxOVERRIDE;
|
||||
|
||||
virtual wxGraphicsBrush
|
||||
CreateLinearGradientBrush(wxDouble x1, wxDouble y1,
|
||||
wxDouble x2, wxDouble y2,
|
||||
const wxGraphicsGradientStops& stops);
|
||||
const wxGraphicsGradientStops& stops) wxOVERRIDE;
|
||||
|
||||
virtual wxGraphicsBrush
|
||||
CreateRadialGradientBrush(wxDouble xo, wxDouble yo,
|
||||
wxDouble xc, wxDouble yc,
|
||||
wxDouble radius,
|
||||
const wxGraphicsGradientStops& stops);
|
||||
const wxGraphicsGradientStops& stops) wxOVERRIDE;
|
||||
|
||||
// create a native bitmap representation
|
||||
virtual wxGraphicsBitmap CreateBitmap( const wxBitmap &bitmap );
|
||||
virtual wxGraphicsBitmap CreateBitmap( const wxBitmap &bitmap ) wxOVERRIDE;
|
||||
#if wxUSE_IMAGE
|
||||
virtual wxGraphicsBitmap CreateBitmapFromImage(const wxImage& image);
|
||||
virtual wxImage CreateImageFromBitmap(const wxGraphicsBitmap& bmp);
|
||||
virtual wxGraphicsBitmap CreateBitmapFromImage(const wxImage& image) wxOVERRIDE;
|
||||
virtual wxImage CreateImageFromBitmap(const wxGraphicsBitmap& bmp) wxOVERRIDE;
|
||||
#endif // wxUSE_IMAGE
|
||||
|
||||
virtual wxGraphicsFont CreateFont( const wxFont& font,
|
||||
const wxColour& col);
|
||||
const wxColour& col) wxOVERRIDE;
|
||||
|
||||
virtual wxGraphicsFont CreateFont(double size,
|
||||
const wxString& facename,
|
||||
int flags = wxFONTFLAG_DEFAULT,
|
||||
const wxColour& col = *wxBLACK);
|
||||
const wxColour& col = *wxBLACK) wxOVERRIDE;
|
||||
|
||||
// create a graphics bitmap from a native bitmap
|
||||
virtual wxGraphicsBitmap CreateBitmapFromNativeBitmap( void* bitmap );
|
||||
virtual wxGraphicsBitmap CreateBitmapFromNativeBitmap( void* bitmap ) wxOVERRIDE;
|
||||
|
||||
// create a subimage from a native image representation
|
||||
virtual wxGraphicsBitmap CreateSubBitmap( const wxGraphicsBitmap &bitmap, wxDouble x, wxDouble y, wxDouble w, wxDouble h );
|
||||
virtual wxGraphicsBitmap CreateSubBitmap( const wxGraphicsBitmap &bitmap, wxDouble x, wxDouble y, wxDouble w, wxDouble h ) wxOVERRIDE;
|
||||
|
||||
virtual wxString GetName() const wxOVERRIDE;
|
||||
virtual void GetVersion(int *major, int *minor, int *micro) const wxOVERRIDE;
|
||||
@@ -2639,8 +2639,8 @@ public:
|
||||
AddDependency("wxGdiPlusModule");
|
||||
}
|
||||
|
||||
virtual bool OnInit() { return true; }
|
||||
virtual void OnExit()
|
||||
virtual bool OnInit() wxOVERRIDE { return true; }
|
||||
virtual void OnExit() wxOVERRIDE
|
||||
{
|
||||
wxDELETE(gs_drawTextStringFormat);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user