fixed refresh problem with holidays in wxCalendarCtrl

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

diff --git a/include/wx/html/htmlwin.h b/include/wx/html/htmlwin.h
index 569ae110e9d893cb7b51721bffacb9a73c5d5f3a..f394d696806f383d26e7b8cbab6059c508fb96a0 100644 (file)
--- a/include/wx/html/htmlwin.h
+++ b/include/wx/html/htmlwin.h
@@ -60,6 +60,7 @@ class WXDLLEXPORT HtmlHistoryItem : public wxObject
 WX_DECLARE_EXPORTED_OBJARRAY(HtmlHistoryItem, HtmlHistoryArray);
 
 
+
 class WXDLLEXPORT wxHtmlWindow : public wxScrolledWindow
 {
     DECLARE_DYNAMIC_CLASS(wxHtmlWindow)
@@ -104,9 +105,8 @@ class WXDLLEXPORT wxHtmlWindow : public wxScrolledWindow
                 // after(!) calling SetRelatedFrame, this sets statusbar slot where messages
                 // will be displayed. Default is -1 = no messages.
 
-        void SetFonts(wxString normal_face, int normal_italic_mode, wxString fixed_face, int fixed_italic_mode, const int *sizes);
+        void SetFonts(wxString normal_face, wxString fixed_face, const int *sizes);
                 // sets fonts to be used when displaying HTML page.
-                // *_italic_mode can be either wxSLANT or wxITALIC
 
         virtual void OnSetTitle(const wxString& title);
                 // Sets the title of the window
@@ -136,7 +136,7 @@ class WXDLLEXPORT wxHtmlWindow : public wxScrolledWindow
         static void AddFilter(wxHtmlFilter *filter);
                 // Adds input filter
 
-        virtual void OnLinkClicked(const wxString& link);
+        virtual void OnLinkClicked(wxHtmlLinkInfo *link);
                 // called when users clicked on hypertext link. Default behavior is to
                 // call LoadPage(loc)
 
@@ -200,10 +200,10 @@ class WXDLLEXPORT wxHtmlWindow : public wxScrolledWindow
         bool m_tmpMouseMoved;
                 // a flag indicated if mouse moved
                 // (if TRUE we will try to change cursor in last call to OnIdle)
-        wxString m_tmpLastLink;
+        wxHtmlLinkInfo *m_tmpLastLink;
                 // contains last link name
-        bool m_tmpCanDraw;
-                // if FALSE contents of the window is not redrawn
+        int m_tmpCanDrawLocks;
+                // if >0 contents of the window is not redrawn
                 // (in order to avoid ugly bliking)
 
         static wxList m_Filters;