TIFF fix.

[wxWidgets.git] / src / html / htmlwin.cpp

diff --git a/src/html/htmlwin.cpp b/src/html/htmlwin.cpp
index 0f0b5d67a86e4167c72b785eab61f20246a885f9..447a322890e8bd73c8b62ba8a5c7347b9614fc59 100644 (file)
--- a/src/html/htmlwin.cpp
+++ b/src/html/htmlwin.cpp
@@ -44,7 +44,7 @@ wxHtmlWindow::wxHtmlWindow(wxWindow *parent, wxWindowID id, const wxPoint& pos,
                 long style, const wxString& name) : wxScrolledWindow(parent, id, pos, size, wxVSCROLL, name)
 {
     m_tmpMouseMoved = FALSE;
                 long style, const wxString& name) : wxScrolledWindow(parent, id, pos, size, wxVSCROLL, name)
 {
     m_tmpMouseMoved = FALSE;

-    m_tmpLastLink = wxEmptyString;
+    m_tmpLastLink = NULL;

     m_tmpCanDrawLocks = 0;
     m_FS = new wxFileSystem();
     m_RelatedStatusBar = -1;
     m_tmpCanDrawLocks = 0;
     m_FS = new wxFileSystem();
     m_RelatedStatusBar = -1;


@@ -69,9 +69,6 @@ wxHtmlWindow::~wxHtmlWindow()
 
     if (m_Cell) delete m_Cell;
 
 
     if (m_Cell) delete m_Cell;
 

-    wxList *parser_data = m_Parser -> GetTempData();
-    if (parser_data) delete parser_data;
-

     delete m_Parser;
     delete m_FS;
 }
     delete m_Parser;
     delete m_FS;
 }


@@ -421,9 +418,9 @@ void wxHtmlWindow::AddFilter(wxHtmlFilter *filter)
 
 
 
 
 
 

-void wxHtmlWindow::OnLinkClicked(const wxString& link)
+void wxHtmlWindow::OnLinkClicked(const wxHtmlLinkInfo& link)

 {
 {

-    LoadPage(link);
+    LoadPage(link.GetHref());

 }
 
 
 }
 
 


@@ -509,7 +506,7 @@ void wxHtmlWindow::OnMouseEvent(wxMouseEvent& event)
         pos = event.GetPosition();
 
         if (m_Cell)
         pos = event.GetPosition();
 
         if (m_Cell)

-            m_Cell -> OnMouseClick(this, sx + pos.x, sy + pos.y, event.ButtonDown(1), event.ButtonDown(2), event.ButtonDown(3));
+            m_Cell -> OnMouseClick(this, sx + pos.x, sy + pos.y, event);

     }
 }
 
     }
 }
 


@@ -522,7 +519,7 @@ void wxHtmlWindow::OnIdle(wxIdleEvent& event)
     if (m_tmpMouseMoved && (m_Cell != NULL)) {
         int sx, sy;
         int x, y;
     if (m_tmpMouseMoved && (m_Cell != NULL)) {
         int sx, sy;
         int x, y;

-        wxString lnk;
+        wxHtmlLinkInfo *lnk;

 
         ViewStart(&sx, &sy); sx *= wxHTML_SCROLL_STEP; sy *= wxHTML_SCROLL_STEP;
         wxGetMousePosition(&x, &y);
 
         ViewStart(&sx, &sy); sx *= wxHTML_SCROLL_STEP; sy *= wxHTML_SCROLL_STEP;
         wxGetMousePosition(&x, &y);


@@ -530,13 +527,14 @@ void wxHtmlWindow::OnIdle(wxIdleEvent& event)
         lnk = m_Cell -> GetLink(sx + x, sy + y);
 
         if (lnk != m_tmpLastLink) {
         lnk = m_Cell -> GetLink(sx + x, sy + y);
 
         if (lnk != m_tmpLastLink) {

-            if (lnk == wxEmptyString) {
+            if (lnk == NULL) {

                 SetCursor(cur_arrow);
                 if (m_RelatedStatusBar != -1) m_RelatedFrame -> SetStatusText(wxEmptyString, m_RelatedStatusBar);
             }
             else {
                 SetCursor(cur_hand);
                 SetCursor(cur_arrow);
                 if (m_RelatedStatusBar != -1) m_RelatedFrame -> SetStatusText(wxEmptyString, m_RelatedStatusBar);
             }
             else {
                 SetCursor(cur_hand);

-                if (m_RelatedStatusBar != -1) m_RelatedFrame -> SetStatusText(lnk, m_RelatedStatusBar);
+                if (m_RelatedStatusBar != -1) 
+                    m_RelatedFrame -> SetStatusText(lnk -> GetHref(), m_RelatedStatusBar);

             }
             m_tmpLastLink = lnk;
         }
             }
             m_tmpLastLink = lnk;
         }