Updating corrupt file

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

diff --git a/include/wx/generic/dcpsg.h b/include/wx/generic/dcpsg.h
index 69ad11d1fb93f94902ed6f57709291eb8ca31906..fba5f2cb57d1cc3b14ab8c9712a2a9fc63e9c4a3 100644 (file)
--- a/include/wx/generic/dcpsg.h
+++ b/include/wx/generic/dcpsg.h
@@ -17,12 +17,13 @@
 
 #include "wx/dc.h"
 
 
 #include "wx/dc.h"
 

+#if wxUSE_PRINTING_ARCHITECTURE
+

 #if wxUSE_POSTSCRIPT
 
 #include "wx/dialog.h"
 #include "wx/module.h"
 #if wxUSE_POSTSCRIPT
 
 #include "wx/dialog.h"
 #include "wx/module.h"

-#include <fstream.h>
-
+#include "wx/cmndata.h"

 
 //-----------------------------------------------------------------------------
 // classes
 
 //-----------------------------------------------------------------------------
 // classes


@@ -41,51 +42,50 @@ class WXDLLEXPORT wxPostScriptDC: public wxDC
 public:
 
   wxPostScriptDC();
 public:
 
   wxPostScriptDC();

+
+  // Deprecated constructor

   wxPostScriptDC(const wxString& output, bool interactive = TRUE, wxWindow *parent = (wxWindow *) NULL);
 
   wxPostScriptDC(const wxString& output, bool interactive = TRUE, wxWindow *parent = (wxWindow *) NULL);
 

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

   ~wxPostScriptDC();
 
   ~wxPostScriptDC();
 

+  // Deprecated

   bool Create(const wxString& output, bool interactive = TRUE, wxWindow *parent = (wxWindow *) NULL);
 
   virtual bool Ok() const;
 
   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);
 
   virtual void BeginDrawing() {}
   virtual void EndDrawing() {}
 
   virtual bool PrinterDialog(wxWindow *parent = (wxWindow *) NULL);
 
   virtual void BeginDrawing() {}
   virtual void EndDrawing() {}
 

-  void FloodFill(long x1, long y1, const wxColour &col, int style=wxFLOOD_SURFACE) ;
-  bool GetPixel(long x1, long y1, wxColour *col) const;
-
-  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);
-
-  void DrawSpline(wxList *points);
-
-  bool Blit(long xdest, long ydest, long width, long height,
+  void DoFloodFill(long x1, long y1, const wxColour &col, int style=wxFLOOD_SURFACE );
+  bool DoGetPixel(long x1, long y1, wxColour *col) const;
+
+  void DoDrawLine(long x1, long y1, long x2, long y2);
+  void DoCrossHair(long x, long y) ;
+  void DoDrawArc(long x1,long y1,long x2,long y2,long xc,long yc);
+  void DoDrawEllipticArc(long x,long y,long w,long h,double sa,double ea);
+  void DoDrawPoint(long x, long y);
+  void DoDrawLines(int n, wxPoint points[], long xoffset = 0, long yoffset = 0);
+  void DoDrawPolygon(int n, wxPoint points[], long xoffset = 0, long yoffset = 0, int fillStyle=wxODDEVEN_RULE);
+  void DoDrawRectangle(long x, long y, long width, long height);
+  void DoDrawRoundedRectangle(long x, long y, long width, long height, double radius = 20);
+  void DoDrawEllipse(long x, long y, long width, long height);
+
+  void DoDrawSpline(wxList *points);
+
+  bool DoBlit(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; }
 
             wxDC *source, long xsrc, long ysrc, int rop = wxCOPY, bool useMask = FALSE);
   inline bool CanDrawBitmap(void) 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 DoDrawIcon( const wxIcon& icon, long x, long y );
+  void DoDrawBitmap( const wxBitmap& bitmap, long x, long y, bool useMask=FALSE );

 
 

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

 
   void Clear();
   void SetFont( const wxFont& font );
 
   void Clear();
   void SetFont( const wxFont& font );


