X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/11026f7b59168c36240b4db4c3deaef5dd936846..33a5bc5299a068b4d6a313a7dc830a74edb5780a:/include/wx/gtk1/dc.h diff --git a/include/wx/gtk1/dc.h b/include/wx/gtk1/dc.h index e2a3af7b40..1c778cfbf8 100644 --- a/include/wx/gtk1/dc.h +++ b/include/wx/gtk1/dc.h @@ -2,9 +2,8 @@ // Name: dc.h // Purpose: // Author: Robert Roebling -// Created: 01/02/97 -// Id: -// Copyright: (c) 1998 Robert Roebling, Julian Smart and Markus Holzem +// Id: $Id$ +// Copyright: (c) 1998 Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -66,7 +65,7 @@ class wxDC: public wxObject void BeginDrawing(void) {}; void EndDrawing(void) {}; - virtual bool Ok(void) const { return m_ok; }; + virtual bool Ok(void) const; virtual void FloodFill( long x1, long y1, wxColour *col, int style=wxFLOOD_SURFACE ) = 0; virtual bool GetPixel( long x1, long y1, wxColour *col ) const = 0; @@ -90,7 +89,7 @@ class wxDC: public wxObject virtual void DrawEllipse( long x, long y, long width, long height ) = 0; 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; @@ -105,8 +104,8 @@ class wxDC: public wxObject virtual void DrawText( const wxString &text, long x, long y, bool use16 = FALSE ) = 0; virtual bool CanGetTextExtent(void) const = 0; virtual void GetTextExtent( const wxString &string, long *width, long *height, - long *descent = NULL, long *externalLeading = NULL, - wxFont *theFont = NULL, bool use16 = FALSE ) = 0; + long *descent = (long *) NULL, long *externalLeading = (long *) NULL, + wxFont *theFont = (wxFont *) NULL, bool use16 = FALSE ) = 0; virtual long GetCharWidth(void) = 0; virtual long GetCharHeight(void) = 0; @@ -250,7 +249,6 @@ class wxDC: public wxObject return (long)((double)(y) * m_scaleY - 0.5); } - virtual void DrawOpenSpline( wxList *points ) = 0; public: