X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1e6feb95a79834836e88143b15d9f424ebe79621..1bc7969717b319226d221ab84ebda3298d928b0c:/include/wx/gtk/dcclient.h?ds=sidebyside diff --git a/include/wx/gtk/dcclient.h b/include/wx/gtk/dcclient.h index 752fd09462..2555d5b388 100644 --- a/include/wx/gtk/dcclient.h +++ b/include/wx/gtk/dcclient.h @@ -10,10 +10,6 @@ #ifndef __GTKDCCLIENTH__ #define __GTKDCCLIENTH__ -#ifdef __GNUG__ -#pragma interface -#endif - #include "wx/dc.h" #include "wx/window.h" @@ -21,28 +17,28 @@ // classes //----------------------------------------------------------------------------- -class wxWindowDC; -class wxPaintDC; -class wxClientDC; +class WXDLLIMPEXP_CORE wxWindowDC; +class WXDLLIMPEXP_CORE wxPaintDC; +class WXDLLIMPEXP_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 DoGetSize(int *width, int *height) const; - virtual void DoFloodFill( wxCoord x, wxCoord y, const wxColour& col, int style=wxFLOOD_SURFACE ); + 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 ); @@ -65,11 +61,11 @@ protected: 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, @@ -79,6 +75,8 @@ protected: wxCoord *descent = (wxCoord *) NULL, wxCoord *externalLeading = (wxCoord *) NULL, wxFont *theFont = (wxFont *) NULL) const; + virtual void DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord width, wxCoord height ); + virtual void DoSetClippingRegionAsRegion( const wxRegion ®ion ); public: virtual wxCoord GetCharWidth() const; @@ -96,9 +94,7 @@ public: virtual void SetBackgroundMode( int mode ); virtual void SetPalette( const wxPalette& palette ); - virtual void DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord width, wxCoord height ); virtual void DestroyClippingRegion(); - virtual void DoSetClippingRegionAsRegion( const wxRegion ®ion ); // Resolution in pixels per logical inch virtual wxSize GetPPI() const; @@ -118,14 +114,15 @@ public: wxWindow *m_owner; wxRegion m_currentClippingRegion; wxRegion m_paintClippingRegion; -#ifdef __WXGTK20__ + + // PangoContext stuff for GTK 2.0 PangoContext *m_context; + PangoLayout *m_layout; PangoFontDescription *m_fontdesc; -#endif void SetUpDC(); void Destroy(); - void ComputeScaleAndOrigin(); + virtual void ComputeScaleAndOrigin(); GdkWindow *GetWindow() { return m_window; } @@ -137,10 +134,10 @@ private: // wxClientDC //----------------------------------------------------------------------------- -class wxClientDC : public wxWindowDC +class WXDLLIMPEXP_CORE wxClientDC : public wxWindowDC { public: - wxClientDC(); + wxClientDC() { } wxClientDC( wxWindow *win ); protected: @@ -154,7 +151,7 @@ private: // wxPaintDC //----------------------------------------------------------------------------- -class wxPaintDC : public wxClientDC +class WXDLLIMPEXP_CORE wxPaintDC : public wxClientDC { public: wxPaintDC() { }