fixed wxGTK1 compilation after wxDC changes (still doesn't work)

[wxWidgets.git] / include / wx / generic / dcpsg.h

diff --git a/include/wx/generic/dcpsg.h b/include/wx/generic/dcpsg.h
index 2d6fa5955a8ebd29bd1c4fb60b6838fbb839da10..3cfbba636a88fbe1c26a6446b2693f505de2ba1b 100644 (file)
--- a/include/wx/generic/dcpsg.h
+++ b/include/wx/generic/dcpsg.h
@@ -13,37 +13,43 @@
 
 #include "wx/defs.h"
 
-#if wxUSE_PRINTING_ARCHITECTURE
-
-#if wxUSE_POSTSCRIPT
+#if wxUSE_PRINTING_ARCHITECTURE && wxUSE_POSTSCRIPT
 
 #include "wx/dc.h"
+#include "wx/dcprint.h"
 #include "wx/dialog.h"
 #include "wx/module.h"
 #include "wx/cmndata.h"
 #include "wx/strvararg.h"
 
-extern WXDLLIMPEXP_DATA_CORE(int) wxPageNumber;
-
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class wxPostScriptDC;
-
 //-----------------------------------------------------------------------------
 // wxPostScriptDC
 //-----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxPostScriptDC: public wxDC
+
+class WXDLLEXPORT wxPostScriptDC : public wxDC
 {
 public:
     wxPostScriptDC();
 
     // Recommended constructor
     wxPostScriptDC(const wxPrintData& printData);
-    
-    virtual ~wxPostScriptDC();
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxPostScriptDC)
+};
+
+class WXDLLEXPORT wxPostScriptDCImpl : public wxDCImpl
+{
+public:
+    wxPostScriptDCImpl( wxPrinterDC *owner );
+    wxPostScriptDCImpl( wxPrinterDC *owner, const wxPrintData& data );
+    wxPostScriptDCImpl( wxPostScriptDC *owner );
+    wxPostScriptDCImpl( wxPostScriptDC *owner, const wxPrintData& data );
+
+    void Init();
+
+    virtual ~wxPostScriptDCImpl();
 
     virtual bool Ok() const { return IsOk(); }
     virtual bool IsOk() const;
@@ -71,18 +77,7 @@ public:
     // Resolution in pixels per logical inch
     wxSize GetPPI() const;
 
-    // overridden because origin is bottom left and
-    // axes are inverted
-    void SetAxisOrientation( bool xLeftRight, bool yBottomUp );
-    
-    // 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 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);
+    virtual void ComputeScaleAndOrigin();
 
     void SetBackgroundMode(int WXUNUSED(mode)) { }
     void SetPalette(const wxPalette& WXUNUSED(palette)) { }
@@ -92,22 +87,12 @@ public:
 
     virtual int GetDepth() const { return 24; }
 
-    static void SetResolution(int ppi);
-    static int GetResolution();
-
-    WX_DEFINE_VARARG_FUNC_VOID(PsPrintf, 1, (const wxString&), DoPsPrintfFormat)
-#ifdef __WATCOMC__
-    // workaround for http://bugzilla.openwatcom.org/show_bug.cgi?id=351
-    WX_DEFINE_VARARG_FUNC_VOID(PsPrintf, 1, (const char*), DoPsPrintfFormat)
-    WX_DEFINE_VARARG_FUNC_VOID(PsPrintf, 1, (const wchar_t*), DoPsPrintfFormat)
-#endif
     void PsPrint( const wxString& psdata );
-    void PsPrint( int ch );
 
-private:
-    void DoPsPrintfFormat(const wxString& fmt, ... );
+    // Overrridden for wxPrinterDC Impl
 
-    static float ms_PSScaleFactor;
+    virtual int GetResolution();
+    virtual wxRect GetPaperRect();
 
 protected:
     bool DoFloodFill(wxCoord x1, wxCoord y1, const wxColour &col, int style = wxFLOOD_SURFACE);
@@ -124,8 +109,8 @@ protected:
     void DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius = 20);
     void DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
 #if wxUSE_SPLINES
-    void DoDrawSpline(wxList *points);
-#endif // wxUSE_SPLINES
+    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,
                 wxCoord xsrcMask = wxDefaultCoord, wxCoord ysrcMask = wxDefaultCoord);
@@ -152,16 +137,14 @@ protected:
     double            m_underlinePosition;
     double            m_underlineThickness;
     wxPrintData       m_printData;
+    double            m_pageHeight;
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxPostScriptDC)
+    DECLARE_DYNAMIC_CLASS(wxPostScriptDCImpl)
 };
 
 #endif
-    // wxUSE_POSTSCRIPT
-
-#endif
-    // wxUSE_PRINTING_ARCHITECTURE
+    // wxUSE_POSTSCRIPT && wxUSE_PRINTING_ARCHITECTURE
 
 #endif
         // _WX_DCPSG_H_