made multiple selection behave more consistently with the usual (Windows) way

[wxWidgets.git] / include / wx / html / htmlcell.h

diff --git a/include/wx/html/htmlcell.h b/include/wx/html/htmlcell.h
index 312e334c999486c13075a5c12d5da56b28e7b2fc..982e42f4f942a9d3bd71b3410fd5e2ff655983d2 100644 (file)
--- a/include/wx/html/htmlcell.h
+++ b/include/wx/html/htmlcell.h
@@ -41,9 +41,9 @@ public:
           m_fromPrivPos(wxDefaultPosition), m_toPrivPos(wxDefaultPosition),
           m_fromCell(NULL), m_toCell(NULL) {}
 
           m_fromPrivPos(wxDefaultPosition), m_toPrivPos(wxDefaultPosition),
           m_fromCell(NULL), m_toCell(NULL) {}
 

-    void Set(const wxPoint& fromPos, wxHtmlCell *fromCell,
-             const wxPoint& toPos, wxHtmlCell *toCell);
-    void Set(wxHtmlCell *fromCell, wxHtmlCell *toCell);
+    void Set(const wxPoint& fromPos, const wxHtmlCell *fromCell,
+             const wxPoint& toPos, const wxHtmlCell *toCell);
+    void Set(const wxHtmlCell *fromCell, const wxHtmlCell *toCell);

     
     const wxHtmlCell *GetFromCell() const { return m_fromCell; }
     const wxHtmlCell *GetToCell() const { return m_toCell; }
     
     const wxHtmlCell *GetFromCell() const { return m_fromCell; }
     const wxHtmlCell *GetToCell() const { return m_toCell; }


@@ -57,6 +57,7 @@ public:
     const wxPoint& GetToPrivPos() const { return m_toPrivPos; }
     void SetFromPrivPos(const wxPoint& pos) { m_fromPrivPos = pos; }
     void SetToPrivPos(const wxPoint& pos) { m_toPrivPos = pos; }
     const wxPoint& GetToPrivPos() const { return m_toPrivPos; }
     void SetFromPrivPos(const wxPoint& pos) { m_fromPrivPos = pos; }
     void SetToPrivPos(const wxPoint& pos) { m_toPrivPos = pos; }

+    void ClearPrivPos() { m_toPrivPos = m_fromPrivPos = wxDefaultPosition; }

 
     const bool IsEmpty() const 
         { return m_fromPos == wxDefaultPosition && 
 
     const bool IsEmpty() const 
         { return m_fromPos == wxDefaultPosition && 


@@ -65,7 +66,7 @@ public:
 private:
     wxPoint m_fromPos, m_toPos;
     wxPoint m_fromPrivPos, m_toPrivPos;
 private:
     wxPoint m_fromPos, m_toPos;
     wxPoint m_fromPrivPos, m_toPrivPos;

-    wxHtmlCell *m_fromCell, *m_toCell;
+    const wxHtmlCell *m_fromCell, *m_toCell;

 };
 
 
 };
 
 


@@ -144,7 +145,7 @@ enum
 {
     wxHTML_FIND_EXACT             = 1,
     wxHTML_FIND_NEAREST_BEFORE    = 2,
 {
     wxHTML_FIND_EXACT             = 1,
     wxHTML_FIND_NEAREST_BEFORE    = 2,

-    wxHTML_FIND_NEAREST_AFTER     = 4,
+    wxHTML_FIND_NEAREST_AFTER     = 4

 };
 
 
 };
 
 


@@ -183,6 +184,9 @@ public:
                                     int WXUNUSED(y) = 0) const
         { return m_Link; }
 
                                     int WXUNUSED(y) = 0) const
         { return m_Link; }
 

+    // Returns cursor to be used when mouse is over the cell:
+    virtual wxCursor GetCursor() const;
+

     // return next cell among parent's cells
     wxHtmlCell *GetNext() const {return m_Next;}
     // returns first child cell (if there are any, i.e. if this is container):
     // return next cell among parent's cells
     wxHtmlCell *GetNext() const {return m_Next;}
     // returns first child cell (if there are any, i.e. if this is container):


@@ -283,10 +287,7 @@ public:
     // cells (= as they are read). If cell A is (grand)parent of cell B,
     // then both A.IsBefore(B) and B.IsBefore(A) always return true.
     bool IsBefore(wxHtmlCell *cell) const;
     // cells (= as they are read). If cell A is (grand)parent of cell B,
     // then both A.IsBefore(B) and B.IsBefore(A) always return true.
     bool IsBefore(wxHtmlCell *cell) const;

-
-    // Sets cell's private position values in wxHtmlSelection
-    virtual void SetSelectionPrivPos(wxDC& dc, wxHtmlSelection *s) const {}
-
+    

     // Converts the cell into text representation. If sel != NULL then
     // only part of the cell inside the selection is converted.
     virtual wxString ConvertToText(wxHtmlSelection *WXUNUSED(sel)) const
     // Converts the cell into text representation. If sel != NULL then
     // only part of the cell inside the selection is converted.
     virtual wxString ConvertToText(wxHtmlSelection *WXUNUSED(sel)) const


@@ -331,10 +332,11 @@ public:
     wxHtmlWordCell(const wxString& word, wxDC& dc);
     void Draw(wxDC& dc, int x, int y, int view_y1, int view_y2,
               wxHtmlRenderingInfo& info);
     wxHtmlWordCell(const wxString& word, wxDC& dc);
     void Draw(wxDC& dc, int x, int y, int view_y1, int view_y2,
               wxHtmlRenderingInfo& info);

+    wxCursor GetCursor() const;

     wxString ConvertToText(wxHtmlSelection *sel) const;
     wxString ConvertToText(wxHtmlSelection *sel) const;

-    void SetSelectionPrivPos(wxDC& dc, wxHtmlSelection *s) const;

 
 protected:
 
 protected:

+    void SetSelectionPrivPos(wxDC& dc, wxHtmlSelection *s) const;

     void Split(wxDC& dc,
                const wxPoint& selFrom, const wxPoint& selTo,
                unsigned& pos1, unsigned& pos2) const;
     void Split(wxDC& dc,
                const wxPoint& selFrom, const wxPoint& selTo,
                unsigned& pos1, unsigned& pos2) const;