no changes, just remove #if'd out code

[wxWidgets.git] / include / wx / gtk / print.h

diff --git a/include/wx/gtk/print.h b/include/wx/gtk/print.h
index 4bdddf493fabae59bb65c51ae397484da898b1d8..0082aa12db40f094c455f5ea730b4d48a8a2d525 100644 (file)
--- a/include/wx/gtk/print.h
+++ b/include/wx/gtk/print.h
@@ -53,7 +53,7 @@ public:
     virtual wxPageSetupDialogBase *CreatePageSetupDialog( wxWindow *parent,
                                                           wxPageSetupDialogData * data = NULL );
 
     virtual wxPageSetupDialogBase *CreatePageSetupDialog( wxWindow *parent,
                                                           wxPageSetupDialogData * data = NULL );
 

-    virtual wxDC* CreatePrinterDC( const wxPrintData& data );
+    virtual wxDCImpl* CreatePrinterDCImpl( wxPrinterDC *owner, const wxPrintData& data );

 
     virtual bool HasPrintSetupDialog();
     virtual wxDialog *CreatePrintSetupDialog( wxWindow *parent, wxPrintData *data );
 
     virtual bool HasPrintSetupDialog();
     virtual wxDialog *CreatePrintSetupDialog( wxWindow *parent, wxPrintData *data );


@@ -171,11 +171,10 @@ public:
 
 private:
     GtkPrintContext *m_gpc;
 
 private:
     GtkPrintContext *m_gpc;

-    bool             m_showDialog;

     wxDC            *m_dc;
 
     DECLARE_DYNAMIC_CLASS(wxGtkPrinter)
     wxDC            *m_dc;
 
     DECLARE_DYNAMIC_CLASS(wxGtkPrinter)

-    DECLARE_NO_COPY_CLASS(wxGtkPrinter)
+    wxDECLARE_NO_COPY_CLASS(wxGtkPrinter);

 };
 
 //----------------------------------------------------------------------------
 };
 
 //----------------------------------------------------------------------------


@@ -216,24 +215,26 @@ private:
 };
 
 //-----------------------------------------------------------------------------
 };
 
 //-----------------------------------------------------------------------------

-// wxGtkPrintDC
+// wxGtkPrinterDC

 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 

