X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ddb0ed69a947fdc330d5d8b5a1e7baee8b1b89ae..5009cb6accf219ec5ce6010b9b1ea88bece64e03:/include/wx/dcgraph.h

diff --git a/include/wx/dcgraph.h b/include/wx/dcgraph.h
old mode 100755
new mode 100644
index 9d1e4d7fb9..a5c7e6ff97
--- a/include/wx/dcgraph.h
+++ b/include/wx/dcgraph.h
@@ -14,31 +14,51 @@
 
 #if wxUSE_GRAPHICS_CONTEXT
 
+#include "wx/dc.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
+    wxGCDC();
+    virtual ~wxGCDC();
 
-class WXDLLEXPORT wxGCDC: 
-#ifdef __WXMAC__
-	public wxDCBase
-#else
-	public wxDC
-#endif
-{
+    wxGraphicsContext* GetGraphicsContext();
+    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_NO_COPY_CLASS(wxGCDC)
+    wxDECLARE_NO_COPY_CLASS(wxGCDC);
+};
 
+
+class WXDLLIMPEXP_CORE wxGCDCImpl: public wxDCImpl
+{
 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
+    wxGCDCImpl( wxDC *owner );
+
+    virtual ~wxGCDCImpl();
 
     void Init();
 
@@ -48,11 +68,14 @@ public:
 
     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();
+    virtual void EndPage();
 
-    virtual void StartPage(void) {}
-    virtual void EndPage(void) {}
+    // flushing the content of this dc immediately onto screen
+    virtual void Flush();
 
     virtual void SetFont(const wxFont& font);
     virtual void SetPen(const wxPen& pen);
@@ -71,27 +94,21 @@ public:
     virtual int GetDepth() const;
     virtual wxSize GetPPI() const;
 
-    virtual void SetMapMode(int mode);
-    virtual void SetUserScale(double x, double y);
+    virtual void SetMapMode(wxMappingMode mode);
 
-    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();
 
-    wxGraphicsContext* GetGraphicContext() { return m_graphicContext; }
-	virtual void SetGraphicsContext( wxGraphicsContext* ctx );
-    
-protected:
+    wxGraphicsContext* GetGraphicsContext() { return m_graphicContext; }
+    virtual void SetGraphicsContext( wxGraphicsContext* ctx );
+
     // 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,
@@ -108,7 +125,7 @@ protected:
     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);
@@ -140,8 +157,17 @@ protected:
         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;
@@ -149,13 +175,13 @@ protected:
     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[],
-        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);
 
@@ -163,19 +189,24 @@ protected:
         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;
 
 protected:
     // scaling variables
+    bool m_logicalFunctionSupported;
     double       m_mm_to_pix_x, m_mm_to_pix_y;
-	
-	double m_formerScaleX, m_formerScaleY;
+    wxGraphicsMatrix m_matrixOriginal;
+    wxGraphicsMatrix m_matrixCurrent;
+
+    double m_formerScaleX, m_formerScaleY;
 
     wxGraphicsContext* m_graphicContext;
-};
 
-#endif
+    DECLARE_CLASS(wxGCDCImpl)
+    wxDECLARE_NO_COPY_CLASS(wxGCDCImpl);
+};
 
+#endif // wxUSE_GRAPHICS_CONTEXT
 #endif // _WX_GRAPHICS_DC_H_