make wxArtProvider pure virtual (I was not so on

[wxWidgets.git] / contrib / include / wx / canvas / canvas.h

diff --git a/contrib/include/wx/canvas/canvas.h b/contrib/include/wx/canvas/canvas.h
index f0a08a707a9a00bc6ad564b0d765355b4dc60260..37d900ded1a15fdca06e627d27a7d316dcfa4e90 100644 (file)
--- a/contrib/include/wx/canvas/canvas.h
+++ b/contrib/include/wx/canvas/canvas.h
@@ -34,7 +34,12 @@ class wxCanvasAdmin;
 //----------------------------------------------------------------------------
 // wxCanvasObject
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 // wxCanvasObject
 //----------------------------------------------------------------------------

-enum DRAGMODE {DRAG_RECTANGLE,DRAG_ONTOP,DRAG_REDRAW};
+enum wxDRAG_MODE
+{
+    wxDRAG_RECTANGLE,
+    wxDRAG_ONTOP,
+    wxDRAG_REDRAW
+};

 
 //:defenition
 // wxCanvasObject is the base class for  Canvas Objects.
 
 //:defenition
 // wxCanvasObject is the base class for  Canvas Objects.


@@ -49,6 +54,7 @@ enum DRAGMODE {DRAG_RECTANGLE,DRAG_ONTOP,DRAG_REDRAW};
 // alteration of a  wxCanvasObject functionality
 class wxCanvasObject: public wxEvtHandler
 {
 // alteration of a  wxCanvasObject functionality
 class wxCanvasObject: public wxEvtHandler
 {

+    DECLARE_CLASS(wxCanvasObject)

 public:
 
     wxCanvasObject();
 public:
 
     wxCanvasObject();


@@ -88,10 +94,10 @@ public:
     //DRAG_RECTANGLE = as a rectangle when drag is in progress |
     //DRAG_ONTOP = only redraw the object when dragging |
     //DRAG_REDRAW = redraw the damaged areas when dragging
     //DRAG_RECTANGLE = as a rectangle when drag is in progress |
     //DRAG_ONTOP = only redraw the object when dragging |
     //DRAG_REDRAW = redraw the damaged areas when dragging

-    void SetDragMode(DRAGMODE mode) { m_dragmode=mode; };
+    void SetDragMode(wxDRAG_MODE mode) { m_dragmode=mode; };

 
     //return the dragmode
 
     //return the dragmode

-    DRAGMODE GetDragMode() { return m_dragmode; };
+    wxDRAG_MODE GetDragMode() { return m_dragmode; };

 
     //called when starting a drag
     virtual void DragStart();
 
     //called when starting a drag
     virtual void DragStart();


@@ -193,7 +199,7 @@ protected:
     bool m_isImage:1;
     bool m_visible:1;
     bool m_dragable:1;
     bool m_isImage:1;
     bool m_visible:1;
     bool m_dragable:1;

-    DRAGMODE m_dragmode:2;
+    wxDRAG_MODE m_dragmode:3;

 
     //boundingbox in world coordinates
     wxBoundingBox m_bbox;
 
     //boundingbox in world coordinates
     wxBoundingBox m_bbox;


@@ -209,6 +215,7 @@ protected:
 // The group has a matrix to position/rotate/scale the group.
 class wxCanvasObjectGroup: public wxCanvasObject
 {
 // The group has a matrix to position/rotate/scale the group.
 class wxCanvasObjectGroup: public wxCanvasObject
 {

+    DECLARE_CLASS(wxCanvasObjectGroup)

 public:
     wxCanvasObjectGroup(double x, double y);
     virtual ~wxCanvasObjectGroup();
 public:
     wxCanvasObjectGroup(double x, double y);
     virtual ~wxCanvasObjectGroup();


@@ -277,6 +284,7 @@ protected:
 // The position/matrix of the referenced Object is accumulated with the one here.
 class wxCanvasObjectRef: public wxCanvasObject
 {
 // The position/matrix of the referenced Object is accumulated with the one here.
 class wxCanvasObjectRef: public wxCanvasObject
 {

+    DECLARE_CLASS(wxCanvasObjectRef)

 public:
     wxCanvasObjectRef(double x, double y,wxCanvasObject* obj);
 
 public:
     wxCanvasObjectRef(double x, double y,wxCanvasObject* obj);
 


@@ -327,6 +335,7 @@ protected:
 // wxCanvasRect
 class wxCanvasRect: public wxCanvasObject
 {
 // wxCanvasRect
 class wxCanvasRect: public wxCanvasObject
 {

+    DECLARE_CLASS(wxCanvasRect)

 public:
     wxCanvasRect( double x, double y, double w, double h , double radius=0 );
     void SetBrush( const wxBrush& brush)  { m_brush = brush; };
 public:
     wxCanvasRect( double x, double y, double w, double h , double radius=0 );
     void SetBrush( const wxBrush& brush)  { m_brush = brush; };