-class WXDLLIMPEXP_CORE wxGtkPrintDC: public wxDC
+class WXDLLIMPEXP_CORE wxGtkPrinterDCImpl : public wxDCImpl

 {
 public:
 {
 public:

-    wxGtkPrintDC( const wxPrintData& data );
-    virtual ~wxGtkPrintDC();
+    wxGtkPrinterDCImpl( wxPrinterDC *owner, const wxPrintData& data );
+    virtual ~wxGtkPrinterDCImpl();

 
     bool Ok() const { return IsOk(); }
     bool IsOk() const;
 
 
     bool Ok() const { return IsOk(); }
     bool IsOk() const;
 

+    virtual void* GetCairoContext() const;
+

     bool CanDrawBitmap() const { return true; }
     void Clear();
     void SetFont( const wxFont& font );
     void SetPen( const wxPen& pen );
     void SetBrush( const wxBrush& brush );
     bool CanDrawBitmap() const { return true; }
     void Clear();
     void SetFont( const wxFont& font );
     void SetPen( const wxPen& pen );
     void SetBrush( const wxBrush& brush );

-    void SetLogicalFunction( int function );
+    void SetLogicalFunction( wxRasterOperationMode function );

     void SetBackground( const wxBrush& brush );
     void DestroyClippingRegion();
     bool StartDoc(const wxString& message);
     void SetBackground( const wxBrush& brush );
     void DestroyClippingRegion();
     bool StartDoc(const wxString& message);


@@ -244,25 +245,18 @@ public:
     wxCoord GetCharWidth() const;
     bool CanGetTextExtent() const { return true; }
     wxSize GetPPI() const;
     wxCoord GetCharWidth() const;
     bool CanGetTextExtent() const { return true; }
     wxSize GetPPI() const;

-    void SetLogicalOrigin( wxCoord x, wxCoord y );
-    void SetDeviceOrigin( wxCoord x, wxCoord y );

     virtual int GetDepth() const { return 24; }
     virtual int GetDepth() const { return 24; }

-    void SetBackgroundMode(int WXUNUSED(mode));
+    void SetBackgroundMode(int mode);

     void SetPalette(const wxPalette& WXUNUSED(palette)) { }
     void SetPalette(const wxPalette& WXUNUSED(palette)) { }

-    static void SetResolution(int ppi);
-    static int GetResolution();
-    void DrawScaledBitmap(const wxBitmap &bmp, wxCoord x, wxCoord y, wxCoord w, wxCoord h,
-                    bool useMask = false, int quality = wxIMAGE_QUALITY_NORMAL)
-        { DoDrawScaledBitmap( bmp, x, y, w, h, useMask, quality ); }
-    void DrawScaledBitmap(const wxBitmap &bmp, const wxPoint& pt, const wxSize& sz,
-                    bool useMask = false, int quality = wxIMAGE_QUALITY_NORMAL)
-        { DoDrawScaledBitmap( bmp, pt.x, pt.y, sz.x, sz.y, useMask, quality ); }
-    void DrawScaledBitmap(const wxBitmap &bmp, const wxRect& rect,
-                    bool useMask = false, int quality = wxIMAGE_QUALITY_NORMAL)
-        { DoDrawScaledBitmap( bmp, rect.x, rect.y, rect.width, rect.height, useMask, quality ); }
+    void SetResolution(int ppi);
+
+    // overriden for wxPrinterDC Impl
+    virtual int GetResolution() const;
+    virtual wxRect GetPaperRect() const;

 
 protected:
 
 protected:

-    bool DoFloodFill(wxCoord x1, wxCoord y1, const wxColour &col, int style=wxFLOOD_SURFACE );
+    bool DoFloodFill(wxCoord x1, wxCoord y1, const wxColour &col, 
+                     wxFloodFillStyle style=wxFLOOD_SURFACE );

     void DoGradientFillConcentric(const wxRect& rect, const wxColour& initialColour, const wxColour& destColour, const wxPoint& circleCenter);
     void DoGradientFillLinear(const wxRect& rect, const wxColour& initialColour, const wxColour& destColour, wxDirection nDirection = wxEAST);
     bool DoGetPixel(wxCoord x1, wxCoord y1, wxColour *col) const;
     void DoGradientFillConcentric(const wxRect& rect, const wxColour& initialColour, const wxColour& destColour, const wxPoint& circleCenter);
     void DoGradientFillLinear(const wxRect& rect, const wxColour& initialColour, const wxColour& destColour, wxDirection nDirection = wxEAST);
     bool DoGetPixel(wxCoord x1, wxCoord y1, wxColour *col) const;


@@ -272,39 +266,38 @@ protected:
     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 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 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.0);
     void DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
 #if wxUSE_SPLINES
     void DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
     void DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius = 20.0);
     void DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
 #if wxUSE_SPLINES

-    void DoDrawSpline(wxList *points);
-#endif // wxUSE_SPLINES
+    void DoDrawSpline(const wxPointList *points);
+#endif

     bool DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
     bool DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,

-            wxDC *source, wxCoord xsrc, wxCoord ysrc, int rop = wxCOPY, bool useMask = false,
+            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  );
             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 DoDrawScaledBitmap( const wxBitmap& bitmap, wxCoord x, wxCoord y, wxCoord w, wxCoord h, bool useMask = false, int quality = wxIMAGE_QUALITY_NORMAL );

     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 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 DoSetDeviceClippingRegion( const wxRegion &WXUNUSED(clip) )
