Wine fixes

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

diff --git a/include/wx/generic/dcpsg.h b/include/wx/generic/dcpsg.h
index e35809d16c59a00c49e75a8a5219c8b58d77ee2a..65d2b2b32513b29c372969c66de12ad64f3242f4 100644 (file)
--- a/include/wx/generic/dcpsg.h
+++ b/include/wx/generic/dcpsg.h
@@ -1,30 +1,29 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        dcps.h
+// Name:        wx/generic/dcps.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 "dcpsg.h"
-#endif
-
-#include "wx/dc.h"
+#include "wx/defs.h"

 
 #if wxUSE_PRINTING_ARCHITECTURE
 
 #if wxUSE_POSTSCRIPT
 
 
 #if wxUSE_PRINTING_ARCHITECTURE
 
 #if wxUSE_POSTSCRIPT
 

+#include "wx/dc.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"
 

+extern WXDLLIMPEXP_DATA_CORE(int) wxPageNumber;
+

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


@@ -38,44 +37,18 @@ class wxPostScriptDC;
 class WXDLLEXPORT wxPostScriptDC: public wxDC
 {
 public:
 class WXDLLEXPORT wxPostScriptDC: public wxDC
 {
 public:

-  wxPostScriptDC();
-
-  // Recommended constructor
-  wxPostScriptDC(const wxPrintData& printData);
-
-  ~wxPostScriptDC();
-
-  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 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);
+    wxPostScriptDC();

 
 

-  void DoDrawSpline(wxList *points);
+    // Recommended constructor
+    wxPostScriptDC(const wxPrintData& printData);

 
 

-  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; }
+    // Recommended destructor :-)
+    virtual ~wxPostScriptDC();

 
 

-  void DoDrawIcon( const wxIcon& icon, wxCoord x, wxCoord y );
-  void DoDrawBitmap( const wxBitmap& bitmap, wxCoord x, wxCoord y, bool useMask=FALSE );
+  virtual bool Ok() const { return IsOk(); }
+  virtual bool IsOk() const;

 
 

-  void DoDrawText(const wxString& text, wxCoord x, wxCoord y );
-  void DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord y, double angle);
+  bool CanDrawBitmap() const { return true; }

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


@@ -84,11 +57,8 @@ public:
   void SetLogicalFunction( int function );
   void SetBackground( const wxBrush& brush );
 
   void SetLogicalFunction( int function );
   void SetBackground( const wxBrush& brush );
 

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


@@ -96,14 +66,7 @@ public:
 
   wxCoord GetCharHeight() const;
   wxCoord GetCharWidth() const;
 
   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 DoGetSize(int* width, int* height) const;
-  void DoGetSizeMM(int *width, int *height) const;
+  bool CanGetTextExtent() const { return true; }

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


@@ -118,14 +81,54 @@ public:
   void SetPrintData(const wxPrintData& data) { m_printData = data; }
 
   virtual int GetDepth() const { return 24; }
   void SetPrintData(const wxPrintData& data) { m_printData = data; }
 
   virtual int GetDepth() const { return 24; }

-  
+

   static void SetResolution(int ppi);
   static int GetResolution();
   static void SetResolution(int ppi);
   static int GetResolution();

-  
-private:  
+
+  void PsPrintf( const wxChar* fmt, ... );
+  void PsPrint( const char* psdata );
+  void PsPrint( int ch );
+
+#if wxUSE_UNICODE
+  void PsPrint( const wxChar* psdata ) { PsPrint( wxConvUTF8.cWX2MB( psdata ) ); }
+#endif
+
+private:

     static float ms_PSScaleFactor;
 
 protected:
     static float ms_PSScaleFactor;
 
 protected:

+    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 count[], 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);
+#if wxUSE_SPLINES
+    void DoDrawSpline(wxList *points);
+#endif // wxUSE_SPLINES
+    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);
+    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 DoSetClippingRegionAsRegion( const wxRegion &WXUNUSED(clip)) { }
+    void DoGetTextExtent(const wxString& string, wxCoord *x, wxCoord *y,
+                         wxCoord *descent = NULL,
+                         wxCoord *externalLeading = NULL,
+                         wxFont *theFont = NULL) const;
+    void DoGetSize(int* width, int* height) const;
+    void DoGetSizeMM(int *width, int *height) const;
+

     FILE*             m_pstream;    // PostScript output stream
     wxString          m_title;
     unsigned char     m_currentRed;
     FILE*             m_pstream;    // PostScript output stream
     wxString          m_title;
     unsigned char     m_currentRed;


@@ -136,7 +139,7 @@ protected:
     double            m_underlinePosition;
     double            m_underlineThickness;
     wxPrintData       m_printData;
     double            m_underlinePosition;
     double            m_underlineThickness;
     wxPrintData       m_printData;

-    
+

 private:
     DECLARE_DYNAMIC_CLASS(wxPostScriptDC)
 };
 private:
     DECLARE_DYNAMIC_CLASS(wxPostScriptDC)
 };