X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ca65c0440a7163e4e37e48b1c4329709d722db47..34a34b020f1c8defacb299a0fa5c480fa65b8597:/include/wx/generic/dcpsg.h diff --git a/include/wx/generic/dcpsg.h b/include/wx/generic/dcpsg.h index 41b7f69dee..234feb4a46 100644 --- a/include/wx/generic/dcpsg.h +++ b/include/wx/generic/dcpsg.h @@ -46,12 +46,6 @@ public: // Recommended destructor :-) ~wxPostScriptDC(); -#if WXWIN_COMPATIBILITY_2_2 - wxPostScriptDC( const wxString &output, bool interactive = false, wxWindow *parent = NULL ) - { Create( output, interactive, parent ); } - bool Create ( const wxString &output, bool interactive = false, wxWindow *parent = NULL ); -#endif - virtual bool Ok() const; virtual void BeginDrawing() {} @@ -76,7 +70,7 @@ public: bool DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height, wxDC *source, wxCoord xsrc, wxCoord ysrc, int rop = wxCOPY, bool useMask = false, - wxCoord xsrcMask = wxDefaultPosition.x, wxCoord ysrcMask = wxDefaultPosition.y); + wxCoord xsrcMask = wxDefaultCoord, wxCoord ysrcMask = wxDefaultCoord); bool CanDrawBitmap() const { return true; } void DoDrawIcon( const wxIcon& icon, wxCoord x, wxCoord y ); @@ -142,11 +136,6 @@ private: static float ms_PSScaleFactor; protected: -#if wxUSE_PANGO - PangoContext *m_context; - PangoLayout *m_layout; - PangoFontDescription *m_fontdesc; -#endif FILE* m_pstream; // PostScript output stream wxString m_title; @@ -163,50 +152,6 @@ private: DECLARE_DYNAMIC_CLASS(wxPostScriptDC) }; - -#if WXWIN_COMPATIBILITY_2_2 -// Print Orientation -enum -{ - PS_PORTRAIT = wxPORTRAIT, - PS_LANDSCAPE = wxLANDSCAPE -}; - -// Print Actions -enum -{ - PS_NONE = wxPRINT_MODE_NONE, - PS_PREVIEW = wxPRINT_MODE_PREVIEW, - PS_FILE = wxPRINT_MODE_FILE, - PS_PRINTER = wxPRINT_MODE_PRINTER -}; - -class wxPrintSetupData: public wxPrintData -{ -public: - wxPrintSetupData() {} - - void SetPrinterOrientation( int orient ) - { SetOrientation( orient ); } - void SetPrinterMode( wxPrintMode mode ) - { SetPrintMode( mode ); } - void SetAFMPath( const wxString &path ) - { SetFontMetricPath( path ); } - - void SetPaperName(const wxString& paper) { m_paperName = paper; } - void SetPrinterFile(const wxString& file) { m_printerFile = file; } - wxString GetPaperName() const { return m_paperName; } - wxString GetPrinterFile() const { return m_printerFile; }; - - wxString m_paperName; - wxString m_printerFile; -}; - -WXDLLEXPORT_DATA(extern wxPrintSetupData*) wxThePrintSetupData; -WXDLLEXPORT extern void wxInitializePrintSetupData(bool init = true); -#endif - - #endif // wxUSE_POSTSCRIPT