mouse and cursor additions for cocoa, see #10361

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

diff --git a/include/wx/dcgraph.h b/include/wx/dcgraph.h
index cce940f27a452d4f1cd61eb2fe5e919896c244a4..0db43629ac31bed941137e9693d845a60d5ad8fc 100644 (file)
--- a/include/wx/dcgraph.h
+++ b/include/wx/dcgraph.h
@@ -14,33 +14,43 @@
 
 #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 WXDLLIMPEXP_FWD_CORE wxWindowDC;
 
 #include "wx/graphics.h"
 
 class WXDLLIMPEXP_FWD_CORE wxWindowDC;
 

-#ifdef __WXMAC__
-#define wxGCDC wxDC
-#endif

 
 

-class WXDLLEXPORT wxGCDC: 
-#ifdef __WXMAC__
-    public wxDCBase
-#else
-    public wxDC
-#endif
+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();
+ 
+    wxGraphicsContext* GetGraphicsContext();
+    void SetGraphicsContext( wxGraphicsContext* ctx );
+    

     DECLARE_DYNAMIC_CLASS(wxGCDC)
     DECLARE_NO_COPY_CLASS(wxGCDC)
     DECLARE_DYNAMIC_CLASS(wxGCDC)
     DECLARE_NO_COPY_CLASS(wxGCDC)

+};

 
 

+
+class WXDLLIMPEXP_CORE wxGCDCImpl: public wxDCImpl
+{

 public:
 public:

-    wxGCDC(const wxWindowDC& dc);
-#ifdef __WXMSW__
-    wxGCDC( const wxMemoryDC& dc);
-#endif    
-    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();
 
 
     void Init();
 


@@ -50,11 +60,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);


@@ -73,14 +86,9 @@ 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 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 SetTextForeground(const wxColour& colour);
     virtual void SetTextBackground(const wxColour& colour);


@@ -90,10 +98,9 @@ public:
     wxGraphicsContext* GetGraphicsContext() { return m_graphicContext; }
     virtual void SetGraphicsContext( wxGraphicsContext* ctx );
     
     wxGraphicsContext* GetGraphicsContext() { return m_graphicContext; }
     virtual void SetGraphicsContext( wxGraphicsContext* ctx );
     

-protected:

     // 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,


@@ -110,7 +117,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);


@@ -142,15 +149,16 @@ 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,
 
     virtual bool DoStretchBlit(wxCoord xdest, wxCoord ydest,
                                wxCoord dstWidth, wxCoord dstHeight,
                                wxDC *source,
                                wxCoord xsrc, wxCoord ysrc,
                                wxCoord srcWidth, wxCoord srcHeight,

-                               int rop = wxCOPY, bool useMask = false,
+                               wxRasterOperationMode = wxCOPY, bool useMask = false,

                                wxCoord xsrcMask = wxDefaultCoord, wxCoord ysrcMask = wxDefaultCoord);
 
     virtual void DoGetSize(int *,int *) const;
                                wxCoord xsrcMask = wxDefaultCoord, wxCoord ysrcMask = wxDefaultCoord);
 
     virtual void DoGetSize(int *,int *) const;


@@ -159,13 +167,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);
 


@@ -187,8 +195,10 @@ protected:
     double m_formerScaleX, m_formerScaleY;
 
     wxGraphicsContext* m_graphicContext;
     double m_formerScaleX, m_formerScaleY;
 
     wxGraphicsContext* m_graphicContext;

+    
+    DECLARE_CLASS(wxGCDCImpl)
+    DECLARE_NO_COPY_CLASS(wxGCDCImpl)

 };
 
 };
 

-#endif
-
+#endif // wxUSE_GRAPHICS_CONTEXT

 #endif // _WX_GRAPHICS_DC_H_
 #endif // _WX_GRAPHICS_DC_H_