Increase version to 2.9.5.

[wxWidgets.git] / include / wx / dcgraph.h

diff --git a/include/wx/dcgraph.h b/include/wx/dcgraph.h
old mode 100755 (executable)
new mode 100644 (file)
index 894e33e..c0fa745
--- a/include/wx/dcgraph.h
+++ b/include/wx/dcgraph.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        wx/graphdc.h
+// Name:        wx/dcgraph.h

 // Purpose:     graphics context device bridge header
 // Author:      Stefan Csomor
 // Modified by:
 // Purpose:     graphics context device bridge header
 // Author:      Stefan Csomor
 // Modified by:


@@ -14,31 +14,59 @@
 
 #if wxUSE_GRAPHICS_CONTEXT
 
 
 #if wxUSE_GRAPHICS_CONTEXT
 

+#include "wx/dc.h"

 #include "wx/geometry.h"
 #include "wx/geometry.h"

-#include "wx/dynarray.h"
+#include "wx/graphics.h"

 
 

-class WXDLLEXPORT wxGraphicsContext;
-class WXDLLEXPORT wxWindowDC;
+class WXDLLIMPEXP_FWD_CORE wxWindowDC;

 
 
 
 

-#ifdef __WXMAC__
-#define wxGCDC wxDC
+class WXDLLIMPEXP_CORE wxGCDC: public wxDC
+{
+public:
+    wxGCDC( const wxWindowDC& dc );
+    wxGCDC( const wxMemoryDC& dc );
+#if wxUSE_PRINTING_ARCHITECTURE
+    wxGCDC( const wxPrinterDC& dc );

 #endif
 #endif

-
-class WXDLLEXPORT wxGCDC: 
-#ifdef __WXMAC__
-       public wxDCBase
-#else
-       public wxDC
+#if defined(__WXMSW__) && wxUSE_ENH_METAFILE
+    wxGCDC( const wxEnhMetaFileDC& dc );

 #endif
 #endif

-{
+    wxGCDC(wxGraphicsContext* context);
+    
+    wxGCDC();
+    virtual ~wxGCDC();
+
+    wxGraphicsContext* GetGraphicsContext() const;
+    void SetGraphicsContext( wxGraphicsContext* ctx );
+
+#ifdef __WXMSW__
+    // override wxDC virtual functions to provide access to HDC associated with
+    // this Graphics object (implemented in src/msw/graphics.cpp)
+    virtual WXHDC AcquireHDC();
+    virtual void ReleaseHDC(WXHDC hdc);
+#endif // __WXMSW__
+
+private:

     DECLARE_DYNAMIC_CLASS(wxGCDC)
     DECLARE_DYNAMIC_CLASS(wxGCDC)

-    DECLARE_NO_COPY_CLASS(wxGCDC)
+    wxDECLARE_NO_COPY_CLASS(wxGCDC);
+};

 
 

+
+class WXDLLIMPEXP_CORE wxGCDCImpl: public wxDCImpl
+{

 public:
 public:

-    wxGCDC(const wxWindowDC& dc);
-    wxGCDC();
-    virtual ~wxGCDC();
+    wxGCDCImpl( wxDC *owner, const wxWindowDC& dc );
+    wxGCDCImpl( wxDC *owner, const wxMemoryDC& dc );
+#if wxUSE_PRINTING_ARCHITECTURE
+    wxGCDCImpl( wxDC *owner, const wxPrinterDC& dc );
+#endif
+#if defined(__WXMSW__) && wxUSE_ENH_METAFILE
+    wxGCDCImpl( wxDC *owner, const wxEnhMetaFileDC& dc );
+#endif
+    wxGCDCImpl( wxDC *owner );
+
+    virtual ~wxGCDCImpl();

 
     void Init();
 
 
     void Init();
 


@@ -48,11 +76,14 @@ public:
 
     virtual void Clear();
 
 
     virtual void Clear();
 

-    virtual bool StartDoc( const wxString& WXUNUSED(message) ) { return true; }
-    virtual void EndDoc(void) {}
+    virtual bool StartDoc( const wxString& message );
+    virtual void EndDoc();

 
 

-    virtual void StartPage(void) {}
-    virtual void EndPage(void) {}
+    virtual void StartPage();
+    virtual void EndPage();
+
+    // flushing the content of this dc immediately onto screen
+    virtual void Flush();

 
     virtual void SetFont(const wxFont& font);
     virtual void SetPen(const wxPen& pen);
 
     virtual void SetFont(const wxFont& font);
     virtual void SetPen(const wxPen& pen);


@@ -71,27 +102,19 @@ public:
     virtual int GetDepth() const;
     virtual wxSize GetPPI() const;
 
     virtual int GetDepth() const;
     virtual wxSize GetPPI() const;
 

-    virtual void SetMapMode(int mode);
-    virtual void SetUserScale(double x, double y);
-
-    virtual void SetLogicalScale(double x, double y);
-    virtual void SetLogicalOrigin(wxCoord x, wxCoord y);
-    virtual void SetDeviceOrigin(wxCoord x, wxCoord y);
-    virtual void SetAxisOrientation(bool xLeftRight, bool yBottomUp);
-    virtual void SetLogicalFunction(int function);
+    virtual void SetLogicalFunction(wxRasterOperationMode function);

 
     virtual void SetTextForeground(const wxColour& colour);
     virtual void SetTextBackground(const wxColour& colour);
 
     virtual void ComputeScaleAndOrigin();
 
 
     virtual void SetTextForeground(const wxColour& colour);
     virtual void SetTextBackground(const wxColour& colour);
 
     virtual void ComputeScaleAndOrigin();
 

-    wxGraphicsContext* GetGraphicContext() { return m_graphicContext; }
-       virtual void SetGraphicsContext( wxGraphicsContext* ctx )
-               { delete m_graphicContext; m_graphicContext = ctx; }
-protected:
+    wxGraphicsContext* GetGraphicsContext() const { return m_graphicContext; }
+    virtual void SetGraphicsContext( wxGraphicsContext* ctx );
+

     // the true implementations
     virtual bool DoFloodFill(wxCoord x, wxCoord y, const wxColour& col,
     // the true implementations
     virtual bool DoFloodFill(wxCoord x, wxCoord y, const wxColour& col,

-        int style = wxFLOOD_SURFACE);
+                             wxFloodFillStyle style = wxFLOOD_SURFACE);

 
     virtual void DoGradientFillLinear(const wxRect& rect,
         const wxColour& initialColour,
 
     virtual void DoGradientFillLinear(const wxRect& rect,
         const wxColour& initialColour,


@@ -108,7 +131,7 @@ protected:
     virtual void DoDrawPoint(wxCoord x, wxCoord y);
 
 #if wxUSE_SPLINES
     virtual void DoDrawPoint(wxCoord x, wxCoord y);
 
 #if wxUSE_SPLINES

-    virtual void DoDrawSpline(wxList *points);
+    virtual void DoDrawSpline(const wxPointList *points);

 #endif
 
     virtual void DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2);
 #endif
 
     virtual void DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2);


@@ -140,8 +163,17 @@ protected:
         double angle);
 
     virtual bool DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
         double angle);
 
     virtual 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);
