X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b7cacb43db1e69b87b257a67912b4d52995b070a..8e33de15b5d050e5c3a781e6f1ec059405f72c9b:/include/wx/generic/dcpsg.h

diff --git a/include/wx/generic/dcpsg.h b/include/wx/generic/dcpsg.h
index 65d2b2b325..2d90c7fa64 100644
--- a/include/wx/generic/dcpsg.h
+++ b/include/wx/generic/dcpsg.h
@@ -13,22 +13,13 @@
 
 #include "wx/defs.h"
 
-#if wxUSE_PRINTING_ARCHITECTURE
-
-#if wxUSE_POSTSCRIPT
+#if wxUSE_PRINTING_ARCHITECTURE && wxUSE_POSTSCRIPT
 
 #include "wx/dc.h"
 #include "wx/dialog.h"
 #include "wx/module.h"
 #include "wx/cmndata.h"
-
-extern WXDLLIMPEXP_DATA_CORE(int) wxPageNumber;
-
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class wxPostScriptDC;
+#include "wx/strvararg.h"
 
 //-----------------------------------------------------------------------------
 // wxPostScriptDC
@@ -41,60 +32,63 @@ public:
 
     // Recommended constructor
     wxPostScriptDC(const wxPrintData& printData);
-
-    // Recommended destructor :-)
+    
     virtual ~wxPostScriptDC();
 
-  virtual bool Ok() const { return IsOk(); }
-  virtual bool IsOk() const;
-
-  bool CanDrawBitmap() const { return true; }
-
-  void Clear();
-  void SetFont( const wxFont& font );
-  void SetPen( const wxPen& pen );
-  void SetBrush( const wxBrush& brush );
-  void SetLogicalFunction( int function );
-  void SetBackground( const wxBrush& brush );
-
-  void DestroyClippingRegion();
-
-  bool StartDoc(const wxString& message);
-  void EndDoc();
-  void StartPage();
-  void EndPage();
-
-  wxCoord GetCharHeight() const;
-  wxCoord GetCharWidth() const;
-  bool CanGetTextExtent() const { return true; }
-
-  // Resolution in pixels per logical inch
-  wxSize GetPPI() const;
-
-  void SetAxisOrientation( bool xLeftRight, bool yBottomUp );
-  void SetDeviceOrigin( wxCoord x, wxCoord y );
-
-  void SetBackgroundMode(int WXUNUSED(mode)) { }
-  void SetPalette(const wxPalette& WXUNUSED(palette)) { }
+    virtual bool Ok() const { return IsOk(); }
+    virtual bool IsOk() const;
+
+    bool CanDrawBitmap() const { return true; }
+
+    void Clear();
+    void SetFont( const wxFont& font );
+    void SetPen( const wxPen& pen );
+    void SetBrush( const wxBrush& brush );
+    void SetLogicalFunction( int function );
+    void SetBackground( const wxBrush& brush );
+
+    void DestroyClippingRegion();
+
+    bool StartDoc(const wxString& message);
+    void EndDoc();
+    void StartPage();
+    void EndPage();
+
+    wxCoord GetCharHeight() const;
+    wxCoord GetCharWidth() const;
+    bool CanGetTextExtent() const { return true; }
+
+    // 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();
 
-  wxPrintData& GetPrintData() { return m_printData; }
-  void SetPrintData(const wxPrintData& data) { m_printData = data; }
+    void SetBackgroundMode(int WXUNUSED(mode)) { }
+    void SetPalette(const wxPalette& WXUNUSED(palette)) { }
 
-  virtual int GetDepth() const { return 24; }
+    void SetPrintData(const wxPrintData& data);
+    wxPrintData& GetPrintData() { return m_printData; }
 
-  static void SetResolution(int ppi);
-  static int GetResolution();
+    virtual int GetDepth() const { return 24; }
 
-  void PsPrintf( const wxChar* fmt, ... );
-  void PsPrint( const char* psdata );
-  void PsPrint( int ch );
+    static void SetResolution(int ppi);
+    static int GetResolution();
 
-#if wxUSE_UNICODE
-  void PsPrint( const wxChar* psdata ) { PsPrint( wxConvUTF8.cWX2MB( psdata ) ); }
-#endif
+    void PsPrint( const wxString& psdata );
 
 private:
-    static float ms_PSScaleFactor;
 
 protected:
     bool DoFloodFill(wxCoord x1, wxCoord y1, const wxColour &col, int style = wxFLOOD_SURFACE);
@@ -111,7 +105,7 @@ 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);
+    void DoDrawSpline(const wxPointList *points);
 #endif // wxUSE_SPLINES
     bool DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
                 wxDC *source, wxCoord xsrc, wxCoord ysrc, int rop = wxCOPY, bool useMask = false,
@@ -125,7 +119,7 @@ protected:
     void DoGetTextExtent(const wxString& string, wxCoord *x, wxCoord *y,
                          wxCoord *descent = NULL,
                          wxCoord *externalLeading = NULL,
-                         wxFont *theFont = NULL) const;
+                         const wxFont *theFont = NULL) const;
     void DoGetSize(int* width, int* height) const;
     void DoGetSizeMM(int *width, int *height) const;
 
@@ -139,16 +133,14 @@ protected:
     double            m_underlinePosition;
     double            m_underlineThickness;
     wxPrintData       m_printData;
+    double            m_pageHeight;
 
 private:
     DECLARE_DYNAMIC_CLASS(wxPostScriptDC)
 };
 
 #endif
-    // wxUSE_POSTSCRIPT
-
-#endif
-    // wxUSE_PRINTING_ARCHITECTURE
+    // wxUSE_POSTSCRIPT && wxUSE_PRINTING_ARCHITECTURE
 
 #endif
         // _WX_DCPSG_H_