X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/888dde65f43d5f57e8fb2028b27191cca1741403..1bcef6701be81d1f4473eb5a297bdf20fa292d98:/include/wx/generic/dcpsg.h diff --git a/include/wx/generic/dcpsg.h b/include/wx/generic/dcpsg.h index 4e05b2e930..65e36cbce8 100644 --- a/include/wx/generic/dcpsg.h +++ b/include/wx/generic/dcpsg.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: wx/generic/dcps.h +// Name: wx/generic/dcpsg.h // Purpose: wxPostScriptDC class // Author: Julian Smart and others // Modified by: @@ -27,42 +27,26 @@ //----------------------------------------------------------------------------- -#if wxUSE_NEW_DC - -class WXDLLEXPORT wxPostScriptDC : public wxDC +class WXDLLIMPEXP_CORE wxPostScriptDC : public wxDC { public: wxPostScriptDC(); // Recommended constructor wxPostScriptDC(const wxPrintData& printData); - + private: DECLARE_DYNAMIC_CLASS(wxPostScriptDC) }; -#endif - -#if wxUSE_NEW_DC -class WXDLLEXPORT wxPostScriptDCImpl : public wxDCImpl -#else -#define wxPostScriptDCImpl wxPostScriptDC -class WXDLLEXPORT wxPostScriptDC : public wxDC -#endif +class WXDLLIMPEXP_CORE wxPostScriptDCImpl : public wxDCImpl { public: -#if wxUSE_NEW_DC wxPostScriptDCImpl( wxPrinterDC *owner ); wxPostScriptDCImpl( wxPrinterDC *owner, const wxPrintData& data ); wxPostScriptDCImpl( wxPostScriptDC *owner ); wxPostScriptDCImpl( wxPostScriptDC *owner, const wxPrintData& data ); -#else - wxPostScriptDC(); - // Recommended constructor - wxPostScriptDC(const wxPrintData& printData); -#endif - void Init(); virtual ~wxPostScriptDCImpl(); @@ -76,7 +60,7 @@ public: void SetFont( const wxFont& font ); void SetPen( const wxPen& pen ); void SetBrush( const wxBrush& brush ); - void SetLogicalFunction( int function ); + void SetLogicalFunction( wxRasterOperationMode function ); void SetBackground( const wxBrush& brush ); void DestroyClippingRegion(); @@ -93,18 +77,6 @@ public: // Resolution in pixels per logical inch wxSize GetPPI() const; -#if wxUSE_NEW_DC -#else - // these need to be overridden as wxPostscriptDC inherits - // from the platform dependent wxDC and this we'd call - // e.g. wxMSW specific code here. - virtual void SetAxisOrientation( bool xLeftRight, bool yBottomUp ); - virtual void SetMapMode(int mode); - virtual void SetUserScale(double x, double y); - virtual void SetLogicalScale(double x, double y); - virtual void SetLogicalOrigin(wxCoord x, wxCoord y); - virtual void SetDeviceOrigin(wxCoord x, wxCoord y); -#endif virtual void ComputeScaleAndOrigin(); void SetBackgroundMode(int WXUNUSED(mode)) { } @@ -116,14 +88,17 @@ public: virtual int GetDepth() const { return 24; } void PsPrint( const wxString& psdata ); - + // Overrridden for wxPrinterDC Impl - - virtual int GetResolution(); - virtual wxRect GetPaperRect(); + virtual int GetResolution() const; + virtual wxRect GetPaperRect() const; + + virtual void* GetHandle() const { return NULL; } + protected: - bool DoFloodFill(wxCoord x1, wxCoord y1, const wxColour &col, int style = wxFLOOD_SURFACE); + bool DoFloodFill(wxCoord x1, wxCoord y1, const wxColour &col, + wxFloodFillStyle style = wxFLOOD_SURFACE); bool DoGetPixel(wxCoord x1, wxCoord y1, wxColour *col) const; void DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2); void DoCrossHair(wxCoord x, wxCoord y) ; @@ -131,8 +106,12 @@ protected: void DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,double sa,double ea); void DoDrawPoint(wxCoord x, wxCoord y); void DoDrawLines(int n, wxPoint points[], wxCoord xoffset = 0, wxCoord yoffset = 0); - void DoDrawPolygon(int n, wxPoint points[], wxCoord xoffset = 0, wxCoord yoffset = 0, int fillStyle = wxODDEVEN_RULE); - void DoDrawPolyPolygon(int n, int count[], wxPoint points[], wxCoord xoffset = 0, wxCoord yoffset = 0, int fillStyle = wxODDEVEN_RULE); + void DoDrawPolygon(int n, wxPoint points[], + wxCoord xoffset = 0, wxCoord yoffset = 0, + wxPolygonFillMode fillStyle = wxODDEVEN_RULE); + void DoDrawPolyPolygon(int n, int count[], wxPoint points[], + wxCoord xoffset = 0, wxCoord yoffset = 0, + wxPolygonFillMode fillStyle = wxODDEVEN_RULE); void DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height); void DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius = 20); void DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height); @@ -140,14 +119,18 @@ protected: void DoDrawSpline(const wxPointList *points); #endif bool DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height, - wxDC *source, wxCoord xsrc, wxCoord ysrc, int rop = wxCOPY, bool useMask = false, + wxDC *source, wxCoord xsrc, wxCoord ysrc, + wxRasterOperationMode rop = wxCOPY, bool useMask = false, wxCoord xsrcMask = wxDefaultCoord, wxCoord ysrcMask = wxDefaultCoord); void DoDrawIcon(const wxIcon& icon, wxCoord x, wxCoord y); void DoDrawBitmap(const wxBitmap& bitmap, wxCoord x, wxCoord y, bool useMask = false); void DoDrawText(const wxString& text, wxCoord x, wxCoord y); void DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord y, double angle); void DoSetClippingRegion(wxCoord x, wxCoord y, wxCoord width, wxCoord height); - void DoSetClippingRegionAsRegion( const wxRegion &WXUNUSED(clip)) { } + void DoSetDeviceClippingRegion( const wxRegion &WXUNUSED(clip)) + { + wxFAIL_MSG( "not implemented" ); + } void DoGetTextExtent(const wxString& string, wxCoord *x, wxCoord *y, wxCoord *descent = NULL, wxCoord *externalLeading = NULL, @@ -156,7 +139,6 @@ protected: void DoGetSizeMM(int *width, int *height) const; FILE* m_pstream; // PostScript output stream - wxString m_title; unsigned char m_currentRed; unsigned char m_currentGreen; unsigned char m_currentBlue;