fixing warning and compile error against 10.4

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

diff --git a/include/wx/generic/dcpsg.h b/include/wx/generic/dcpsg.h
index ae569a4a6324da8b99cf32f47a56548307aa8372..e33773ddd36ea7d69fc5063674b7b81c2133fb6f 100644 (file)
--- a/include/wx/generic/dcpsg.h
+++ b/include/wx/generic/dcpsg.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     wxPostScriptDC class
 // Author:      Julian Smart and others
 // Modified by:
 // Purpose:     wxPostScriptDC class
 // Author:      Julian Smart and others
 // Modified by:


@@ -11,145 +11,132 @@
 #ifndef _WX_DCPSG_H_
 #define _WX_DCPSG_H_
 
 #ifndef _WX_DCPSG_H_
 #define _WX_DCPSG_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "dcpsg.h"
-#endif
-
-#include "wx/dc.h"
+#include "wx/defs.h"

 
 

-#if wxUSE_PRINTING_ARCHITECTURE
-
-#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"

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

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

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

 {
 public:
     wxPostScriptDC();
 
     // Recommended constructor
     wxPostScriptDC(const wxPrintData& printData);
 {
 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
-
-  virtual bool Ok() const;
-
-  virtual void BeginDrawing() {}
-  virtual void EndDrawing() {}
-
-  bool DoFloodFill(wxCoord x1, wxCoord y1, const wxColour &col, int 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, int fillStyle=wxODDEVEN_RULE);
-  void DoDrawPolyPolygon(int n, int start[], 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);

 
 

-  void DoDrawSpline(wxList *points);
+private:
+    DECLARE_DYNAMIC_CLASS(wxPostScriptDC)
+};

 
 

-  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; }
+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 DoDrawIcon( const wxIcon& icon, wxCoord x, wxCoord y );
-  void DoDrawBitmap( const wxBitmap& bitmap, wxCoord x, wxCoord y, bool useMask=FALSE );
+    void Init();

 
 

-  void DoDrawText(const wxString& text, wxCoord x, wxCoord y );
-  void DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord y, double angle);
+    virtual ~wxPostScriptDCImpl();

 
 

-  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 bool Ok() const { return IsOk(); }
+    virtual bool IsOk() const;

 
 

-  void DoSetClippingRegion(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
-  void DestroyClippingRegion();
+    bool CanDrawBitmap() const { return true; }

 
 

-  void DoSetClippingRegionAsRegion( const wxRegion &WXUNUSED(clip) ) { }
+    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 );

 
 

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

 
 

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

 
 

-  void DoGetSize(int* width, int* height) const;
-  void DoGetSizeMM(int *width, int *height) const;
+    wxCoord GetCharHeight() const;
+    wxCoord GetCharWidth() const;
+    bool CanGetTextExtent() const { return true; }

 
 

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

 
 

-  void SetAxisOrientation( bool xLeftRight, bool yBottomUp );
-  void SetDeviceOrigin( wxCoord x, wxCoord y );
+    virtual void ComputeScaleAndOrigin();

 
 

-  void SetBackgroundMode(int WXUNUSED(mode)) { }
-  void SetPalette(const wxPalette& WXUNUSED(palette)) { }
+    void SetBackgroundMode(int WXUNUSED(mode)) { }
+    void SetPalette(const wxPalette& WXUNUSED(palette)) { }

 
 

-  wxPrintData& GetPrintData() { return m_printData; }
-  void SetPrintData(const wxPrintData& data) { m_printData = data; }
+    void SetPrintData(const wxPrintData& data);
+    wxPrintData& GetPrintData() { return m_printData; }

 
 

-  virtual int GetDepth() const { return 24; }
-  
-  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 );
+    void PsPrint( const wxString& psdata );

 
 

-#if wxUSE_UNICODE
-  void PsPrint( const wxChar* psdata ) { PsPrint( wxConvUTF8.cWX2MB( psdata ) ); }
-#endif
+    // Overrridden for wxPrinterDC Impl

 
 

-private:  
-    static float ms_PSScaleFactor;
+    virtual int GetResolution() const;
+    virtual wxRect GetPaperRect() const;

 
 protected:
 
 protected:

-#if wxUSE_PANGO
-    PangoContext *m_context;
-    PangoLayout *m_layout;
-    PangoFontDescription *m_fontdesc;
+    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

+    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
 
     FILE*             m_pstream;    // PostScript output stream

-    wxString          m_title;

     unsigned char     m_currentRed;
     unsigned char     m_currentGreen;
     unsigned char     m_currentBlue;
     unsigned char     m_currentRed;
     unsigned char     m_currentGreen;
     unsigned char     m_currentBlue;


@@ -158,60 +145,14 @@ protected:
     double            m_underlinePosition;
     double            m_underlineThickness;
     wxPrintData       m_printData;
     double            m_underlinePosition;
     double            m_underlineThickness;
     wxPrintData       m_printData;

-    
-private:
-    DECLARE_DYNAMIC_CLASS(wxPostScriptDC)
-};
+    double            m_pageHeight;

 
 

-
-#if WXWIN_COMPATIBILITY_2_2
-// Print Orientation
-enum
-{
-    PS_PORTRAIT = wxPORTRAIT,
-    PS_LANDSCAPE = wxLANDSCAPE
-};
-
-// Print Actions
-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:
-    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 GetPrinterFile() const { return m_printerFile; };
-    
-    wxString        m_paperName;
-    wxString        m_printerFile;
+private:
+    DECLARE_DYNAMIC_CLASS(wxPostScriptDCImpl)

 };
 
 };
 

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

 #endif
 #endif

-    // wxUSE_PRINTING_ARCHITECTURE
+    // wxUSE_POSTSCRIPT && wxUSE_PRINTING_ARCHITECTURE

 
 #endif
         // _WX_DCPSG_H_
 
 #endif
         // _WX_DCPSG_H_