X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/89de9af3cbe9ddc877594e05380f0e30428677f1..4d2976ad6b56ff1650e15f2b949c10ec92385309:/include/wx/html/htmlwin.h?ds=sidebyside

diff --git a/include/wx/html/htmlwin.h b/include/wx/html/htmlwin.h
index 610bf60626..df896b6f5e 100644
--- 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,11 +136,11 @@ class WXDLLEXPORT wxHtmlWindow : public wxScrolledWindow
         static void AddFilter(wxHtmlFilter *filter);
                 // Adds input filter
 
-        virtual void OnLinkClicked(const wxString& link);
+        virtual void OnLinkClicked(const wxHtmlLinkInfo& link);
                 // called when users clicked on hypertext link. Default behavior is to
                 // call LoadPage(loc)
 
-	static void CleanUpStatics();
+        static void CleanUpStatics();
 	        // cleans static variables
 
         wxHtmlWinParser *GetParser() const { return m_Parser; }
@@ -163,7 +163,7 @@ class WXDLLEXPORT wxHtmlWindow : public wxScrolledWindow
         void OnIdle(wxIdleEvent& event);
         void OnKeyDown(wxKeyEvent& event);
 
-	virtual wxHtmlFilter *GetDefaultFilter() {return new wxHtmlFilterPlainText;}
+        virtual wxHtmlFilter *GetDefaultFilter() {return new wxHtmlFilterPlainText;}
 	        // returns new filter (will be stored into m_DefaultFilter variable)
 
 
@@ -200,7 +200,7 @@ 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
         int m_tmpCanDrawLocks;
                 // if >0 contents of the window is not redrawn