X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c801d85f158c4cba50b588807daabdcbd0ed3853..4fabb57533169f2f75367e0d120c762518548890:/include/wx/gtk/dcclient.h diff --git a/include/wx/gtk/dcclient.h b/include/wx/gtk/dcclient.h index 7ae3e3099c..2797a151cf 100644 --- a/include/wx/gtk/dcclient.h +++ b/include/wx/gtk/dcclient.h @@ -2,9 +2,8 @@ // Name: dcclient.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 ///////////////////////////////////////////////////////////////////////////// @@ -70,8 +69,8 @@ class wxPaintDC: public wxDC virtual void DrawText( const wxString &text, long x, long y, bool use16 = FALSE ); virtual bool CanGetTextExtent(void) const; virtual void GetTextExtent( const wxString &string, long *width, long *height, - long *descent = NULL, long *externalLeading = NULL, - wxFont *theFont = NULL, bool use16 = FALSE ); + long *descent = (long *) NULL, long *externalLeading = (long *) NULL, + wxFont *theFont = (wxFont *) NULL, bool use16 = FALSE ); virtual long GetCharWidth(void); virtual long GetCharHeight(void); @@ -80,6 +79,7 @@ class wxPaintDC: public wxDC 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 SetLogicalFunction( int function ); virtual void SetTextForeground( const wxColour &col ); virtual void SetTextBackground( const wxColour &col ); @@ -89,7 +89,7 @@ class wxPaintDC: public wxDC virtual void SetClippingRegion( long x, long y, long width, long height ); virtual void DestroyClippingRegion(void); - virtual void DrawOpenSpline( wxList *points ); + virtual void DrawSpline( wxList *points ); public: // shouldn't be public @@ -99,8 +99,10 @@ class wxPaintDC: public wxDC GdkGC *m_textGC; GdkGC *m_bgGC; GdkColormap *m_cmap; + bool m_isMemDC; void SetUpDC(void); + void Destroy(void); GdkWindow *GetWindow(void); };