X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8636c073a373e38e6a3f7c1b013799016896406b..a132a1c810bea2d37b09f01524b57440c968de1c:/contrib/include/wx/canvas/canvas.h

diff --git a/contrib/include/wx/canvas/canvas.h b/contrib/include/wx/canvas/canvas.h
index c3c1fe81c6..521c27ef86 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.
@@ -88,10 +93,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 +198,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;
@@ -490,7 +495,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 +512,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;
 };
 
 //----------------------------------------------------------------------------