document various enumerations defined in defs.h; give a name to the anonymous enum...

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

diff --git a/include/wx/dcgraph.h b/include/wx/dcgraph.h
index 46781cc4e758a034441e2ab8ab4ca2a457812403..0db43629ac31bed941137e9693d845a60d5ad8fc 100644 (file)
--- a/include/wx/dcgraph.h
+++ b/include/wx/dcgraph.h
@@ -16,35 +16,38 @@
 
 #include "wx/dc.h"
 #include "wx/geometry.h"
 
 #include "wx/dc.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;
 
 

-class WXDLLEXPORT wxGCDC: public wxDC
+class WXDLLIMPEXP_CORE wxGCDC: public wxDC

 {
 public:
     wxGCDC( const wxWindowDC& dc );
     wxGCDC( const wxMemoryDC& dc );
 {
 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 );
     
     wxGCDC();
     virtual ~wxGCDC();
  
     wxGraphicsContext* GetGraphicsContext();
     void SetGraphicsContext( wxGraphicsContext* ctx );
     

-private:

     DECLARE_DYNAMIC_CLASS(wxGCDC)
     DECLARE_NO_COPY_CLASS(wxGCDC)
 };
 
 
     DECLARE_DYNAMIC_CLASS(wxGCDC)
     DECLARE_NO_COPY_CLASS(wxGCDC)
 };
 
 

-
-class WXDLLEXPORT wxGCDCImpl: public wxDCImpl
+class WXDLLIMPEXP_CORE wxGCDCImpl: public wxDCImpl

 {
 public:
     wxGCDCImpl( wxDC *owner, const wxWindowDC& dc );
     wxGCDCImpl( wxDC *owner, const wxMemoryDC& dc );
 {
 public:
     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();
     wxGCDCImpl( wxDC *owner );
     
     virtual ~wxGCDCImpl();


@@ -83,9 +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 SetMapMode(wxMappingMode mode);

 
 

-    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);


@@ -95,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,


@@ -147,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;


@@ -164,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);
 


@@ -193,11 +196,9 @@ protected:
 
     wxGraphicsContext* m_graphicContext;
     
 
     wxGraphicsContext* m_graphicContext;
     

-private:

     DECLARE_CLASS(wxGCDCImpl)
     DECLARE_NO_COPY_CLASS(wxGCDCImpl)
 };
 
     DECLARE_CLASS(wxGCDCImpl)
     DECLARE_NO_COPY_CLASS(wxGCDCImpl)
 };
 

-#endif
-
+#endif // wxUSE_GRAPHICS_CONTEXT

 #endif // _WX_GRAPHICS_DC_H_
 #endif // _WX_GRAPHICS_DC_H_