fix redundant storage of current date both in wxCalendarCtrl (which was itself redund...

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

diff --git a/include/wx/generic/dcpsg.h b/include/wx/generic/dcpsg.h
index 1958c18278584ae03d77d2fe23ce4fcfbcaa4ad5..3cfbba636a88fbe1c26a6446b2693f505de2ba1b 100644 (file)
--- a/include/wx/generic/dcpsg.h
+++ b/include/wx/generic/dcpsg.h
@@ -13,29 +13,21 @@
 
 #include "wx/defs.h"
 
 
 #include "wx/defs.h"
 

-#if wxUSE_PRINTING_ARCHITECTURE
-
-#if wxUSE_POSTSCRIPT
+#if wxUSE_PRINTING_ARCHITECTURE && wxUSE_POSTSCRIPT

 
 #include "wx/dc.h"
 
 #include "wx/dc.h"

+#include "wx/dcprint.h"

 #include "wx/dialog.h"
 #include "wx/module.h"
 #include "wx/cmndata.h"
 #include "wx/strvararg.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
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 // wxPostScriptDC
 //-----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxPostScriptDC: public wxDC
+
+class WXDLLEXPORT wxPostScriptDC : public wxDC

 {
 public:
     wxPostScriptDC();
 {
 public:
     wxPostScriptDC();


@@ -43,57 +35,64 @@ public:
     // Recommended constructor
     wxPostScriptDC(const wxPrintData& printData);
 
     // Recommended constructor
     wxPostScriptDC(const wxPrintData& printData);
 

-    // Recommended destructor :-)
-    virtual ~wxPostScriptDC();
+private:
+    DECLARE_DYNAMIC_CLASS(wxPostScriptDC)
+};

 
 

-  virtual bool Ok() const { return IsOk(); }
-  virtual bool IsOk() const;
+class WXDLLEXPORT wxPostScriptDCImpl : public wxDCImpl
+{
+public:
+    wxPostScriptDCImpl( wxPrinterDC *owner );
+    wxPostScriptDCImpl( wxPrinterDC *owner, const wxPrintData& data );
+    wxPostScriptDCImpl( wxPostScriptDC *owner );
+    wxPostScriptDCImpl( wxPostScriptDC *owner, const wxPrintData& data );

 
 

-  bool CanDrawBitmap() const { return true; }
+    void Init();

 
 

-  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 );
+    virtual ~wxPostScriptDCImpl();

 
 

-  void DestroyClippingRegion();
+    virtual bool Ok() const { return IsOk(); }
+    virtual bool IsOk() const;

 
 

-  bool StartDoc(const wxString& message);
-  void EndDoc();
-  void StartPage();
-  void EndPage();
+    bool CanDrawBitmap() const { return true; }

 
 

-  wxCoord GetCharHeight() const;
-  wxCoord GetCharWidth() const;
-  bool CanGetTextExtent() 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 );

 
 

-  // Resolution in pixels per logical inch
-  wxSize GetPPI() const;
+    void DestroyClippingRegion();

 
 

-  void SetAxisOrientation( bool xLeftRight, bool yBottomUp );
-  void SetDeviceOrigin( wxCoord x, wxCoord y );
+    bool StartDoc(const wxString& message);
+    void EndDoc();
+    void StartPage();
+    void EndPage();

 
 

-  void SetBackgroundMode(int WXUNUSED(mode)) { }
-  void SetPalette(const wxPalette& WXUNUSED(palette)) { }
+    wxCoord GetCharHeight() const;
+    wxCoord GetCharWidth() const;
+    bool CanGetTextExtent() const { return true; }

 
 

-  wxPrintData& GetPrintData() { return m_printData; }
-  void SetPrintData(const wxPrintData& data) { m_printData = data; }
+    // Resolution in pixels per logical inch
+    wxSize GetPPI() const;

 
 

-  virtual int GetDepth() const { return 24; }
+    virtual void ComputeScaleAndOrigin();

 
 

-  static void SetResolution(int ppi);
-  static int GetResolution();
+    void SetBackgroundMode(int WXUNUSED(mode)) { }
+    void SetPalette(const wxPalette& WXUNUSED(palette)) { }

 
 

-  WX_DEFINE_VARARG_FUNC_VOID(PsPrintf, DoPsPrintfFormat)
-  void PsPrint( const wxString& psdata );
-  void PsPrint( int ch );
+    void SetPrintData(const wxPrintData& data);
+    wxPrintData& GetPrintData() { return m_printData; }

 
 

-private:
-    void DoPsPrintfFormat(const wxChar *fmt, ... );
+    virtual int GetDepth() const { return 24; }
+
+    void PsPrint( const wxString& psdata );
+
+    // 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);
 
 protected:
     bool DoFloodFill(wxCoord x1, wxCoord y1, const wxColour &col, int style = wxFLOOD_SURFACE);


@@ -110,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 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);
     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);


@@ -138,16 +137,14 @@ protected:
     double            m_underlinePosition;
     double            m_underlineThickness;
     wxPrintData       m_printData;
     double            m_underlinePosition;
     double            m_underlineThickness;
     wxPrintData       m_printData;

+    double            m_pageHeight;

 
 private:
 
 private:

-    DECLARE_DYNAMIC_CLASS(wxPostScriptDC)
+    DECLARE_DYNAMIC_CLASS(wxPostScriptDCImpl)

 };
 
 #endif
 };
 
 #endif

-    // wxUSE_POSTSCRIPT
-
-#endif
-    // wxUSE_PRINTING_ARCHITECTURE
+    // wxUSE_POSTSCRIPT && wxUSE_PRINTING_ARCHITECTURE

 
 #endif
         // _WX_DCPSG_H_
 
 #endif
         // _WX_DCPSG_H_