activating DrawRectangle optimization

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

diff --git a/include/wx/generic/dcpsg.h b/include/wx/generic/dcpsg.h
index 78ab542bdf43081895ffc4dbfe134d9c1ef2a806..65e36cbce87bfe0dc28555e1892372d3b17dc4fd 100644 (file)
--- a/include/wx/generic/dcpsg.h
+++ b/include/wx/generic/dcpsg.h
@@ -1,282 +1,160 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        dcps.h
+// Name:        wx/generic/dcpsg.h

 // Purpose:     wxPostScriptDC class
 // Author:      Julian Smart and others
 // Modified by:
 // RCS-ID:      $Id$
 // Purpose:     wxPostScriptDC class
 // Author:      Julian Smart and others
 // Modified by:
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart, Robert Roebling and Markus Holzem
+// Copyright:   (c) Julian Smart and Robert Roebling

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DCPSG_H_
 #define _WX_DCPSG_H_
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DCPSG_H_
 #define _WX_DCPSG_H_
 

-#ifdef __GNUG__
-#pragma interface
-#endif
-
-#include "wx/dc.h"
+#include "wx/defs.h"

 
 

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

-#include <fstream.h>
-
-
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class wxPostScriptDC;
+#include "wx/strvararg.h"

 
 //-----------------------------------------------------------------------------
 // wxPostScriptDC
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // wxPostScriptDC
 //-----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxPostScriptDC: public wxDC
