Some work on GTK focus handling and events.

[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 fc58e89125788e15a4a3b388183dfbe018a0e8f1..521c27ef86911d02e6d50faee1c4c9f12b066e29 100644 (file)
--- a/contrib/include/wx/canvas/canvas.h
+++ b/contrib/include/wx/canvas/canvas.h
@@ -28,15 +28,18 @@
 // decls
 //----------------------------------------------------------------------------
 
 // decls
 //----------------------------------------------------------------------------
 

-#define IMAGE_CANVAS 0
-

 class wxCanvas;
 class wxCanvasAdmin;
 
 //----------------------------------------------------------------------------
 // wxCanvasObject
 //----------------------------------------------------------------------------
 class wxCanvas;
 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.
 
 //:defenition
 // wxCanvasObject is the base class for  Canvas Objects.


@@ -90,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();


@@ -195,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;


@@ -492,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 );
 


@@ -509,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;

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


@@ -584,7 +593,7 @@ private:
 // The area of the drawing in world coordinates that is visible on the canvas
 // can be set. Parts of this area can be zoomed into resulting in scroll bars
 // to be displayed.
 // The area of the drawing in world coordinates that is visible on the canvas
 // can be set. Parts of this area can be zoomed into resulting in scroll bars
 // to be displayed.

-class wxCanvas: public wxWindow
+class wxCanvas: public wxScrolledWindow

 {
 public:
     // constructors and destructors
 {
 public:
     // constructors and destructors


@@ -594,9 +603,6 @@ public:
         long style = wxScrolledWindowStyle );
     virtual ~wxCanvas();
 
         long style = wxScrolledWindowStyle );
     virtual ~wxCanvas();
 

-    //intercept scroll events
-    virtual void OnScroll(wxScrollWinEvent& event);
-

     //background colour for the canvas
     virtual  void SetColour( const wxColour& background );
 
     //background colour for the canvas
     virtual  void SetColour( const wxColour& background );
 


@@ -613,16 +619,12 @@ public:
     //allow canvas activety
     virtual void Thaw();
 
     //allow canvas activety
     virtual void Thaw();
 

-#if IMAGE_CANVAS
-    inline wxImage *GetBuffer()  { return &m_buffer; }
-#else

     //get the buffer that is used for rendering in general
     inline wxBitmap *GetBuffer() { return &m_buffer; }
     //get the DC that is used for rendering
     inline wxDC *GetDC()   { return m_renderDC; }
     //set the DC that is used for rendering
     inline void  SetDC(wxDC* dc)   { m_renderDC=dc; }
     //get the buffer that is used for rendering in general
     inline wxBitmap *GetBuffer() { return &m_buffer; }
     //get the DC that is used for rendering
     inline wxDC *GetDC()   { return m_renderDC; }
     //set the DC that is used for rendering
     inline void  SetDC(wxDC* dc)   { m_renderDC=dc; }

-#endif

 
     inline int GetBufferWidth()  { return m_buffer.GetWidth(); }
     inline int GetBufferHeight() { return m_buffer.GetHeight(); }
 
     inline int GetBufferWidth()  { return m_buffer.GetWidth(); }
     inline int GetBufferHeight() { return m_buffer.GetHeight(); }


@@ -645,15 +647,85 @@ public:
     //get root group that is displayed on the canvas
     wxCanvasObjectGroup* GetRoot(){return m_root;}
 
     //get root group that is displayed on the canvas
     wxCanvasObjectGroup* GetRoot(){return m_root;}
 

