X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3d2d8da1d89c195cb44f95f267989118e205c7bf..3b49331b7441e091fc5997b830801d76a1243f28:/include/wx/gtk1/dcclient.h diff --git a/include/wx/gtk1/dcclient.h b/include/wx/gtk1/dcclient.h index a70c424edb..bd31d9b113 100644 --- a/include/wx/gtk1/dcclient.h +++ b/include/wx/gtk1/dcclient.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: dcclient.h +// Name: wx/gtk1/dcclient.h // Purpose: // Author: Robert Roebling // Id: $Id$ @@ -10,10 +10,6 @@ #ifndef __GTKDCCLIENTH__ #define __GTKDCCLIENTH__ -#ifdef __GNUG__ -#pragma interface -#endif - #include "wx/dc.h" #include "wx/window.h" @@ -21,27 +17,28 @@ // classes //----------------------------------------------------------------------------- -class wxWindowDC; -class wxPaintDC; -class wxClientDC; +class WXDLLIMPEXP_FWD_CORE wxWindowDC; +class WXDLLIMPEXP_FWD_CORE wxPaintDC; +class WXDLLIMPEXP_FWD_CORE wxClientDC; //----------------------------------------------------------------------------- // wxWindowDC //----------------------------------------------------------------------------- -class wxWindowDC : public wxDC +class WXDLLIMPEXP_CORE wxWindowDC : public wxDC { public: wxWindowDC(); wxWindowDC( wxWindow *win ); - ~wxWindowDC(); + virtual ~wxWindowDC(); - virtual bool CanDrawBitmap() const { return TRUE; } - virtual bool CanGetTextExtent() const { return TRUE; } + virtual bool CanDrawBitmap() const { return true; } + virtual bool CanGetTextExtent() const { return true; } -//protected: - virtual void DoFloodFill( wxCoord x, wxCoord y, const wxColour& col, int style=wxFLOOD_SURFACE ); +protected: + virtual void DoGetSize(int *width, int *height) const; + virtual bool DoFloodFill( wxCoord x, wxCoord y, const wxColour& col, int style=wxFLOOD_SURFACE ); virtual bool DoGetPixel( wxCoord x1, wxCoord y1, wxColour *col ) const; virtual void DoDrawLine( wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2 ); @@ -64,11 +61,11 @@ public: virtual void DoDrawIcon( const wxIcon &icon, wxCoord x, wxCoord y ); virtual void DoDrawBitmap( const wxBitmap &bitmap, wxCoord x, wxCoord y, - bool useMask = FALSE ); + bool useMask = false ); virtual bool DoBlit( wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height, wxDC *source, wxCoord xsrc, wxCoord ysrc, - int logical_func = wxCOPY, bool useMask = FALSE ); + int logical_func = wxCOPY, bool useMask = false, wxCoord xsrcMask = -1, wxCoord ysrcMask = -1 ); virtual void DoDrawText( const wxString &text, wxCoord x, wxCoord y ); virtual void DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord y, @@ -77,7 +74,9 @@ public: wxCoord *width, wxCoord *height, wxCoord *descent = (wxCoord *) NULL, wxCoord *externalLeading = (wxCoord *) NULL, - wxFont *theFont = (wxFont *) NULL) const; + const wxFont *theFont = (wxFont *) NULL) const; + +public: virtual wxCoord GetCharWidth() const; virtual wxCoord GetCharHeight() const; @@ -97,14 +96,12 @@ public: virtual void DestroyClippingRegion(); virtual void DoSetClippingRegionAsRegion( const wxRegion ®ion ); -#if wxUSE_SPLINES - virtual void DoDrawSpline( wxList *points ); -#endif - // Resolution in pixels per logical inch virtual wxSize GetPPI() const; virtual int GetDepth() const; + virtual GdkWindow* GetGDKWindow() const { return m_window; } + // implementation // -------------- @@ -115,13 +112,14 @@ public: GdkGC *m_bgGC; GdkColormap *m_cmap; bool m_isMemDC; + bool m_isScreenDC; wxWindow *m_owner; wxRegion m_currentClippingRegion; wxRegion m_paintClippingRegion; void SetUpDC(); void Destroy(); - void ComputeScaleAndOrigin(); + virtual void ComputeScaleAndOrigin(); GdkWindow *GetWindow() { return m_window; } @@ -130,31 +128,34 @@ private: }; //----------------------------------------------------------------------------- -// wxPaintDC +// wxClientDC //----------------------------------------------------------------------------- -class wxPaintDC : public wxWindowDC +class WXDLLIMPEXP_CORE wxClientDC : public wxWindowDC { public: - wxPaintDC(); - wxPaintDC( wxWindow *win ); + wxClientDC() { } + wxClientDC( wxWindow *win ); + +protected: + virtual void DoGetSize(int *width, int *height) const; private: - DECLARE_DYNAMIC_CLASS(wxPaintDC) + DECLARE_DYNAMIC_CLASS(wxClientDC) }; //----------------------------------------------------------------------------- -// wxClientDC +// wxPaintDC //----------------------------------------------------------------------------- -class wxClientDC : public wxWindowDC +class WXDLLIMPEXP_CORE wxPaintDC : public wxClientDC { public: - wxClientDC(); - wxClientDC( wxWindow *win ); + wxPaintDC() { } + wxPaintDC( wxWindow *win ); private: - DECLARE_DYNAMIC_CLASS(wxClientDC) + DECLARE_DYNAMIC_CLASS(wxPaintDC) }; #endif // __GTKDCCLIENTH__