avoid a bug in Carbon headers

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

diff --git a/include/wx/generic/dcpsg.h b/include/wx/generic/dcpsg.h
index 78ab542bdf43081895ffc4dbfe134d9c1ef2a806..8848f1601859693d9494ebdec6b7859d5ce59da0 100644 (file)
--- a/include/wx/generic/dcpsg.h
+++ b/include/wx/generic/dcpsg.h
@@ -4,26 +4,26 @@
 // Author:      Julian Smart and others
 // Modified by:
 // RCS-ID:      $Id$
 // 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
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+#pragma interface "dcpsg.h"

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

+#if wxUSE_PRINTING_ARCHITECTURE
+

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

-#include <fstream.h>
-

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


@@ -37,63 +37,52 @@ class wxPostScriptDC;
 
 class WXDLLEXPORT wxPostScriptDC: public wxDC
 {
 
 class WXDLLEXPORT wxPostScriptDC: public wxDC
 {

-  DECLARE_DYNAMIC_CLASS(wxPostScriptDC)
-

 public:
 public:

+    wxPostScriptDC();
+
+    // Recommended constructor
+    wxPostScriptDC(const wxPrintData& printData);
+  
+    // Recommended destructor :-)
+    ~wxPostScriptDC();
+
+#if WXWIN_COMPATIBILITY_2_2
+    wxPostScriptDC( const wxString &output, bool interactive = FALSE, wxWindow *parent = NULL )
+        { Create( output, interactive, parent ); }
+    bool Create ( const wxString &output, bool interactive = FALSE, wxWindow *parent = NULL );
+#endif

 
 

-  wxPostScriptDC();
+  virtual bool Ok() const;

 
 

-  // Deprecated constructor
-  wxPostScriptDC(const wxString& output, bool interactive = TRUE, wxWindow *parent = (wxWindow *) NULL);
+  virtual void BeginDrawing() {}
+  virtual void EndDrawing() {}

 
 

-  // Recommended constructor
-  wxPostScriptDC(const wxPrintData& printData);
+  bool DoFloodFill(wxCoord x1, wxCoord y1, const wxColour &col, int style=wxFLOOD_SURFACE );
+  bool DoGetPixel(wxCoord x1, wxCoord y1, wxColour *col) const;

 
 

-  ~wxPostScriptDC();
+  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, int 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);

 
 

-  // Deprecated
-  bool Create(const wxString& output, bool interactive = TRUE, wxWindow *parent = (wxWindow *) NULL);
+  void DoDrawSpline(wxList *points);

 
 

-  virtual bool Ok() const;
+  bool DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
+            wxDC *source, wxCoord xsrc, wxCoord ysrc, int rop = wxCOPY, bool useMask = FALSE,
+            wxCoord xsrcMask = -1, wxCoord ysrcMask = -1);
+  bool CanDrawBitmap() const { return TRUE; }

 
 

-  // Deprecated: use wxGenericPrintDialog instead
-  virtual bool PrinterDialog(wxWindow *parent = (wxWindow *) NULL);
+  void DoDrawIcon( const wxIcon& icon, wxCoord x, wxCoord y );
+  void DoDrawBitmap( const wxBitmap& bitmap, wxCoord x, wxCoord y, bool useMask=FALSE );

 
 

-  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,
-            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 DrawText(const wxString& text, long x, long y, bool use16 = FALSE);
+  void DoDrawText(const wxString& text, wxCoord x, wxCoord y );
+  void DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord y, double angle);

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


@@ -102,181 +91,118 @@ public:
   void SetLogicalFunction( int function );
   void SetBackground( const wxBrush& brush );
 
   void SetLogicalFunction( int function );
   void SetBackground( const wxBrush& brush );
 

-  void SetClippingRegion(long x, long y, long width, long height);
-  void SetClippingRegion( const wxRegion &region );
+  void DoSetClippingRegion(wxCoord x, wxCoord y, wxCoord width, wxCoord height);

   void DestroyClippingRegion();
 
   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();
