Fix showing back hidden columns and rows in wxGrid.

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

diff --git a/include/wx/html/winpars.h b/include/wx/html/winpars.h
index 1e268512a1d3a99ccb30f9a77ab3ec33f7e9f3bb..562a9dd37d091ca95a3191de645b5488a99e0e05 100644 (file)
--- a/include/wx/html/winpars.h
+++ b/include/wx/html/winpars.h
@@ -132,6 +132,10 @@ public:
     void SetLinkColor(const wxColour& clr) { m_LinkColor = clr; }
     const wxColour& GetActualColor() const { return m_ActualColor; }
     void SetActualColor(const wxColour& clr) { m_ActualColor = clr ;}
     void SetLinkColor(const wxColour& clr) { m_LinkColor = clr; }
     const wxColour& GetActualColor() const { return m_ActualColor; }
     void SetActualColor(const wxColour& clr) { m_ActualColor = clr ;}

+    const wxColour& GetActualBackgroundColor() const { return m_ActualBackgroundColor; }
+    void SetActualBackgroundColor(const wxColour& clr) { m_ActualBackgroundColor = clr;}
+    int GetActualBackgroundMode() const { return m_ActualBackgroundMode; }
+    void SetActualBackgroundMode(int mode) { m_ActualBackgroundMode = mode;}

     const wxHtmlLinkInfo& GetLink() const { return m_Link; }
     void SetLink(const wxHtmlLinkInfo& link);
 
     const wxHtmlLinkInfo& GetLink() const { return m_Link; }
     void SetLink(const wxHtmlLinkInfo& link);
 


@@ -193,6 +197,8 @@ private:
     int m_FontSize; // From 1 (smallest) to 7, default is 3.
     wxColour m_LinkColor;
     wxColour m_ActualColor;
     int m_FontSize; // From 1 (smallest) to 7, default is 3.
     wxColour m_LinkColor;
     wxColour m_ActualColor;

+    wxColour m_ActualBackgroundColor;
+    int m_ActualBackgroundMode;

             // basic font parameters.
     wxHtmlLinkInfo m_Link;
             // actual hypertext link or empty string
             // basic font parameters.
     wxHtmlLinkInfo m_Link;
             // actual hypertext link or empty string


@@ -253,6 +259,8 @@ private:
 //                  the wxHtmlWinParser object
 //-----------------------------------------------------------------------------
 
 //                  the wxHtmlWinParser object
 //-----------------------------------------------------------------------------
 

+class WXDLLIMPEXP_FWD_HTML wxHtmlStyleParams;
+

 class WXDLLIMPEXP_HTML wxHtmlWinTagHandler : public wxHtmlTagHandler
 {
     DECLARE_ABSTRACT_CLASS(wxHtmlWinTagHandler)
 class WXDLLIMPEXP_HTML wxHtmlWinTagHandler : public wxHtmlTagHandler
 {
     DECLARE_ABSTRACT_CLASS(wxHtmlWinTagHandler)


@@ -261,10 +269,13 @@ public:
     wxHtmlWinTagHandler() : wxHtmlTagHandler() {}
 
     virtual void SetParser(wxHtmlParser *parser) {wxHtmlTagHandler::SetParser(parser); m_WParser = (wxHtmlWinParser*) parser;}
     wxHtmlWinTagHandler() : wxHtmlTagHandler() {}
 
     virtual void SetParser(wxHtmlParser *parser) {wxHtmlTagHandler::SetParser(parser); m_WParser = (wxHtmlWinParser*) parser;}

+    virtual wxHtmlWinParser* GetParser() const { return (wxHtmlWinParser*)m_Parser; }

 
 protected:
     wxHtmlWinParser *m_WParser; // same as m_Parser, but overcasted
 
 
 protected:
     wxHtmlWinParser *m_WParser; // same as m_Parser, but overcasted
 

+    void ApplyStyle(const wxHtmlStyleParams &styleParams);
+

     wxDECLARE_NO_COPY_CLASS(wxHtmlWinTagHandler);
 };
 
     wxDECLARE_NO_COPY_CLASS(wxHtmlWinTagHandler);
 };