attempt to fix wxMenuBar::EnableTop

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

diff --git a/src/html/htmlwin.cpp b/src/html/htmlwin.cpp
index b3afd179dc62762beca4adc53ff9f6ed3087c0c5..a001a80126adf91fd0ce33fab806601e59477275 100644 (file)
--- a/src/html/htmlwin.cpp
+++ b/src/html/htmlwin.cpp
@@ -2,6 +2,7 @@
 // Name:        htmlwin.cpp
 // Purpose:     wxHtmlWindow class for parsing & displaying HTML (implementation)
 // Author:      Vaclav Slavik
+// RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vaclav Slavik
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
@@ -24,9 +25,9 @@
 #include <wx/wx.h>
 #endif
 
-#include <wx/html/htmlwin.h>
+#include "wx/html/htmlwin.h"
 
-#include <wx/html/forcelink.h>
+#include "wx/html/forcelnk.h"
 
 
 
@@ -40,10 +41,11 @@
 WX_DEFINE_OBJARRAY(HtmlHistoryArray)
 
 
-wxHtmlWindow::wxHtmlWindow(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size, 
+wxHtmlWindow::wxHtmlWindow(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size,
                 long style, const wxString& name) : wxScrolledWindow(parent, id, pos, size, wxVSCROLL, name)
 {
     m_tmpMouseMoved = FALSE;
+    m_tmpLastLink = wxEmptyString;
     m_tmpCanDraw = TRUE;
     m_FS = new wxFileSystem();
     m_RelatedStatusBar = -1;
@@ -89,10 +91,10 @@ void wxHtmlWindow::SetRelatedStatusBar(int bar)
 {
     m_RelatedStatusBar = bar;
 }
-        
-        
-        
-void wxHtmlWindow::SetFonts(wxString normal_face, int normal_italic_mode, wxString fixed_face, int fixed_italic_mode, int *sizes)
+
+
+
+void wxHtmlWindow::SetFonts(wxString normal_face, int normal_italic_mode, wxString fixed_face, int fixed_italic_mode, const int *sizes)
 {
     m_Parser -> SetFonts(normal_face, normal_italic_mode, fixed_face, fixed_italic_mode, sizes);
     if (!m_OpenedPage.IsEmpty()) LoadPage(m_OpenedPage);
@@ -114,8 +116,8 @@ bool wxHtmlWindow::SetPage(const wxString& source)
     }
     m_Cell = (wxHtmlContainerCell*) m_Parser -> Parse(source);
     delete dc;
-    m_Cell -> SetIndent(m_Borders, HTML_INDENT_ALL, HTML_UNITS_PIXELS);
-    m_Cell -> SetAlignHor(HTML_ALIGN_CENTER);
+    m_Cell -> SetIndent(m_Borders, wxHTML_INDENT_ALL, wxHTML_UNITS_PIXELS);
+    m_Cell -> SetAlignHor(wxHTML_ALIGN_CENTER);
     CreateLayout();
     Refresh();
     return TRUE;
@@ -216,13 +218,13 @@ bool wxHtmlWindow::LoadPage(const wxString& location)
 
 bool wxHtmlWindow::ScrollToAnchor(const wxString& anchor)
 {
-    const wxHtmlCell *c = m_Cell -> Find(HTML_COND_ISANCHOR, &anchor);
+    const wxHtmlCell *c = m_Cell -> Find(wxHTML_COND_ISANCHOR, &anchor);
     if (!c) return FALSE;
     else {
         int y;
-    
+
         for (y = 0; c != NULL; c = c -> GetParent()) y += c -> GetPosY();
-        Scroll(-1, y / HTML_SCROLL_STEP);
+        Scroll(-1, y / wxHTML_SCROLL_STEP);
         m_OpenedAnchor = anchor;
         return TRUE;
     }
@@ -249,30 +251,34 @@ void wxHtmlWindow::CreateLayout()
     if (!m_Cell) return;
 
     if (m_Style == wxHW_SCROLLBAR_NEVER) {
+        SetScrollbars(1, 1, 0, 0); // always off
         GetClientSize(&ClientWidth, &ClientHeight);
         m_Cell -> Layout(ClientWidth);
     }
 
     else {
         GetClientSize(&ClientWidth, &ClientHeight);
-        SetScrollbars(1, 1, 0, ClientHeight * 2); // always on          
+#ifndef __WXMSW__
+        // VS : this looks extremely ugly under windoze, better fix needed!
+        SetScrollbars(1, 1, 0, ClientHeight * 2); // always on
+#endif
         GetClientSize(&ClientWidth, &ClientHeight);
         m_Cell -> Layout(ClientWidth);
-        GetClientSize(&ClientWidth, &ClientHeight);
-       if (ClientHeight < m_Cell -> GetHeight()) {
-            SetScrollbars(HTML_SCROLL_STEP, HTML_SCROLL_STEP,
-                          m_Cell -> GetWidth() / HTML_SCROLL_STEP,
-                          m_Cell -> GetHeight() / HTML_SCROLL_STEP
+       if (ClientHeight < m_Cell -> GetHeight()) {
+            SetScrollbars(wxHTML_SCROLL_STEP, wxHTML_SCROLL_STEP,
+                          m_Cell -> GetWidth() / wxHTML_SCROLL_STEP,
+                          m_Cell -> GetHeight() / wxHTML_SCROLL_STEP
                           /*cheat: top-level frag is always container*/);
         }
-       else { /* we fit into window, no need for scrollbars */
-           SetScrollbars(1, 1, 0, 0); // disable...
-           m_Cell -> Layout(ClientWidth); // ...and relayout
-       }
+           else { /* we fit into window, no need for scrollbars */
+               SetScrollbars(1, 1, 0, 0); // disable...
+                GetClientSize(&ClientWidth, &ClientHeight);
+               m_Cell -> Layout(ClientWidth); // ...and relayout
+           }
     }
 }
 
-        
+
 
 void wxHtmlWindow::ReadCustomization(wxConfigBase *cfg, wxString path)
 {
@@ -385,13 +391,15 @@ void wxHtmlWindow::CleanUpStatics()
 {
     if (m_DefaultFilter) delete m_DefaultFilter;
     m_DefaultFilter = NULL;
+    m_Filters.DeleteContents(TRUE);
+    m_Filters.Clear();
+
 }
 
 
 
 void wxHtmlWindow::AddFilter(wxHtmlFilter *filter)
 {
-    m_Filters.DeleteContents(TRUE);
     m_Filters.Append(filter);
 }
 
@@ -422,7 +430,7 @@ void wxHtmlWindow::OnDraw(wxDC& dc)
     while (upd) {
         v_y = upd.GetY();
         v_h = upd.GetH();
-        if (m_Cell) m_Cell -> Draw(dc, 0, 0, y * HTML_SCROLL_STEP + v_y, y * HTML_SCROLL_STEP + v_h + v_y);
+        if (m_Cell) m_Cell -> Draw(dc, 0, 0, y * wxHTML_SCROLL_STEP + v_y, y * wxHTML_SCROLL_STEP + v_h + v_y);
         upd++;
     }
 }
@@ -444,8 +452,8 @@ void wxHtmlWindow::OnKeyDown(wxKeyEvent& event)
     int sty, szy, cliy;
 
     ViewStart(&dummy, &sty);
-    GetClientSize(&dummy, &cliy); cliy /= HTML_SCROLL_STEP;
-    GetVirtualSize(&dummy, &szy); szy /= HTML_SCROLL_STEP;
+    GetClientSize(&dummy, &cliy); cliy /= wxHTML_SCROLL_STEP;
+    GetVirtualSize(&dummy, &szy); szy /= wxHTML_SCROLL_STEP;
 
     switch (event.KeyCode()) {
         case WXK_PAGEUP :
@@ -482,7 +490,7 @@ void wxHtmlWindow::OnMouseEvent(wxMouseEvent& event)
         wxPoint pos;
         wxString lnk;
 
-        ViewStart(&sx, &sy); sx *= HTML_SCROLL_STEP; sy *= HTML_SCROLL_STEP;
+        ViewStart(&sx, &sy); sx *= wxHTML_SCROLL_STEP; sy *= wxHTML_SCROLL_STEP;
         pos = event.GetPosition();
 
         if (m_Cell)
@@ -501,18 +509,21 @@ void wxHtmlWindow::OnIdle(wxIdleEvent& event)
         int x, y;
         wxString lnk;
 
-        ViewStart(&sx, &sy); sx *= HTML_SCROLL_STEP; sy *= HTML_SCROLL_STEP;
+        ViewStart(&sx, &sy); sx *= wxHTML_SCROLL_STEP; sy *= wxHTML_SCROLL_STEP;
         wxGetMousePosition(&x, &y);
         ScreenToClient(&x, &y);
         lnk = m_Cell -> GetLink(sx + x, sy + y);
 
-        if (lnk == wxEmptyString) {
-            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 (lnk != m_tmpLastLink) {
+            if (lnk == wxEmptyString) {
+                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);
+            }
+            m_tmpLastLink = lnk;
         }
         m_tmpMouseMoved = FALSE;
     }