X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0b822969a677939811d9fb966177031fb5fc625b..a7689c49fe02c0c065facf736ab28b19f5997b7c:/include/wx/gtk/dcclient.h?ds=sidebyside diff --git a/include/wx/gtk/dcclient.h b/include/wx/gtk/dcclient.h index 29e35429a5..b64f995348 100644 --- a/include/wx/gtk/dcclient.h +++ b/include/wx/gtk/dcclient.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: dcclient.h +// Name: wx/gtk/dcclient.h // Purpose: // Author: Robert Roebling // Id: $Id$ @@ -11,10 +11,6 @@ #define _WX_GTKDCCLIENT_H_ #include "wx/gtk/dc.h" -#include "wx/dcclient.h" -#include "wx/region.h" - -class WXDLLIMPEXP_FWD_CORE wxWindow; //----------------------------------------------------------------------------- // wxWindowDCImpl @@ -32,7 +28,8 @@ public: virtual bool CanGetTextExtent() const { return true; } virtual void DoGetSize(int *width, int *height) const; - virtual bool DoFloodFill( wxCoord x, wxCoord y, const wxColour& col, int style=wxFLOOD_SURFACE ); + virtual bool DoFloodFill( wxCoord x, wxCoord y, const wxColour& col, + wxFloodFillStyle style=wxFLOOD_SURFACE ); virtual bool DoGetPixel( wxCoord x1, wxCoord y1, wxColour *col ) const; virtual void DoDrawLine( wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2 ); @@ -47,7 +44,7 @@ public: wxCoord xoffset, wxCoord yoffset); virtual void DoDrawPolygon(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset, - int fillStyle = wxODDEVEN_RULE); + wxPolygonFillMode fillStyle = wxODDEVEN_RULE); virtual void DoDrawRectangle( wxCoord x, wxCoord y, wxCoord width, wxCoord height ); virtual void DoDrawRoundedRectangle( wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius = 20.0 ); @@ -57,21 +54,24 @@ public: virtual void DoDrawBitmap( const wxBitmap &bitmap, wxCoord x, wxCoord y, bool useMask = false ); - virtual bool DoBlit( wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height, + virtual bool DoBlit( wxCoord xdest, wxCoord ydest, + wxCoord width, wxCoord height, wxDC *source, wxCoord xsrc, wxCoord ysrc, - int logical_func = wxCOPY, bool useMask = false, wxCoord xsrcMask = -1, wxCoord ysrcMask = -1 ); + wxRasterOperationMode 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, double angle); virtual void DoGetTextExtent( const wxString &string, wxCoord *width, wxCoord *height, - wxCoord *descent = (wxCoord *) NULL, - wxCoord *externalLeading = (wxCoord *) NULL, - const wxFont *theFont = (wxFont *) NULL) const; + wxCoord *descent = NULL, + wxCoord *externalLeading = NULL, + const wxFont *theFont = NULL) const; virtual bool DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) const; virtual void DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord width, wxCoord height ); - virtual void DoSetClippingRegionAsRegion( const wxRegion ®ion ); + virtual void DoSetDeviceClippingRegion( const wxRegion ®ion ); virtual wxCoord GetCharWidth() const; virtual wxCoord GetCharHeight() const; @@ -82,7 +82,7 @@ public: 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 SetLogicalFunction( wxRasterOperationMode function ); virtual void SetTextForeground( const wxColour &col ); virtual void SetTextBackground( const wxColour &col ); virtual void SetBackgroundMode( int mode ); @@ -119,13 +119,14 @@ public: void SetUpDC( bool ismem = false ); void Destroy(); - + virtual void ComputeScaleAndOrigin(); virtual GdkWindow *GetGDKWindow() const { return m_gdkwindow; } private: void DrawingSetup(GdkGC*& gc, bool& originChanged); + GdkPixmap* MonoToColor(GdkPixmap* monoPixmap, int x, int y, int w, int h) const; DECLARE_ABSTRACT_CLASS(wxWindowDCImpl) };