+    //scroll the window in device coordinates
+    virtual void ScrollWindow( int dx, int dy,
+                               const wxRect* rect = (wxRect *) NULL );
+
+    //get y axis orientation
+    virtual bool GetYaxis() { return FALSE; }
+    
+    //get the visible part in world coordinates
+    virtual double GetMinX() const;
+    virtual double GetMinY() const;
+    virtual double GetMaxX() const;
+    virtual double GetMaxY() const;
+
+    //convert from window to virtual coordinates
+    virtual double DeviceToLogicalX(int x) const;
+    virtual double DeviceToLogicalY(int y) const;
+    virtual double DeviceToLogicalXRel(int x) const;
+    virtual double DeviceToLogicalYRel(int y) const;
+    virtual int LogicalToDeviceX(double x) const;
+    virtual int LogicalToDeviceY(double y) const;
+    virtual int LogicalToDeviceXRel(double x) const;
+    virtual int LogicalToDeviceYRel(double y) const;
+
+protected:
+    wxBitmap         m_buffer;
+
+    //always available and m_buffer selected
+    wxDC*            m_renderDC;
+    
+    bool             m_needUpdate;
+    wxList           m_updateRects;
+    wxCanvasObjectGroup* m_root;
+
+    wxColour         m_background;
+    bool             m_frozen;
+    wxCanvasObject  *m_lastMouse;
+    wxCanvasObject  *m_captureMouse;
+
+    int              m_oldDeviceX,m_oldDeviceY;
+
+    wxCanvasAdmin*   m_admin;
+    
+private:
+    int              m_bufferX,m_bufferY;
+
+protected:
+    void OnMouse( wxMouseEvent &event );
+    void OnPaint( wxPaintEvent &event );
+    void OnSize( wxSizeEvent &event );
+    void OnIdle( wxIdleEvent &event );
+    void OnSetFocus( wxFocusEvent &event );
+    void OnKillFocus( wxFocusEvent &event );
+    void OnEraseBackground( wxEraseEvent &event );
+
+private:
+    DECLARE_CLASS(wxCanvas)
+    DECLARE_EVENT_TABLE()
+};
+
+
+
+class wxVectorCanvas: public wxCanvas
+{
+public:
+    // constructors and destructors
+    wxVectorCanvas( wxCanvasAdmin* admin ,wxWindow *parent, wxWindowID id = -1,
+        const wxPoint& pos = wxDefaultPosition,
+        const wxSize& size = wxDefaultSize,
+        long style = wxScrolledWindowStyle );
+

     //scroll the window in device coordinates
     virtual void ScrollWindow( int dx, int dy,
                                const wxRect* rect = (wxRect *) NULL );
 
     //set if the Yaxis goes up or down
     //scroll the window in device coordinates
     virtual void ScrollWindow( int dx, int dy,
                                const wxRect* rect = (wxRect *) NULL );
 
     //set if the Yaxis goes up or down

-    void SetYaxis(bool up){m_yaxis=up;}
+    void SetYaxis(bool up) { m_yaxis=up; }

 
     //get currently used Yaxis setting
 
     //get currently used Yaxis setting

-    bool GetYaxis(){return m_yaxis;}
+    virtual bool GetYaxis() { return m_yaxis; }

 
     //to set the total area in world coordinates that can be scrolled.
     // when totaly zoomed out (SetMappingScroll same size as given here),
 
     //to set the total area in world coordinates that can be scrolled.
     // when totaly zoomed out (SetMappingScroll same size as given here),


@@ -678,34 +750,23 @@ public:
     wxTransformMatrix   GetMappingMatrix();
 
     //get minimum X of the visible part in world coordinates
     wxTransformMatrix   GetMappingMatrix();
 
     //get minimum X of the visible part in world coordinates

-    inline double GetMinX(){return m_virt_minX;};
-    //get minimum Y of the visible part in world coordinates
-    inline double GetMinY(){return m_virt_minY;};
-    //get maximum X of the visible part in world coordinates
-    inline double GetMaxX(){return m_virt_maxX;};
-    //get maximum Y of the visible part in world coordinates
-    inline double GetMaxY(){return m_virt_maxY;};
-
-
-    //convert from window to virtual coordinates
-    double DeviceToLogicalX(int x) const;
-    //convert from window to virtual coordinates
-    double DeviceToLogicalY(int y) const;
-    //convert from window to virtual coordinates relatif
-    double DeviceToLogicalXRel(int x) const;
-    //convert from window to virtual coordinates relatif
-    double DeviceToLogicalYRel(int y) const;
-    //convert from virtual to window coordinates
-    int LogicalToDeviceX(double x) const;
-    //convert from virtual to window coordinates
-    int LogicalToDeviceY(double y) const;
-    //convert from virtual to window coordinates relatif
-    int LogicalToDeviceXRel(double x) const;
-    //convert from virtual to window coordinates relatif
-    int LogicalToDeviceYRel(double y) const;
+    virtual double GetMinX() const;
+    virtual double GetMinY() const;
+    virtual double GetMaxX() const;
+    virtual double GetMaxY() const;
+    
+    //convert from window to virtual coordinates and back
+    virtual double DeviceToLogicalX(int x) const;
+    virtual double DeviceToLogicalY(int y) const;
+    virtual double DeviceToLogicalXRel(int x) const;
+    virtual double DeviceToLogicalYRel(int y) const;
+    virtual int LogicalToDeviceX(double x) const;
+    virtual int LogicalToDeviceY(double y) const;
+    virtual int LogicalToDeviceXRel(double x) const;
+    virtual int LogicalToDeviceYRel(double y) const;

 
 protected:
 
 protected:

-
+    // up or down

     bool m_yaxis;
 
     // holds the matrix for mapping from virtual to screen coordinates
     bool m_yaxis;
 
     // holds the matrix for mapping from virtual to screen coordinates


@@ -727,46 +788,17 @@ protected:
     bool m_scrolled;
 
 private:
     bool m_scrolled;
 
 private:

-#if IMAGE_CANVAS
-    wxImage          m_buffer;
-#else
-    wxBitmap         m_buffer;
-
-    //always available and m_buffer selected
-    wxDC*            m_renderDC;
-#endif
-    bool             m_needUpdate;
-    wxList           m_updateRects;
-    wxCanvasObjectGroup* m_root;
-
-    wxColour         m_background;
-    bool             m_frozen;
-    wxCanvasObject  *m_lastMouse;
-    wxCanvasObject  *m_captureMouse;
-
-    int              m_oldDeviceX,m_oldDeviceY;
-
-    wxCanvasAdmin*   m_admin;
-
-protected:
-
-    void OnMouse( wxMouseEvent &event );
-
-private:
+    void OnScroll(wxScrollWinEvent& event);

     void OnChar( wxKeyEvent &event );
     void OnChar( wxKeyEvent &event );

-    void OnPaint( wxPaintEvent &event );

     void OnSize( wxSizeEvent &event );
     void OnSize( wxSizeEvent &event );

-    void OnIdle( wxIdleEvent &event );
-    void OnSetFocus( wxFocusEvent &event );
-    void OnKillFocus( wxFocusEvent &event );
-    void OnEraseBackground( wxEraseEvent &event );

 
 private:
 
 private:

-    DECLARE_CLASS(wxCanvas)
+    DECLARE_CLASS(wxVectorCanvas)

     DECLARE_EVENT_TABLE()
 };
 
 
     DECLARE_EVENT_TABLE()
 };
 
 

+

 //:defenition
 //Contains a list of wxCanvas Objects that will be maintained through this class.
 //Each wxCanvasObject can be displayed on several wxCanvas Objects at the same time.
 //:defenition
 //Contains a list of wxCanvas Objects that will be maintained through this class.
 //Each wxCanvasObject can be displayed on several wxCanvas Objects at the same time.