@@ -98,21 +98,26 @@ public:
   void SetClippingRegion( const wxRegion &region );
   void DestroyClippingRegion();
 
   void SetClippingRegion( const wxRegion &region );
   void DestroyClippingRegion();
 

+  void DoSetClippingRegionAsRegion( const wxRegion &WXUNUSED(clip) ) {}
+

   bool StartDoc(const wxString& message);
   void EndDoc();
   void StartPage();
   void EndPage();
 
   bool StartDoc(const wxString& message);
   void EndDoc();
   void StartPage();
   void EndPage();
 

-  long GetCharHeight();
-  long GetCharWidth();
+  long GetCharHeight() const;
+  long GetCharWidth() const;

   inline bool CanGetTextExtent(void) const { return FALSE; }
   void GetTextExtent(const wxString& string, long *x, long *y,
                      long *descent = (long *) NULL,
                      long *externalLeading = (long *) NULL,
   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);
+                     wxFont *theFont = (wxFont *) NULL ) const;

 
 

-  void GetSize(int* width, int* height) const;
-  void GetSizeMM(long *width, long *height) const;
+  void DoGetSize(int* width, int* height) const;
+  void DoGetSizeMM(int *width, int *height) const;
+
+  // Resolution in pixels per logical inch
+  wxSize GetPPI(void) const;

 
   void SetAxisOrientation( bool xLeftRight, bool yBottomUp );
   void SetDeviceOrigin( long x, long y );
 
   void SetAxisOrientation( bool xLeftRight, bool yBottomUp );
   void SetDeviceOrigin( long x, long y );


@@ -120,11 +125,14 @@ public:
   inline void SetBackgroundMode(int WXUNUSED(mode)) {}
   inline void SetPalette(const wxPalette& WXUNUSED(palette)) {}
 
   inline void SetBackgroundMode(int WXUNUSED(mode)) {}
   inline void SetPalette(const wxPalette& WXUNUSED(palette)) {}
 

-  inline ofstream *GetStream(void) const { return m_pstream; }
+  wxPrintData& GetPrintData() { return m_printData; }
+  void SetPrintData(const wxPrintData& data) { m_printData = data; }
+
+  virtual int GetDepth() const { return 24; }

 
 protected:
 
 
 protected:
 

-  ofstream *        m_pstream;    // PostScript output stream
+  FILE*             m_pstream;    // PostScript output stream

   wxString          m_title;
   unsigned char     m_currentRed;
   unsigned char     m_currentGreen;
   wxString          m_title;
   unsigned char     m_currentRed;
   unsigned char     m_currentGreen;


@@ -133,9 +141,10 @@ protected:
   bool              m_clipping;
   double            m_underlinePosition;
   double            m_underlineThickness;
   bool              m_clipping;
   double            m_underlinePosition;
   double            m_underlineThickness;

+  wxPrintData       m_printData;

 };
 
 };
 

-// TODO Needed? Should perhaps use wxGenericPrintDialog instead.
+// Deprecated: should use wxGenericPrintDialog instead.

 #if 1
 #define wxID_PRINTER_COMMAND        1
 #define wxID_PRINTER_OPTIONS        2
 #if 1
 #define wxID_PRINTER_COMMAND        1
 #define wxID_PRINTER_OPTIONS        2


@@ -159,96 +168,103 @@ public:
 #endif
 
 // Print Orientation (Should also add Left, Right)
 #endif
 
 // Print Orientation (Should also add Left, Right)

-enum {
+enum
+{

   PS_PORTRAIT = 1,
   PS_LANDSCAPE = 2
 };// ps_orientation = PS_PORTRAIT;
 
 // Print Actions
   PS_PORTRAIT = 1,
   PS_LANDSCAPE = 2
 };// ps_orientation = PS_PORTRAIT;
 
 // Print Actions

-enum {
-  PS_PRINTER,
+enum
+{
+  PS_NONE,
+  PS_PREVIEW,

   PS_FILE,
   PS_FILE,

-  PS_PREVIEW
+  PS_PRINTER

 };// ps_action = PS_PREVIEW;
 
 // PostScript printer settings
 };// ps_action = PS_PREVIEW;
 
 // PostScript printer settings

