X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4f37154e988c597e32a840e43783cf0b23e5f8b4..53107283f366d1d4950559afcbf056e901e778fd:/include/wx/generic/dcpsg.h diff --git a/include/wx/generic/dcpsg.h b/include/wx/generic/dcpsg.h index 4e84bfeffe..5c0a7ef214 100644 --- a/include/wx/generic/dcpsg.h +++ b/include/wx/generic/dcpsg.h @@ -27,45 +27,29 @@ //----------------------------------------------------------------------------- -#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 wxPostScriptImplDC : public wxImplDC -#else -#define wxPostScriptImplDC wxPostScriptDC -class WXDLLEXPORT wxPostScriptDC : public wxDC -#endif +class WXDLLIMPEXP_CORE wxPostScriptDCImpl : public wxDCImpl { public: -#if wxUSE_NEW_DC - wxPostScriptImplDC( wxPrinterDC *owner ); - wxPostScriptImplDC( wxPrinterDC *owner, const wxPrintData& data ); - wxPostScriptImplDC( wxPostScriptDC *owner ); - wxPostScriptImplDC( wxPostScriptDC *owner, const wxPrintData& data ); -#else - wxPostScriptDC(); + wxPostScriptDCImpl( wxPrinterDC *owner ); + wxPostScriptDCImpl( wxPrinterDC *owner, const wxPrintData& data ); + wxPostScriptDCImpl( wxPostScriptDC *owner ); + wxPostScriptDCImpl( wxPostScriptDC *owner, const wxPrintData& data ); - // Recommended constructor - wxPostScriptDC(const wxPrintData& printData); -#endif - void Init(); - virtual ~wxPostScriptImplDC(); + virtual ~wxPostScriptDCImpl(); virtual bool Ok() const { return IsOk(); } virtual bool IsOk() const; @@ -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,11 +88,11 @@ 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; protected: bool DoFloodFill(wxCoord x1, wxCoord y1, const wxColour &col, int style = wxFLOOD_SURFACE); @@ -147,7 +119,10 @@ protected: 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 +131,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; @@ -168,7 +142,7 @@ protected: double m_pageHeight; private: - DECLARE_DYNAMIC_CLASS(wxPostScriptImplDC) + DECLARE_DYNAMIC_CLASS(wxPostScriptDCImpl) }; #endif