Make art provider id of type "char *" instead of "wxChar *".

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

diff --git a/include/wx/dcgraph.h b/include/wx/dcgraph.h
index 0db43629ac31bed941137e9693d845a60d5ad8fc..a5c7e6ff975dc434d636c2f11407f73ef52eacb7 100644 (file)
--- a/include/wx/dcgraph.h
+++ b/include/wx/dcgraph.h
@@ -31,12 +31,20 @@ public:
 #endif
     wxGCDC();
     virtual ~wxGCDC();
 #endif
     wxGCDC();
     virtual ~wxGCDC();

- 
+

     wxGraphicsContext* GetGraphicsContext();
     void SetGraphicsContext( wxGraphicsContext* ctx );
     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_DYNAMIC_CLASS(wxGCDC)

-    DECLARE_NO_COPY_CLASS(wxGCDC)
+    wxDECLARE_NO_COPY_CLASS(wxGCDC);

 };
 
 
 };
 
 


@@ -49,7 +57,7 @@ public:
     wxGCDCImpl( wxDC *owner, const wxPrinterDC& dc );
 #endif
     wxGCDCImpl( wxDC *owner );
     wxGCDCImpl( wxDC *owner, const wxPrinterDC& dc );
 #endif
     wxGCDCImpl( wxDC *owner );

-    
+

     virtual ~wxGCDCImpl();
 
     void Init();
     virtual ~wxGCDCImpl();
 
     void Init();


@@ -65,7 +73,7 @@ public:
 
     virtual void StartPage();
     virtual void EndPage();
 
     virtual void StartPage();
     virtual void EndPage();

-    
+

     // flushing the content of this dc immediately onto screen
     virtual void Flush();
 
     // flushing the content of this dc immediately onto screen
     virtual void Flush();
 


@@ -97,7 +105,7 @@ public:
 
     wxGraphicsContext* GetGraphicsContext() { return m_graphicContext; }
     virtual void SetGraphicsContext( wxGraphicsContext* ctx );
 
     wxGraphicsContext* GetGraphicsContext() { return m_graphicContext; }
     virtual void SetGraphicsContext( wxGraphicsContext* ctx );

-    
+

     // the true implementations
     virtual bool DoFloodFill(wxCoord x, wxCoord y, const wxColour& col,
                              wxFloodFillStyle style = wxFLOOD_SURFACE);
     // the true implementations
     virtual bool DoFloodFill(wxCoord x, wxCoord y, const wxColour& col,
                              wxFloodFillStyle style = wxFLOOD_SURFACE);


@@ -150,7 +158,7 @@ public:
 
     virtual bool DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
                         wxDC *source, wxCoord xsrc, wxCoord ysrc,
 
     virtual bool DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
                         wxDC *source, wxCoord xsrc, wxCoord ysrc,

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

                         wxCoord xsrcMask = -1, wxCoord ysrcMask = -1);
 
     virtual bool DoStretchBlit(wxCoord xdest, wxCoord ydest,
                         wxCoord xsrcMask = -1, wxCoord ysrcMask = -1);
 
     virtual bool DoStretchBlit(wxCoord xdest, wxCoord ydest,


@@ -195,9 +203,9 @@ protected:
     double m_formerScaleX, m_formerScaleY;
 
     wxGraphicsContext* m_graphicContext;
     double m_formerScaleX, m_formerScaleY;
 
     wxGraphicsContext* m_graphicContext;

-    
+

     DECLARE_CLASS(wxGCDCImpl)
     DECLARE_CLASS(wxGCDCImpl)

-    DECLARE_NO_COPY_CLASS(wxGCDCImpl)
+    wxDECLARE_NO_COPY_CLASS(wxGCDCImpl);

 };
 
 #endif // wxUSE_GRAPHICS_CONTEXT
 };
 
 #endif // wxUSE_GRAPHICS_CONTEXT