Applied patch [ 649157 ] wxDisplay for Unix

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

diff --git a/include/wx/html/htmlcell.h b/include/wx/html/htmlcell.h
index 390af0c9ea627bb269d6a7b4383654f674ce73ac..4b2e9f72c30e12570110efcc50a0ad3d38cb33e8 100644 (file)
--- a/include/wx/html/htmlcell.h
+++ b/include/wx/html/htmlcell.h
@@ -49,8 +49,8 @@ public:
         m_toPos = toPos;
     }
     
-    wxHtmlCell *GetFromCell() const { return m_fromCell; }
-    wxHtmlCell *GetToCell() const { return m_toCell; }
+    const wxHtmlCell *GetFromCell() const { return m_fromCell; }
+    const wxHtmlCell *GetToCell() const { return m_toCell; }
     
     // these values are *relative* to From/To cell's origin:
     const wxPoint& GetFromPos() const { return m_fromPos; }
@@ -79,8 +79,9 @@ enum wxHtmlSelectionState
 class WXDLLEXPORT wxHtmlRenderingState
 {
 public:
-    wxHtmlRenderingState(wxHtmlSelection *s)
+    wxHtmlRenderingState(wxHtmlSelection *s = NULL)
         : m_selection(s), m_selState(wxHTML_SEL_OUT) {}
+    void SetSelection(wxHtmlSelection *s) { m_selection = s; }
     wxHtmlSelection *GetSelection() const { return m_selection; }
 
     void SetSelectionState(wxHtmlSelectionState s) { m_selState = s; }