+                        wxDC *source, wxCoord xsrc, wxCoord ysrc,
+                        wxRasterOperationMode rop = wxCOPY, bool useMask = false,
+                        wxCoord xsrcMask = -1, wxCoord ysrcMask = -1);
+
+    virtual bool DoStretchBlit(wxCoord xdest, wxCoord ydest,
+                               wxCoord dstWidth, wxCoord dstHeight,
+                               wxDC *source,
+                               wxCoord xsrc, wxCoord ysrc,
+                               wxCoord srcWidth, wxCoord srcHeight,
+                               wxRasterOperationMode = wxCOPY, bool useMask = false,
+                               wxCoord xsrcMask = wxDefaultCoord, wxCoord ysrcMask = wxDefaultCoord);

 
     virtual void DoGetSize(int *,int *) const;
     virtual void DoGetSizeMM(int* width, int* height) const;
 
     virtual void DoGetSize(int *,int *) const;
     virtual void DoGetSizeMM(int* width, int* height) const;


@@ -149,13 +181,13 @@ protected:
     virtual void DoDrawLines(int n, wxPoint points[],
         wxCoord xoffset, wxCoord yoffset);
     virtual void DoDrawPolygon(int n, wxPoint points[],
     virtual void DoDrawLines(int n, wxPoint points[],
         wxCoord xoffset, wxCoord yoffset);
     virtual void DoDrawPolygon(int n, wxPoint points[],

-        wxCoord xoffset, wxCoord yoffset,
-        int fillStyle = wxODDEVEN_RULE);
+                               wxCoord xoffset, wxCoord yoffset,
+                               wxPolygonFillMode fillStyle = wxODDEVEN_RULE);

     virtual void DoDrawPolyPolygon(int n, int count[], wxPoint points[],
     virtual void DoDrawPolyPolygon(int n, int count[], wxPoint points[],

-        wxCoord xoffset, wxCoord yoffset,
-        int fillStyle);
+                                   wxCoord xoffset, wxCoord yoffset,
+                                   wxPolygonFillMode fillStyle);

 
 

-    virtual void DoSetClippingRegionAsRegion(const wxRegion& region);
+    virtual void DoSetDeviceClippingRegion(const wxRegion& region);

     virtual void DoSetClippingRegion(wxCoord x, wxCoord y,
         wxCoord width, wxCoord height);
 
     virtual void DoSetClippingRegion(wxCoord x, wxCoord y,
         wxCoord width, wxCoord height);
 


@@ -163,19 +195,27 @@ protected:
         wxCoord *x, wxCoord *y,
         wxCoord *descent = NULL,
         wxCoord *externalLeading = NULL,
         wxCoord *x, wxCoord *y,
         wxCoord *descent = NULL,
         wxCoord *externalLeading = NULL,

-        wxFont *theFont = NULL) const;
+        const wxFont *theFont = NULL) const;

 
     virtual bool DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) const;
 
 
     virtual bool DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) const;
 

+#ifdef __WXMSW__
+    virtual wxRect MSWApplyGDIPlusTransform(const wxRect& r) const;
+#endif // __WXMSW__
+

 protected:
     // scaling variables
 protected:
     // scaling variables

-    double       m_mm_to_pix_x, m_mm_to_pix_y;
-       
-       double m_formerScaleX, m_formerScaleY;
+    bool m_logicalFunctionSupported;
+    wxGraphicsMatrix m_matrixOriginal;
+    wxGraphicsMatrix m_matrixCurrent;
+
+    double m_formerScaleX, m_formerScaleY;

 
     wxGraphicsContext* m_graphicContext;
 
     wxGraphicsContext* m_graphicContext;

-};

 
 

-#endif
+    DECLARE_CLASS(wxGCDCImpl)
+    wxDECLARE_NO_COPY_CLASS(wxGCDCImpl);
+};

 
 

+#endif // wxUSE_GRAPHICS_CONTEXT

 #endif // _WX_GRAPHICS_DC_H_
 #endif // _WX_GRAPHICS_DC_H_