-{
-  DECLARE_DYNAMIC_CLASS(wxPostScriptDC)

 
 

+class WXDLLIMPEXP_CORE wxPostScriptDC : public wxDC
+{

 public:
 public:

+    wxPostScriptDC();

 
 

-  wxPostScriptDC();
+    // Recommended constructor
+    wxPostScriptDC(const wxPrintData& printData);

 
 

-  // Deprecated constructor
-  wxPostScriptDC(const wxString& output, bool interactive = TRUE, wxWindow *parent = (wxWindow *) NULL);
-
-  // Recommended constructor
-  wxPostScriptDC(const wxPrintData& printData);
-
-  ~wxPostScriptDC();
-
-  // Deprecated
-  bool Create(const wxString& output, bool interactive = TRUE, wxWindow *parent = (wxWindow *) NULL);
-
-  virtual bool Ok() const;
-
-  // Deprecated: use wxGenericPrintDialog instead
-  virtual bool PrinterDialog(wxWindow *parent = (wxWindow *) NULL);
+private:
+    DECLARE_DYNAMIC_CLASS(wxPostScriptDC)
+};

 
 

-  virtual void BeginDrawing() {}
-  virtual void EndDrawing() {}
+class WXDLLIMPEXP_CORE wxPostScriptDCImpl : public wxDCImpl
+{
+public:
+    wxPostScriptDCImpl( wxPrinterDC *owner );
+    wxPostScriptDCImpl( wxPrinterDC *owner, const wxPrintData& data );
+    wxPostScriptDCImpl( wxPostScriptDC *owner );
+    wxPostScriptDCImpl( wxPostScriptDC *owner, const wxPrintData& data );

 
 

-  void FloodFill(long x1, long y1, const wxColour &col, int style=wxFLOOD_SURFACE) ;
-  bool GetPixel(long x1, long y1, wxColour *col) const;
+    void Init();

 
 

-  void DrawLine(long x1, long y1, long x2, long y2);
-  void CrossHair(long x, long y) ;
-  void DrawArc(long x1,long y1,long x2,long y2,long xc,long yc);
-  void DrawEllipticArc(long x,long y,long w,long h,double sa,double ea);
-  void DrawPoint(long x, long y);
-  // Avoid compiler warning
-  void DrawPoint(wxPoint& point) { wxDC::DrawPoint(point); }
-  void DrawLines(int n, wxPoint points[], long xoffset = 0, long yoffset = 0);
-  // Avoid compiler warning
-  void DrawLines(wxList *lines, long xoffset = 0, long yoffset = 0)
-  { wxDC::DrawLines(lines, xoffset, yoffset); }
-  void DrawPolygon(int n, wxPoint points[], long xoffset = 0, long yoffset = 0, int fillStyle=wxODDEVEN_RULE);
-  // Avoid compiler warning
-  void DrawPolygon(wxList *lines, long xoffset = 0, long yoffset = 0, int fillStyle=wxODDEVEN_RULE)
-  { wxDC::DrawPolygon(lines, xoffset, yoffset, fillStyle); }
-  void DrawRectangle(long x, long y, long width, long height);
-  void DrawRoundedRectangle(long x, long y, long width, long height, double radius = 20);
-  void DrawEllipse(long x, long y, long width, long height);
+    virtual ~wxPostScriptDCImpl();

 
 

-  void DrawSpline(wxList *points);
+    virtual bool Ok() const { return IsOk(); }
+    virtual bool IsOk() const;

 
 

-  bool Blit(long xdest, long ydest, long width, long height,
-            wxDC *source, long xsrc, long ysrc, int rop = wxCOPY, bool useMask = FALSE);
-  inline bool CanDrawBitmap(void) const { return TRUE; }
+    bool CanDrawBitmap() const { return true; }

 
 

-  void DrawIcon( const wxIcon& icon, long x, long y );
-  void DrawBitmap( const wxBitmap& bitmap, long x, long y, bool useMask=FALSE );
+    void Clear();
+    void SetFont( const wxFont& font );
+    void SetPen( const wxPen& pen );
+    void SetBrush( const wxBrush& brush );
+    void SetLogicalFunction( wxRasterOperationMode function );
+    void SetBackground( const wxBrush& brush );

 
 

-  void DrawText(const wxString& text, long x, long y, bool use16 = FALSE);
+    void DestroyClippingRegion();

 
 

-  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 );
+    bool StartDoc(const wxString& message);
+    void EndDoc();
+    void StartPage();
+    void EndPage();

 
 

-  void SetClippingRegion(long x, long y, long width, long height);
-  void SetClippingRegion( const wxRegion &region );
-  void DestroyClippingRegion();
+    wxCoord GetCharHeight() const;
+    wxCoord GetCharWidth() const;
+    bool CanGetTextExtent() const { return true; }

 
 

-  bool StartDoc(const wxString& message);
-  void EndDoc();
-  void StartPage();
-  void EndPage();
+    // Resolution in pixels per logical inch
+    wxSize GetPPI() const;

 
 

-  long GetCharHeight();
-  long GetCharWidth();
-  inline bool CanGetTextExtent(void) const { return FALSE; }
-  void GetTextExtent(const wxString& string, long *x, long *y,
-                     long *descent = (long *) NULL,
-                     long *externalLeading = (long *) NULL,
-                     wxFont *theFont = (wxFont *) NULL, bool use16 = FALSE);
+    virtual void ComputeScaleAndOrigin();

 
 

-  void GetSize(int* width, int* height) const;
-  void GetSizeMM(int *width, int *height) const;
+    void SetBackgroundMode(int WXUNUSED(mode)) { }
+    void SetPalette(const wxPalette& WXUNUSED(palette)) { }

 
 

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

 
 

-  void SetAxisOrientation( bool xLeftRight, bool yBottomUp );
-  void SetDeviceOrigin( long x, long y );
+    virtual int GetDepth() const { return 24; }

 
 

-  inline void SetBackgroundMode(int WXUNUSED(mode)) {}
-  inline void SetPalette(const wxPalette& WXUNUSED(palette)) {}
+    void PsPrint( const wxString& psdata );

 
 

-  inline ofstream *GetStream(void) const { return m_pstream; }
+    // Overrridden for wxPrinterDC Impl

 
 

-  inline wxPrintData& GetPrintData() { return m_printData; }
-  inline void SetPrintData(const wxPrintData& data) { m_printData = data; }
+    virtual int GetResolution() const;
+    virtual wxRect GetPaperRect() const;

 
 

+    virtual void* GetHandle() const { return NULL; }
+    

 protected:
 protected:

-
-  ofstream *        m_pstream;    // PostScript output stream
-  wxString          m_title;
-  unsigned char     m_currentRed;
-  unsigned char     m_currentGreen;
-  unsigned char     m_currentBlue;
-  int               m_pageNumber;
-  bool              m_clipping;
-  double            m_underlinePosition;
-  double            m_underlineThickness;
-  wxPrintData       m_printData;
-};
-
-// Deprecated: should use wxGenericPrintDialog instead.
-#if 1
-#define wxID_PRINTER_COMMAND        1
-#define wxID_PRINTER_OPTIONS        2
-#define wxID_PRINTER_ORIENTATION    3
-#define wxID_PRINTER_MODES          4
-#define wxID_PRINTER_X_SCALE        5
-#define wxID_PRINTER_Y_SCALE        6
-#define wxID_PRINTER_X_TRANS        7
-#define wxID_PRINTER_Y_TRANS        8
-
-class WXDLLEXPORT wxPostScriptPrintDialog: public wxDialog
-{
-DECLARE_CLASS(wxPostScriptPrintDialog)
-public:
-    wxPostScriptPrintDialog (wxWindow *parent, const wxString& title,
-          const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
-          long style = wxDEFAULT_DIALOG_STYLE);
-
-    virtual int ShowModal(void) ;
-};
+    bool DoFloodFill(wxCoord x1, wxCoord y1, const wxColour &col,
+                     wxFloodFillStyle style = wxFLOOD_SURFACE);
+    bool DoGetPixel(wxCoord x1, wxCoord y1, wxColour *col) const;
+    void DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2);
+    void DoCrossHair(wxCoord x, wxCoord y) ;
+    void DoDrawArc(wxCoord x1,wxCoord y1,wxCoord x2,wxCoord y2,wxCoord xc,wxCoord yc);
+    void DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,double sa,double ea);
+    void DoDrawPoint(wxCoord x, wxCoord y);
+    void DoDrawLines(int n, wxPoint points[], wxCoord xoffset = 0, wxCoord yoffset = 0);
+    void DoDrawPolygon(int n, wxPoint points[],
+                       wxCoord xoffset = 0, wxCoord yoffset = 0,
+                       wxPolygonFillMode fillStyle = wxODDEVEN_RULE);
+    void DoDrawPolyPolygon(int n, int count[], wxPoint points[],
+                           wxCoord xoffset = 0, wxCoord yoffset = 0,
+                           wxPolygonFillMode fillStyle = wxODDEVEN_RULE);
+    void DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
+    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(const wxPointList *points);

 #endif
 #endif

