in debug mode when clicking with the middle mouse button draw borders around all...

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

diff --git a/include/wx/graphics.h b/include/wx/graphics.h
index ede12ad06ca6d83b1d6c0e43334743057926ea7f..a00468f6ca4baccbacbb64d57e8da8eb2f353419 100644 (file)
--- a/include/wx/graphics.h
+++ b/include/wx/graphics.h
@@ -18,6 +18,7 @@
 
 #include "wx/geometry.h"
 #include "wx/dynarray.h"
 
 #include "wx/geometry.h"
 #include "wx/dynarray.h"

+#include "wx/dc.h"

 
 class WXDLLIMPEXP_FWD_CORE wxWindowDC;
 class WXDLLIMPEXP_FWD_CORE wxMemoryDC;
 
 class WXDLLIMPEXP_FWD_CORE wxWindowDC;
 class WXDLLIMPEXP_FWD_CORE wxMemoryDC;


@@ -256,8 +257,8 @@ public:
     virtual void GetBox(wxDouble *x, wxDouble *y, wxDouble *w, wxDouble *h)const;
     wxRect2DDouble GetBox()const;
 
     virtual void GetBox(wxDouble *x, wxDouble *y, wxDouble *w, wxDouble *h)const;
     wxRect2DDouble GetBox()const;
 

-    virtual bool Contains( wxDouble x, wxDouble y, int fillStyle = wxODDEVEN_RULE)const;
-    bool Contains( const wxPoint2DDouble& c, int fillStyle = wxODDEVEN_RULE)const;
+    virtual bool Contains( wxDouble x, wxDouble y, wxPolygonFillMode fillStyle = wxODDEVEN_RULE)const;
+    bool Contains( const wxPoint2DDouble& c, wxPolygonFillMode fillStyle = wxODDEVEN_RULE)const;

 
     const wxGraphicsPathData* GetPathData() const
     { return (const wxGraphicsPathData*) GetRefData(); }
 
     const wxGraphicsPathData* GetPathData() const
     { return (const wxGraphicsPathData*) GetRefData(); }


@@ -356,10 +357,10 @@ public:
     virtual void * GetNativeContext() = 0;
 
     // returns the current logical function
     virtual void * GetNativeContext() = 0;
 
     // returns the current logical function

-    virtual int GetLogicalFunction() const { return m_logicalFunction; }
+    virtual wxRasterOperationMode GetLogicalFunction() const { return m_logicalFunction; }

 
     // sets the current logical function, returns true if it supported
 
     // sets the current logical function, returns true if it supported

-    virtual bool SetLogicalFunction(int function);
+    virtual bool SetLogicalFunction(wxRasterOperationMode function);

 
     // returns the size of the graphics context in device coordinates
     virtual void GetSize( wxDouble* width, wxDouble* height);
 
     // returns the size of the graphics context in device coordinates
     virtual void GetSize( wxDouble* width, wxDouble* height);


@@ -419,10 +420,10 @@ public:
     virtual void StrokePath( const wxGraphicsPath& path ) = 0;
 
     // fills a path with the current brush
     virtual void StrokePath( const wxGraphicsPath& path ) = 0;
 
     // fills a path with the current brush

-    virtual void FillPath( const wxGraphicsPath& path, int fillStyle = wxODDEVEN_RULE ) = 0;
+    virtual void FillPath( const wxGraphicsPath& path, wxPolygonFillMode fillStyle = wxODDEVEN_RULE ) = 0;

 
     // draws a path by first filling and then stroking
 
     // draws a path by first filling and then stroking

-    virtual void DrawPath( const wxGraphicsPath& path, int fillStyle = wxODDEVEN_RULE );
+    virtual void DrawPath( const wxGraphicsPath& path, wxPolygonFillMode fillStyle = wxODDEVEN_RULE );

 
     //
     // text
 
     //
     // text


@@ -474,7 +475,7 @@ public:
     virtual void StrokeLines( size_t n, const wxPoint2DDouble *beginPoints, const wxPoint2DDouble *endPoints);
 
     // draws a polygon
     virtual void StrokeLines( size_t n, const wxPoint2DDouble *beginPoints, const wxPoint2DDouble *endPoints);
 
     // draws a polygon

-    virtual void DrawLines( size_t n, const wxPoint2DDouble *points, int fillStyle = wxODDEVEN_RULE );
+    virtual void DrawLines( size_t n, const wxPoint2DDouble *points, wxPolygonFillMode fillStyle = wxODDEVEN_RULE );

 
     // draws a polygon
     virtual void DrawRectangle( wxDouble x, wxDouble y, wxDouble w, wxDouble h);
 
     // draws a polygon
     virtual void DrawRectangle( wxDouble x, wxDouble y, wxDouble w, wxDouble h);


@@ -495,9 +496,9 @@ protected:
     wxGraphicsPen m_pen;
     wxGraphicsBrush m_brush;
     wxGraphicsFont m_font;
     wxGraphicsPen m_pen;
     wxGraphicsBrush m_brush;
     wxGraphicsFont m_font;

-    int m_logicalFunction;
+    wxRasterOperationMode m_logicalFunction;

 
 

-private:
+protected:

     // implementations of overloaded public functions: we use different names
     // for them to avoid the virtual function hiding problems in the derived
     // classes
     // implementations of overloaded public functions: we use different names
     // for them to avoid the virtual function hiding problems in the derived
     // classes