X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/34138703c3997ce676a1e713d9ff9eb020640da7..cd2df130f8162dc2cf9794c1507cd4bddce53910:/include/wx/stubs/dc.h diff --git a/include/wx/stubs/dc.h b/include/wx/stubs/dc.h index f2c2ca6c4d..ce3e9998d1 100644 --- a/include/wx/stubs/dc.h +++ b/include/wx/stubs/dc.h @@ -61,10 +61,10 @@ class WXDLLEXPORT wxDC: public wxObject virtual bool Ok(void) const { return m_ok; }; - virtual void FloodFill( long x1, long y1, wxColour* col, int style=wxFLOOD_SURFACE ) = 0; + virtual void FloodFill( long x1, long y1, const wxColour& col, int style=wxFLOOD_SURFACE ) = 0; inline void FloodFill(const wxPoint& pt, const wxColour& col, int style=wxFLOOD_SURFACE) { - FloodFill(pt.x, pt.y, (wxColour*) & col, style); + FloodFill(pt.x, pt.y, col, style); } virtual bool GetPixel( long x1, long y1, wxColour *col ) const = 0; @@ -137,7 +137,7 @@ class WXDLLEXPORT wxDC: public wxObject } virtual void DrawSpline( long x1, long y1, long x2, long y2, long x3, long y3 ); - virtual void DrawSpline( wxList *points ); + virtual void DrawSpline( wxList *points ) = 0; virtual void DrawSpline( int n, wxPoint points[] ); virtual bool CanDrawBitmap(void) const = 0; @@ -177,16 +177,16 @@ class WXDLLEXPORT wxDC: public wxObject virtual void Clear(void) = 0; virtual void SetFont( const wxFont &font ) = 0; - virtual wxFont *GetFont(void) const { return (wxFont*) &m_font; }; + virtual wxFont& GetFont(void) const { return (wxFont&) m_font; }; virtual void SetPen( const wxPen &pen ) = 0; - virtual wxPen *GetPen(void) const { return (wxPen*) &m_pen; }; + virtual wxPen& GetPen(void) const { return (wxPen&) m_pen; }; virtual void SetBrush( const wxBrush &brush ) = 0; - virtual wxBrush *GetBrush(void) const { return (wxBrush*) &m_brush; }; + virtual wxBrush& GetBrush(void) const { return (wxBrush&) m_brush; }; virtual void SetBackground( const wxBrush &brush ) = 0; - virtual wxBrush *GetBackground(void) const { return (wxBrush*) &m_backgroundBrush; }; + virtual wxBrush& GetBackground(void) const { return (wxBrush&) m_backgroundBrush; }; virtual void SetLogicalFunction( int function ) = 0; virtual int GetLogicalFunction(void) const { return m_logicalFunction; }; @@ -316,8 +316,6 @@ class WXDLLEXPORT wxDC: public wxObject return (long)((double)(y) * m_scaleY - 0.5); } - virtual void DrawOpenSpline( wxList *points ) = 0; - public: bool m_ok;