-
-// Print Orientation (Should also add Left, Right)
-enum {
-  PS_PORTRAIT = 1,
-  PS_LANDSCAPE = 2
-};// ps_orientation = PS_PORTRAIT;
-
-// Print Actions
-enum {
-  PS_NONE,
-  PS_PREVIEW,
-  PS_FILE,
-  PS_PRINTER
-};// ps_action = PS_PREVIEW;
-
-// PostScript printer settings
-WXDLLEXPORT void wxSetPrinterCommand(const wxString& cmd);
-WXDLLEXPORT void wxSetPrintPreviewCommand(const wxString& cmd);
-WXDLLEXPORT void wxSetPrinterOptions(const wxString& flags);
-WXDLLEXPORT void wxSetPrinterOrientation(int orientation);
-WXDLLEXPORT void wxSetPrinterScaling(double x, double y);
-WXDLLEXPORT void wxSetPrinterTranslation(long x, long y);
-WXDLLEXPORT void wxSetPrinterMode(int mode);
-WXDLLEXPORT void wxSetPrinterFile(const wxString& f);
-WXDLLEXPORT void wxSetAFMPath(const wxString& f);
-
-// Get current values
-WXDLLEXPORT wxString wxGetPrinterCommand();
-WXDLLEXPORT wxString wxGetPrintPreviewCommand();
-WXDLLEXPORT wxString wxGetPrinterOptions();
-WXDLLEXPORT int wxGetPrinterOrientation();
-WXDLLEXPORT void wxGetPrinterScaling(double* x, double* y);
-WXDLLEXPORT void wxGetPrinterTranslation(long *x, long *y);
-WXDLLEXPORT int wxGetPrinterMode();
-WXDLLEXPORT wxString wxGetPrinterFile();
-WXDLLEXPORT wxString wxGetAFMPath();
-
-/*
- * PostScript print setup information.
- * This is now obsolete, but retained for a while for compatibility
- */
-
-class WXDLLEXPORT wxPrintSetupData: public wxObject
-{
-public:
-    wxPrintSetupData();
-    ~wxPrintSetupData();
-
-    void SetPrinterCommand(const wxString& cmd) { m_printerCommand = cmd; };
-    void SetPaperName(const wxString& paper) { m_paperName = paper; };
-    void SetPrintPreviewCommand(const wxString& cmd) { m_previewCommand = cmd; };
-    void SetPrinterOptions(const wxString& flags) { m_printerFlags = flags; };
-    void SetPrinterFile(const wxString& f) { m_printerFile = f; };
-    void SetPrinterOrientation(int orient) { m_printerOrient = orient; };
-    void SetPrinterScaling(double x, double y) { m_printerScaleX = x; m_printerScaleY = y; };
-    void SetPrinterTranslation(long x, long y) { m_printerTranslateX = x; m_printerTranslateY = y; };
-    // 1 = Preview, 2 = print to file, 3 = send to printer
-    void SetPrinterMode(int mode) { m_printerMode = mode; };
-    void SetAFMPath(const wxString& f) { m_afmPath = f; };
-    void SetColour(bool col) { m_printColour = col; };
-
-    // Get current values
-    wxString GetPrinterCommand() const { return m_printerCommand; } ;
-    wxString GetPrintPreviewCommand() const { return m_previewCommand; } ;
-    wxString GetPrinterOptions() const { return m_printerFlags; };
-    wxString GetPrinterFile() const { return m_printerFile; };
-    wxString GetPaperName() const { return m_paperName; }
-    int GetPrinterOrientation() const { return m_printerOrient; };
-    void GetPrinterScaling(double* x, double* y) const { *x = m_printerScaleX; *y = m_printerScaleY; };
-    void GetPrinterTranslation(long *x, long *y) const { *x = m_printerTranslateX; *y = m_printerTranslateY; };
-    int GetPrinterMode() const { return m_printerMode; };
-    wxString GetAFMPath() const { return m_afmPath; };
-    bool GetColour() const { return m_printColour; };
-
-    void operator=(wxPrintSetupData& data);
-
-    // Initialize from a wxPrintData object (wxPrintData should now be used instead of wxPrintSetupData).
-    // There is also an operator for initializing a wxPrintData from a wxPrintSetupData.
-    void operator=(const wxPrintData& data);
-
-public:
-    wxString        m_printerCommand;
-    wxString        m_previewCommand;
-    wxString        m_printerFlags;
-    wxString        m_printerFile;
-    int             m_printerOrient;
-    double          m_printerScaleX;
-    double          m_printerScaleY;
-    long            m_printerTranslateX;
-    long            m_printerTranslateY;
-    // 1 = Preview, 2 = print to file, 3 = send to printer
-    int             m_printerMode;
-    wxString        m_afmPath;
-    // A name in the paper database (see paper.h)
-    wxString        m_paperName;
-    bool            m_printColour;
-
-  DECLARE_DYNAMIC_CLASS(wxPrintSetupData)
+    bool DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
+                wxDC *source, wxCoord xsrc, wxCoord ysrc,
+                wxRasterOperationMode rop = wxCOPY, bool useMask = false,
+                wxCoord xsrcMask = wxDefaultCoord, wxCoord ysrcMask = wxDefaultCoord);
+    void DoDrawIcon(const wxIcon& icon, wxCoord x, wxCoord y);
+    void DoDrawBitmap(const wxBitmap& bitmap, wxCoord x, wxCoord y, bool useMask = false);
+    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 DoSetDeviceClippingRegion( const wxRegion &WXUNUSED(clip))
+    {
+        wxFAIL_MSG( "not implemented" );
+    }
+    void DoGetTextExtent(const wxString& string, wxCoord *x, wxCoord *y,
+                         wxCoord *descent = NULL,
+                         wxCoord *externalLeading = NULL,
+                         const wxFont *theFont = NULL) const;
+    void DoGetSize(int* width, int* height) const;
+    void DoGetSizeMM(int *width, int *height) const;
+
+    FILE*             m_pstream;    // PostScript output stream
+    unsigned char     m_currentRed;
+    unsigned char     m_currentGreen;
+    unsigned char     m_currentBlue;
+    int               m_pageNumber;
+    bool              m_clipping;
+    double            m_underlinePosition;
+    double            m_underlineThickness;
+    wxPrintData       m_printData;
+    double            m_pageHeight;
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxPostScriptDCImpl)

 };
 
 };
 

-WXDLLEXPORT_DATA(extern wxPrintSetupData*) wxThePrintSetupData;
-WXDLLEXPORT extern void wxInitializePrintSetupData(bool init = TRUE);
-

 #endif
 #endif

-    // wxUSE_POSTSCRIPT
+    // wxUSE_POSTSCRIPT && wxUSE_PRINTING_ARCHITECTURE

 
 #endif
         // _WX_DCPSG_H_
 
 #endif
         // _WX_DCPSG_H_