correction for Mac OS X compilation

[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 c3c1fe81c60db45c09bf068eca2240382913a768..521c27ef86911d02e6d50faee1c4c9f12b066e29 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.


@@ -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
     //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 +198,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;


@@ -490,7 +495,7 @@ public:
 
     double  GetPosX() { return m_x; }
     double  GetPosY() { return m_y; }
 
     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 );
 
 
     void TransLate( double x, double y );
 


@@ -507,7 +512,13 @@ private:
 
     wxImage     m_image;
     int         m_orgw,m_orgh;
 
     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;

 };
 
 //----------------------------------------------------------------------------
 };
 
 //----------------------------------------------------------------------------