-  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);
+  wxCoord GetCharHeight() const;
+  wxCoord GetCharWidth() const;
+  bool CanGetTextExtent() const { return TRUE; }
+  void DoGetTextExtent(const wxString& string, wxCoord *x, wxCoord *y,
+                     wxCoord *descent = (wxCoord *) NULL,
+                     wxCoord *externalLeading = (wxCoord *) NULL,
+                     wxFont *theFont = (wxFont *) NULL ) const;

 
 

-  void GetSize(int* width, int* height) const;
-  void GetSizeMM(int *width, int *height) const;
+  void DoGetSize(int* width, int* height) const;
+  void DoGetSizeMM(int *width, int *height) const;

 
   // Resolution in pixels per logical inch
 
   // Resolution in pixels per logical inch

-  wxSize GetPPI(void) const;
+  wxSize GetPPI() const;

 
   void SetAxisOrientation( bool xLeftRight, bool yBottomUp );
 
   void SetAxisOrientation( bool xLeftRight, bool yBottomUp );

-  void SetDeviceOrigin( long x, long y );
+  void SetDeviceOrigin( wxCoord x, wxCoord y );

 
 

-  inline void SetBackgroundMode(int WXUNUSED(mode)) {}
-  inline void SetPalette(const wxPalette& WXUNUSED(palette)) {}
+  void SetBackgroundMode(int WXUNUSED(mode)) { }
+  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; }

 
 

-  inline wxPrintData& GetPrintData() { return m_printData; }
-  inline void SetPrintData(const wxPrintData& data) { m_printData = data; }
+  virtual int GetDepth() const { return 24; }
+  
+  static void SetResolution(int ppi);
+  static int GetResolution();
+  
+private:  
+    static float ms_PSScaleFactor;

 
 protected:
 
 protected:

+#if wxUSE_PANGO
+    PangoContext *m_context;
+    PangoLayout *m_layout;
+    PangoFontDescription *m_fontdesc;
+#endif

 
 

-  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;
+    FILE*             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;
+    
+private:
+    DECLARE_DYNAMIC_CLASS(wxPostScriptDC)

 };
 
 };
 

-// 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) ;
+#if WXWIN_COMPATIBILITY_2_2
+// Print Orientation
+enum
+{
+    PS_PORTRAIT = wxPORTRAIT,
+    PS_LANDSCAPE = wxLANDSCAPE

 };
 };

-#endif
-
-// Print Orientation (Should also add Left, Right)
-enum {
-  PS_PORTRAIT = 1,
-  PS_LANDSCAPE = 2
-};// ps_orientation = PS_PORTRAIT;

 
 // Print Actions
 
 // 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
+enum
+{
+    PS_NONE = wxPRINT_MODE_NONE,
+    PS_PREVIEW = wxPRINT_MODE_PREVIEW,
+    PS_FILE = wxPRINT_MODE_FILE,
+    PS_PRINTER = wxPRINT_MODE_PRINTER
+};
+    
+class wxPrintSetupData: public wxPrintData

 {
 public:
 {
 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; };
+    wxPrintSetupData() {}
+    
+    void SetPrinterOrientation( int orient ) 
+        { SetOrientation( orient ); }
+    void SetPrinterMode( wxPrintMode mode ) 
+        { SetPrintMode( mode ); }
+    void SetAFMPath( const wxString &path ) 
+        { SetFontMetricPath( path ); }
+    
+    void SetPaperName(const wxString& paper) { m_paperName = paper; }
+    void SetPrinterFile(const wxString& file) { m_printerFile = file; }

     wxString GetPaperName() const { return m_paperName; }
     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 GetPrinterFile() const { return m_printerFile; };
+    

     wxString        m_paperName;
     wxString        m_paperName;

-    bool            m_printColour;
-
-  DECLARE_DYNAMIC_CLASS(wxPrintSetupData)
+    wxString        m_printerFile;

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

+#endif
+

 
 #endif
     // wxUSE_POSTSCRIPT
 
 
 #endif
     // wxUSE_POSTSCRIPT
 

+#endif
+    // wxUSE_PRINTING_ARCHITECTURE
+

 #endif
         // _WX_DCPSG_H_
 #endif
         // _WX_DCPSG_H_