-WXDLLEXPORT void wxSetPrinterCommand(const char *cmd);
-WXDLLEXPORT void wxSetPrintPreviewCommand(const char *cmd);
-WXDLLEXPORT void wxSetPrinterOptions(const char *flags);
+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 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 char *f);
-WXDLLEXPORT void wxSetAFMPath(const char *f);
+WXDLLEXPORT void wxSetPrinterFile(const wxString& f);
+WXDLLEXPORT void wxSetAFMPath(const wxString& f);

 
 // Get current values
 
 // Get current values

-WXDLLEXPORT char* wxGetPrinterCommand();
-WXDLLEXPORT char* wxGetPrintPreviewCommand();
-WXDLLEXPORT char* wxGetPrinterOptions();
+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 int wxGetPrinterOrientation();
 WXDLLEXPORT void wxGetPrinterScaling(double* x, double* y);
 WXDLLEXPORT void wxGetPrinterTranslation(long *x, long *y);
 WXDLLEXPORT int wxGetPrinterMode();

-WXDLLEXPORT char* wxGetPrinterFile();
-WXDLLEXPORT char* wxGetAFMPath();
+WXDLLEXPORT wxString wxGetPrinterFile();
+WXDLLEXPORT wxString wxGetAFMPath();

 
 /*
 
 /*

- * PostScript print setup information
+ * PostScript print setup information.
+ * This is now obsolete, but retained for a while for compatibility

  */
 
 class WXDLLEXPORT wxPrintSetupData: public wxObject
 {
  */
 
 class WXDLLEXPORT wxPrintSetupData: public wxObject
 {

-public:
-    char *printerCommand;
-    char *previewCommand;
-    char *printerFlags;
-    char *printerFile;
-    int printerOrient;
-    double printerScaleX;
-    double printerScaleY;
-    long printerTranslateX;
-    long printerTranslateY;
-    // 1 = Preview, 2 = print to file, 3 = send to printer
-    int printerMode;
-    char *afmPath;
-    // A name in the paper database (see wx_print.h: the printing framework)
-    char *paperName;
-    bool printColour;
-

 public:
     wxPrintSetupData();
     ~wxPrintSetupData();
 
 public:
     wxPrintSetupData();
     ~wxPrintSetupData();
 

-    void SetPrinterCommand(const char *cmd);
-    void SetPaperName(const char *paper);
-    void SetPrintPreviewCommand(const char *cmd);
-    void SetPrinterOptions(const char *flags);
-    void SetPrinterFile(const char *f);
-    void SetPrinterOrientation(int orient);
-    void SetPrinterScaling(double x, double y);
-    void SetPrinterTranslation(long x, long y);
+    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
     // 1 = Preview, 2 = print to file, 3 = send to printer

-    void SetPrinterMode(int mode);
-    void SetAFMPath(const char *f);
-    void SetColour(bool col);
+    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
 
     // Get current values

-    char *GetPrinterCommand();
-    char *GetPrintPreviewCommand();
-    char *GetPrinterOptions();
-    char *GetPrinterFile();
-    char *GetPaperName();
-    int GetPrinterOrientation();
-    void GetPrinterScaling(double* x, double* y);
-    void GetPrinterTranslation(long *x, long *y);
-    int GetPrinterMode();
-    char *GetAFMPath();
-    bool GetColour();
+    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);
 
 
     void operator=(wxPrintSetupData& data);
 

-private:
+    // 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)
 };
 
   DECLARE_DYNAMIC_CLASS(wxPrintSetupData)
 };
 


@@ -257,6 +273,9 @@ WXDLLEXPORT extern void wxInitializePrintSetupData(bool init = TRUE);
 
 #endif
     // wxUSE_POSTSCRIPT
 
 #endif
     // wxUSE_POSTSCRIPT

+    
+#endif
+    // wxUSE_PRINTING_ARCHITECTURE

 
 #endif
         // _WX_DCPSG_H_
 
 #endif
         // _WX_DCPSG_H_