+    {
+        wxFAIL_MSG( "not implemented" );
+    }

     void DoGetTextExtent(const wxString& string, wxCoord *x, wxCoord *y,
     void DoGetTextExtent(const wxString& string, wxCoord *x, wxCoord *y,

-                     wxCoord *descent = (wxCoord *) NULL,
-                     wxCoord *externalLeading = (wxCoord *) NULL,
-                     const wxFont *theFont = (wxFont *) NULL ) const;
+                     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;
 
     wxPrintData& GetPrintData() { return m_printData; }
     void SetPrintData(const wxPrintData& data);
 
     void DoGetSize(int* width, int* height) const;
     void DoGetSizeMM(int *width, int *height) const;
 
     wxPrintData& GetPrintData() { return m_printData; }
     void SetPrintData(const wxPrintData& data);
 

-    void ComputeScaleAndOrigin();
-

 private:
 private:

-    static float ms_PSScaleFactor;
-

     wxPrintData             m_printData;
     PangoContext           *m_context;
     PangoLayout            *m_layout;
     wxPrintData             m_printData;
     PangoContext           *m_context;
     PangoLayout            *m_layout;


@@ -316,118 +309,13 @@ private:
     unsigned char           m_currentBlue;
     unsigned char           m_currentAlpha;
 
     unsigned char           m_currentBlue;
     unsigned char           m_currentAlpha;
 

-    int                     m_deviceOffsetY;
-    int                     m_deviceOffsetX;
+    GtkPrintContext        *m_gpc;
+    int                     m_resolution;
+    double                  m_PS2DEV;
+    double                  m_DEV2PS;

 
 

-    GtkPrintContext      *m_gpc;
-    static int            ms_resolution;
-
-    wxCoord DeviceToLogicalX(wxCoord x) const
-    {
-        int addValue = 0;
-        if (m_signX == -1) addValue = m_deviceOffsetX - m_deviceOriginX; // right to left
-        else addValue = m_deviceOriginX;// left to right
-        return (wxCoord) ((double)(x - addValue) * m_signX + m_logicalOriginX);
-    }
-    wxCoord DeviceToLogicalXRel(wxCoord x) const
-    {
-        return x;
-    }
-    wxCoord DeviceToLogicalY(wxCoord y) const
-    {
-        int addValue = 0;
-        if (m_signY == -1) addValue = m_deviceOffsetY - m_deviceOriginY; // bottom to up
-        else addValue = m_deviceOriginY;// up to bottom
-        return (wxCoord) ((double)(y - addValue) * m_signY + m_logicalOriginY);
-    }
-    wxCoord DeviceToLogicalYRel(wxCoord y) const
-    {
-        return y;
-    }
-    wxCoord CairoToLogicalX(double x) const
-    {
-        int addValue = 0;
-        if (m_signX == -1) addValue = m_deviceOffsetX - m_deviceOriginX; // right to left
-        else addValue = m_deviceOriginX;// left to right
-        return (wxCoord) MapFromCairo((double)(x - addValue) * m_signX + m_logicalOriginX);
-    }
-    wxCoord CairoToLogicalXRel(double x) const
-    {
-        return (wxCoord) MapFromCairo(x);
-    }
-    wxCoord CairoToLogicalY(double y) const
-    {
-        int addValue = 0;
-        if (m_signY == -1) addValue = m_deviceOffsetY - m_deviceOriginY; // bottom to up
-        else addValue = m_deviceOriginY;// up to bottom
-        return (wxCoord) MapFromCairo((double)(y - addValue) * m_signY + m_logicalOriginY);
-    }
-    wxCoord CairoToLogicalYRel(double y) const
-    {
-        return (wxCoord) MapFromCairo(y);
-    }
-    wxCoord LogicalToDeviceX(wxCoord x) const
-    {
-        int addValue = 0;
-        if (m_signX == -1) addValue = m_deviceOffsetX - m_deviceOriginX; // right to left
-        else addValue = m_deviceOriginX;// left to right
-        return (wxCoord) ((double)(x - m_logicalOriginX) * m_signX + addValue);
-    }
-    wxCoord LogicalToDeviceXRel(wxCoord x) const
-    {
-        return x;
-    }
-    wxCoord LogicalToDeviceY(wxCoord y) const
-    {
-        int addValue = 0;
-        if (m_signY == -1) addValue = m_deviceOffsetY - m_deviceOriginY; // bottom to up
-        else addValue = m_deviceOriginY;// up to bottom
-        return (wxCoord) ((double)(y - m_logicalOriginY)  * m_signY + addValue);
-    }
-    wxCoord LogicalToDeviceYRel(wxCoord y) const
-    {
-        return y;
-    }
-    double LogicalToCairoX(wxCoord x) const
-    {
-        int addValue = 0;
-        if (m_signX == -1) addValue = m_deviceOffsetX - m_deviceOriginX; // right to left
-        else addValue = m_deviceOriginX;// left to right
-        return MapToCairo((double)(x - m_logicalOriginX) * m_signX + addValue);
-    }
-    double LogicalToCairoXRel(wxCoord x) const
-    {
-        return MapToCairo(x);
-    }
-    double LogicalToCairoY(wxCoord y) const
-    {
-        int addValue = 0;
-        if (m_signY == -1) addValue = m_deviceOffsetY - m_deviceOriginY; // bottom to up
-        else addValue = m_deviceOriginY;// up to bottom
-        return MapToCairo((double)(y - m_logicalOriginY)  * m_signY + addValue);
-    }
-    double LogicalToCairoYRel(wxCoord y) const
-    {
-        return MapToCairo(y);
-    }
-    double MapToCairo(wxCoord coordInt) const
-    {
-        return (double)coordInt*72.0/(double)ms_resolution;
-    }
-    double MapToCairo(double coordReal) const
-    {
-        return coordReal*72.0/(double)ms_resolution;
-    }
-    wxCoord MapFromCairo(wxCoord coordInt) const
-    {
-        return (wxCoord) ((double)coordInt*(double)ms_resolution/72.0);
-    }
-    wxCoord MapFromCairo(double coordReal) const
-    {
-        return (wxCoord) (coordReal*(double)ms_resolution/72.0);
-    }
-    DECLARE_DYNAMIC_CLASS(wxGtkPrintDC)
-    DECLARE_NO_COPY_CLASS(wxGtkPrintDC)
+    DECLARE_DYNAMIC_CLASS(wxGtkPrinterDCImpl)
+    wxDECLARE_NO_COPY_CLASS(wxGtkPrinterDCImpl);

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------


@@ -439,8 +327,8 @@ class WXDLLIMPEXP_CORE wxGtkPrintPreview : public wxPrintPreviewBase
 {
 public:
     wxGtkPrintPreview(wxPrintout *printout,
 {
 public:
     wxGtkPrintPreview(wxPrintout *printout,

-                             wxPrintout *printoutForPrinting = (wxPrintout *) NULL,
-                             wxPrintDialogData *data = (wxPrintDialogData *) NULL);
+                             wxPrintout *printoutForPrinting = NULL,
+                             wxPrintDialogData *data = NULL);

     wxGtkPrintPreview(wxPrintout *printout,
                              wxPrintout *printoutForPrinting,
                              wxPrintData *data);
     wxGtkPrintPreview(wxPrintout *printout,
                              wxPrintout *printoutForPrinting,
                              wxPrintData *data);


@@ -451,11 +339,16 @@ public:
     virtual void DetermineScaling();
 
 private:
     virtual void DetermineScaling();
 
 private:

-    void Init(wxPrintout *printout, wxPrintout *printoutForPrinting);
+    void Init(wxPrintout *printout,
+              wxPrintout *printoutForPrinting,
+              wxPrintData *data);
+
+    // resolution to use in DPI
+    int m_resolution;

 
     DECLARE_CLASS(wxGtkPrintPreview)
 };
 
 
     DECLARE_CLASS(wxGtkPrintPreview)
 };
 

-#endif
+#endif // wxUSE_GTKPRINT

 
 

-#endif
+#endif // _WX_GTK_PRINT_H_