X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8636c073a373e38e6a3f7c1b013799016896406b..94c162795e6ebff164bcfc7bb9aa0138dd83b194:/contrib/include/wx/canvas/canvas.h?ds=sidebyside diff --git a/contrib/include/wx/canvas/canvas.h b/contrib/include/wx/canvas/canvas.h index c3c1fe81c6..37d900ded1 100644 --- a/contrib/include/wx/canvas/canvas.h +++ b/contrib/include/wx/canvas/canvas.h @@ -34,7 +34,12 @@ class wxCanvasAdmin; //---------------------------------------------------------------------------- // 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. @@ -49,6 +54,7 @@ enum DRAGMODE {DRAG_RECTANGLE,DRAG_ONTOP,DRAG_REDRAW}; // alteration of a wxCanvasObject functionality class wxCanvasObject: public wxEvtHandler { + DECLARE_CLASS(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 - void SetDragMode(DRAGMODE mode) { m_dragmode=mode; }; + void SetDragMode(wxDRAG_MODE mode) { m_dragmode=mode; }; //return the dragmode - DRAGMODE GetDragMode() { return m_dragmode; }; + wxDRAG_MODE GetDragMode() { return m_dragmode; }; //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; - DRAGMODE m_dragmode:2; + wxDRAG_MODE m_dragmode:3; //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 { + DECLARE_CLASS(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 { + DECLARE_CLASS(wxCanvasObjectRef) public: wxCanvasObjectRef(double x, double y,wxCanvasObject* obj); @@ -327,6 +335,7 @@ protected: // 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; }; @@ -490,7 +499,7 @@ public: double GetPosX() { return m_x; } double GetPosY() { return m_y; } - void SetPosXY( double x, double y) {m_x=x; m_y=y;CalcBoundingBox(); }; + void SetPosXY( double x, double y); void TransLate( double x, double y ); @@ -507,7 +516,13 @@ private: wxImage m_image; int m_orgw,m_orgh; - wxImage m_tmp; + + // cache + wxBitmap m_cBitmap; + wxImage m_cImage; + int m_cW; + int m_cH; + double m_cR; }; //----------------------------------------------------------------------------