added new project file having the new files

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

diff --git a/src/html/htmlwin.cpp b/src/html/htmlwin.cpp
index af8f4639f959c0d1c066690b4bb2ffa8266c89a5..30164dc55da4899988aa9ec251085c0f05210fa8 100644 (file)
--- a/src/html/htmlwin.cpp
+++ b/src/html/htmlwin.cpp
@@ -9,39 +9,72 @@
 
 
 #ifdef __GNUG__
 
 
 #ifdef __GNUG__

-#pragma implementation
+#pragma implementation "htmlwin.h"
+#pragma implementation "htmlproc.h"

 #endif
 
 #include "wx/wxprec.h"
 
 #include "wx/defs.h"
 #endif
 
 #include "wx/wxprec.h"
 
 #include "wx/defs.h"

-#if wxUSE_HTML
+#if wxUSE_HTML && wxUSE_STREAMS

 
 #ifdef __BORDLANDC__
 #pragma hdrstop
 #endif
 
 #ifndef WXPRECOMP
 
 #ifdef __BORDLANDC__
 #pragma hdrstop
 #endif
 
 #ifndef WXPRECOMP

-#include "wx/wx.h"
+    #include "wx/log.h"
+    #include "wx/intl.h"
+    #include "wx/dcclient.h"
+    #include "wx/frame.h"

 #endif
 
 #include "wx/html/htmlwin.h"
 #include "wx/html/forcelnk.h"
 #endif
 
 #include "wx/html/htmlwin.h"
 #include "wx/html/forcelnk.h"

+#include "wx/html/htmlproc.h"
+#include "wx/list.h"

 
 

+#include "wx/arrimpl.cpp"
+#include "wx/listimpl.cpp"
+
+//-----------------------------------------------------------------------------
+// wxHtmlHistoryItem
+//-----------------------------------------------------------------------------
+
+// item of history list
+class WXDLLEXPORT wxHtmlHistoryItem : public wxObject
+{
+public:
+    wxHtmlHistoryItem(const wxString& p, const wxString& a) {m_Page = p, m_Anchor = a, m_Pos = 0;}
+    int GetPos() const {return m_Pos;}
+    void SetPos(int p) {m_Pos = p;}
+    const wxString& GetPage() const {return m_Page;}
+    const wxString& GetAnchor() const {return m_Anchor;}
+
+private:
+    wxString m_Page;
+    wxString m_Anchor;
+    int m_Pos;
+};

 
 
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------

-// wxHtmlWindow
+// our private arrays:

 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 

+WX_DECLARE_OBJARRAY(wxHtmlHistoryItem, wxHtmlHistoryArray);
+WX_DEFINE_OBJARRAY(wxHtmlHistoryArray);

 
 

+WX_DECLARE_LIST(wxHtmlProcessor, wxHtmlProcessorList);
+WX_DEFINE_LIST(wxHtmlProcessorList);

 
 

-#include "wx/arrimpl.cpp"
-WX_DEFINE_OBJARRAY(HtmlHistoryArray)
+//-----------------------------------------------------------------------------
+// wxHtmlWindow
+//-----------------------------------------------------------------------------

 
 
 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 | wxHSCROLL, name)
+                long style, const wxString& name) : wxScrolledWindow(parent, id, pos, size, style | wxVSCROLL | wxHSCROLL, name)

 {
     m_tmpMouseMoved = FALSE;
     m_tmpLastLink = NULL;
 {
     m_tmpMouseMoved = FALSE;
     m_tmpLastLink = NULL;


@@ -49,16 +82,18 @@ wxHtmlWindow::wxHtmlWindow(wxWindow *parent, wxWindowID id, const wxPoint& pos,
     m_FS = new wxFileSystem();
     m_RelatedStatusBar = -1;
     m_RelatedFrame = NULL;
     m_FS = new wxFileSystem();
     m_RelatedStatusBar = -1;
     m_RelatedFrame = NULL;

-    m_TitleFormat = "%s";
+    m_TitleFormat = wxT("%s");

     m_OpenedPage = m_OpenedAnchor = m_OpenedPageTitle = wxEmptyString;
     m_Cell = NULL;
     m_Parser = new wxHtmlWinParser(this);
     m_OpenedPage = m_OpenedAnchor = m_OpenedPageTitle = wxEmptyString;
     m_Cell = NULL;
     m_Parser = new wxHtmlWinParser(this);

-    m_Parser -> SetFS(m_FS);
+    m_Parser->SetFS(m_FS);

     SetBorders(10);
     m_HistoryPos = -1;
     m_HistoryOn = TRUE;
     SetBorders(10);
     m_HistoryPos = -1;
     m_HistoryOn = TRUE;

+    m_History = new wxHtmlHistoryArray;
+    m_Processors = NULL;

     m_Style = style;
     m_Style = style;

-    SetPage("<html><body></body></html>");
+    SetPage(wxT("<html><body></body></html>"));

 }
 
 
 }
 
 


@@ -71,6 +106,8 @@ wxHtmlWindow::~wxHtmlWindow()
 
     delete m_Parser;
     delete m_FS;
 
     delete m_Parser;
     delete m_FS;

+    delete m_History;
+    delete m_Processors;

 }
 
 
 }
 
 


@@ -94,8 +131,9 @@ void wxHtmlWindow::SetFonts(wxString normal_face, wxString fixed_face, const int
 {
     wxString op = m_OpenedPage;
 
 {
     wxString op = m_OpenedPage;
 

-    m_Parser -> SetFonts(normal_face, fixed_face, sizes);
-    SetPage(wxT("<html><body></body></html>")); // fonts changed => contents invalid
+    m_Parser->SetFonts(normal_face, fixed_face, sizes);
+    // fonts changed => contents invalid, so reload the page:
+    SetPage(wxT("<html><body></body></html>"));

     if (!op.IsEmpty()) LoadPage(op);
 }
 
     if (!op.IsEmpty()) LoadPage(op);
 }
 


@@ -103,22 +141,59 @@ void wxHtmlWindow::SetFonts(wxString normal_face, wxString fixed_face, const int
 
 bool wxHtmlWindow::SetPage(const wxString& source)
 {
 
 bool wxHtmlWindow::SetPage(const wxString& source)
 {

-    wxClientDC *dc = new wxClientDC(this);
+    wxString newsrc(source);
+
+    // pass HTML through registered processors:
+    if (m_Processors || m_GlobalProcessors)
+    {
+        wxHtmlProcessorList::Node *nodeL, *nodeG;
+        int prL, prG;
+
+        nodeL = (m_Processors) ? m_Processors->GetFirst() : NULL;
+        nodeG = (m_GlobalProcessors) ? m_GlobalProcessors->GetFirst() : NULL;
+
+        // VS: there are two lists, global and local, both of them sorted by
+        //     priority. Since we have to go through _both_ lists with
+        //     decreasing priority, we "merge-sort" the lists on-line by
+        //     processing that one of the two heads that has higher priority
+        //     in every iteration
+        while (nodeL || nodeG)
+        {
+            prL = (nodeL) ? nodeL->GetData()->GetPriority() : -1;
+            prG = (nodeG) ? nodeG->GetData()->GetPriority() : -1;
+            if (prL > prG)
+            {
+                if (nodeL->GetData()->IsEnabled())
+                    newsrc = nodeL->GetData()->Process(newsrc);
+                nodeL = nodeL->GetNext();
+            }
+            else // prL <= prG
+            {
+                if (nodeG->GetData()->IsEnabled())
+                    newsrc = nodeG->GetData()->Process(newsrc);
+                nodeG = nodeG->GetNext();
+            }
+        }
+    }

 
 

-    dc -> SetMapMode(wxMM_TEXT);
+    // ...and run the parser on it:
+    wxClientDC *dc = new wxClientDC(this);
+    dc->SetMapMode(wxMM_TEXT);

     SetBackgroundColour(wxColour(0xFF, 0xFF, 0xFF));
     m_OpenedPage = m_OpenedAnchor = m_OpenedPageTitle = wxEmptyString;
     SetBackgroundColour(wxColour(0xFF, 0xFF, 0xFF));
     m_OpenedPage = m_OpenedAnchor = m_OpenedPageTitle = wxEmptyString;

-    m_Parser -> SetDC(dc);
-    if (m_Cell) {
+    m_Parser->SetDC(dc);
+    if (m_Cell)
+    {

         delete m_Cell;
         m_Cell = NULL;
     }
         delete m_Cell;
         m_Cell = NULL;
     }

-    m_Cell = (wxHtmlContainerCell*) m_Parser -> Parse(source);
+    m_Cell = (wxHtmlContainerCell*) m_Parser->Parse(newsrc);

     delete dc;
     delete dc;

-    m_Cell -> SetIndent(m_Borders, wxHTML_INDENT_ALL, wxHTML_UNITS_PIXELS);
-    m_Cell -> SetAlignHor(wxHTML_ALIGN_CENTER);
+    m_Cell->SetIndent(m_Borders, wxHTML_INDENT_ALL, wxHTML_UNITS_PIXELS);
+    m_Cell->SetAlignHor(wxHTML_ALIGN_CENTER);

     CreateLayout();
     CreateLayout();

-    if (m_tmpCanDrawLocks == 0) Refresh();
+    if (m_tmpCanDrawLocks == 0)
+        Refresh();

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -127,96 +202,137 @@ bool wxHtmlWindow::LoadPage(const wxString& location)
 {
     wxFSFile *f;
     bool rt_val;
 {
     wxFSFile *f;
     bool rt_val;

+    bool needs_refresh = FALSE;

 
     SetCursor(*wxHOURGLASS_CURSOR);
 
     SetCursor(*wxHOURGLASS_CURSOR);

-    wxYield();
+    wxYield(); Refresh(FALSE);

 
     m_tmpCanDrawLocks++;
 
     m_tmpCanDrawLocks++;

-    if (m_HistoryOn && (m_HistoryPos != -1)) { // store scroll position into history item
+    if (m_HistoryOn && (m_HistoryPos != -1))
+    {
+        // store scroll position into history item:

         int x, y;
         int x, y;

-        ViewStart(&x, &y);
-        m_History[m_HistoryPos].SetPos(y);
+        GetViewStart(&x, &y);
+        (*m_History)[m_HistoryPos].SetPos(y);

     }
 
     }
 

-    if (location[0] == '#') { // local anchor
+    if (location[0] == wxT('#'))
+    {
+        // local anchor:

         wxString anch = location.Mid(1) /*1 to end*/;
         m_tmpCanDrawLocks--;
         rt_val = ScrollToAnchor(anch);
         wxString anch = location.Mid(1) /*1 to end*/;
         m_tmpCanDrawLocks--;
         rt_val = ScrollToAnchor(anch);

+        m_tmpCanDrawLocks++;
+    }
+    else if (location.Find(wxT('#')) != wxNOT_FOUND && location.BeforeFirst(wxT('#')) == m_OpenedPage)
+    {
+        wxString anch = location.AfterFirst(wxT('#'));
+        m_tmpCanDrawLocks--;
+        rt_val = ScrollToAnchor(anch);
+        m_tmpCanDrawLocks++;
+    }
+    else if (location.Find(wxT('#')) != wxNOT_FOUND &&
+             (m_FS->GetPath() + location.BeforeFirst(wxT('#'))) == m_OpenedPage)
+    {
+        wxString anch = location.AfterFirst(wxT('#'));
+        m_tmpCanDrawLocks--;
+        rt_val = ScrollToAnchor(anch);
+        m_tmpCanDrawLocks++;

     }
 
     }
 

-    else {
+    else
+    {
+        needs_refresh = TRUE;

         // load&display it:
         // load&display it:

-        if (m_RelatedStatusBar != -1) {
-            m_RelatedFrame -> SetStatusText(_("Connecting..."), m_RelatedStatusBar);
-            Refresh();
+        if (m_RelatedStatusBar != -1)
+        {
+            m_RelatedFrame->SetStatusText(_("Connecting..."), m_RelatedStatusBar);
+            Refresh(FALSE);

         }
 
         }
 

-        f = m_FS -> OpenFile(location);
-        if (f == NULL) {
-            wxString err;
+        f = m_FS->OpenFile(location);

 
 

-            err.Printf(_("Unable to open requested location :\n\n%s"), WXSTRINGCAST location);
+        if (f == NULL)
+        {
+            wxLogError(_("Unable to open requested HTML document: %s"), location.c_str());

             m_tmpCanDrawLocks--;
             m_tmpCanDrawLocks--;

-            Refresh();
-            wxMessageBox(err, "Error");

 
             SetCursor(*wxSTANDARD_CURSOR);
             return FALSE;
         }
 
 
             SetCursor(*wxSTANDARD_CURSOR);
             return FALSE;
         }
 

-        else {
+        else
+        {

             wxNode *node;
             wxString src = wxEmptyString;
 
             wxNode *node;
             wxString src = wxEmptyString;
 

-            if (m_RelatedStatusBar != -1) {
+            if (m_RelatedStatusBar != -1)
+            {

                 wxString msg = _("Loading : ") + location;
                 wxString msg = _("Loading : ") + location;

-                m_RelatedFrame -> SetStatusText(msg, m_RelatedStatusBar);
-                Refresh();
+                m_RelatedFrame->SetStatusText(msg, m_RelatedStatusBar);
+                Refresh(FALSE);

             }
 
             node = m_Filters.GetFirst();
             }
 
             node = m_Filters.GetFirst();

-            while (node){
-                wxHtmlFilter *h = (wxHtmlFilter*) node -> GetData();
-                if (h -> CanRead(*f)) {
-                    src = h -> ReadFile(*f);
+            while (node)
+            {
+                wxHtmlFilter *h = (wxHtmlFilter*) node->GetData();
+                if (h->CanRead(*f))
+                {
+                    src = h->ReadFile(*f);

                     break;
                 }
                     break;
                 }

-                node = node -> GetNext();
+                node = node->GetNext();

             }
             }

-            if (src == wxEmptyString) {
+            if (src == wxEmptyString)
+            {

                 if (m_DefaultFilter == NULL) m_DefaultFilter = GetDefaultFilter();
                 if (m_DefaultFilter == NULL) m_DefaultFilter = GetDefaultFilter();

-                src = m_DefaultFilter -> ReadFile(*f);
+                src = m_DefaultFilter->ReadFile(*f);

             }
 
             }
 

-            m_FS -> ChangePathTo(f -> GetLocation());
+            m_FS->ChangePathTo(f->GetLocation());

             rt_val = SetPage(src);
             rt_val = SetPage(src);

-            m_OpenedPage = f -> GetLocation();
-            if (f -> GetAnchor() != wxEmptyString) {
-//                m_tmpCanDrawLocks--;
-                ScrollToAnchor(f -> GetAnchor());
-//                m_tmpCanDrawLocks++;
+            m_OpenedPage = f->GetLocation();
+            if (f->GetAnchor() != wxEmptyString)
+            {
+                wxYield();
+                ScrollToAnchor(f->GetAnchor());

             }
 
             delete f;
 
             }
 
             delete f;
 

-            if (m_RelatedStatusBar != -1) m_RelatedFrame -> SetStatusText(_("Done"), m_RelatedStatusBar);
+            if (m_RelatedStatusBar != -1) m_RelatedFrame->SetStatusText(_("Done"), m_RelatedStatusBar);

         }
     }
 
         }
     }
 

-    if (m_HistoryOn) { // add this page to history there:
-        int c = m_History.GetCount() - (m_HistoryPos + 1);
-
-        m_HistoryPos++;
-        for (int i = 0; i < c; i++)
-            m_History.Remove(m_HistoryPos);
-        m_History.Add(new HtmlHistoryItem(m_OpenedPage, m_OpenedAnchor));
+    if (m_HistoryOn) // add this page to history there:
+    {
+        int c = m_History->GetCount() - (m_HistoryPos + 1);
+
+        if (m_HistoryPos < 0 || 
+            (*m_History)[m_HistoryPos].GetPage() != m_OpenedPage ||
+            (*m_History)[m_HistoryPos].GetAnchor() != m_OpenedAnchor)
+        {
+            m_HistoryPos++;
+            for (int i = 0; i < c; i++)
+                m_History->RemoveAt(m_HistoryPos);
+            m_History->Add(new wxHtmlHistoryItem(m_OpenedPage, m_OpenedAnchor));
+        }

     }
 
     }
 

+    if (m_OpenedPageTitle == wxEmptyString)
+        OnSetTitle(wxFileNameFromPath(m_OpenedPage));

     SetCursor(*wxSTANDARD_CURSOR);
 
     SetCursor(*wxSTANDARD_CURSOR);
 

-    wxYield();
-    m_tmpCanDrawLocks--;
-    Refresh();
+    if (needs_refresh)
+    {
+        wxYield();
+        m_tmpCanDrawLocks--;
+        Refresh();
+    }
+    else
+        m_tmpCanDrawLocks--;
+

     return rt_val;
 }
 
     return rt_val;
 }
 


@@ -224,12 +340,17 @@ bool wxHtmlWindow::LoadPage(const wxString& location)
 
 bool wxHtmlWindow::ScrollToAnchor(const wxString& anchor)
 {
 
 bool wxHtmlWindow::ScrollToAnchor(const wxString& anchor)
 {

-    const wxHtmlCell *c = m_Cell -> Find(wxHTML_COND_ISANCHOR, &anchor);
-    if (!c) return FALSE;
-    else {
+    const wxHtmlCell *c = m_Cell->Find(wxHTML_COND_ISANCHOR, &anchor);
+    if (!c)
+    {
+        wxLogWarning(_("HTML anchor %s does not exist."), anchor.c_str());
+        return FALSE;
+    }
+    else
+    {

         int y;
 
         int y;
 

-        for (y = 0; c != NULL; c = c -> GetParent()) y += c -> GetPosY();
+        for (y = 0; c != NULL; c = c->GetParent()) y += c->GetPosY();

         Scroll(-1, y / wxHTML_SCROLL_STEP);
         m_OpenedAnchor = anchor;
         return TRUE;
         Scroll(-1, y / wxHTML_SCROLL_STEP);
         m_OpenedAnchor = anchor;
         return TRUE;


@@ -239,10 +360,11 @@ bool wxHtmlWindow::ScrollToAnchor(const wxString& anchor)
 
 void wxHtmlWindow::OnSetTitle(const wxString& title)
 {
 
 void wxHtmlWindow::OnSetTitle(const wxString& title)
 {

-    if (m_RelatedFrame) {
+    if (m_RelatedFrame)
+    {

         wxString tit;
         tit.Printf(m_TitleFormat, title.c_str());
         wxString tit;
         tit.Printf(m_TitleFormat, title.c_str());

-        m_RelatedFrame -> SetTitle(tit);
+        m_RelatedFrame->SetTitle(tit);

     }
     m_OpenedPageTitle = title;
 }
     }
     m_OpenedPageTitle = title;
 }


@@ -257,31 +379,29 @@ void wxHtmlWindow::CreateLayout()
 
     if (!m_Cell) return;
 
 
     if (!m_Cell) return;
 

-    if (m_Style == wxHW_SCROLLBAR_NEVER) {
-        SetScrollbars(wxHTML_SCROLL_STEP, 1, m_Cell -> GetWidth() / wxHTML_SCROLL_STEP, 0); // always off
+    if (m_Style & wxHW_SCROLLBAR_NEVER)
+    {
+        SetScrollbars(wxHTML_SCROLL_STEP, 1, m_Cell->GetWidth() / wxHTML_SCROLL_STEP, 0); // always off

         GetClientSize(&ClientWidth, &ClientHeight);
         GetClientSize(&ClientWidth, &ClientHeight);

-        m_Cell -> Layout(ClientWidth);
+        m_Cell->Layout(ClientWidth);

     }
 
     else {
         GetClientSize(&ClientWidth, &ClientHeight);
     }
 
     else {
         GetClientSize(&ClientWidth, &ClientHeight);

-#ifndef __WXMSW__
-        // VS : this looks extremely ugly under windoze, better fix needed!
-        SetScrollbars(wxHTML_SCROLL_STEP, 1, m_Cell -> GetWidth() / wxHTML_SCROLL_STEP, ClientHeight * 2); // always on
-#endif
-        GetClientSize(&ClientWidth, &ClientHeight);
-        m_Cell -> Layout(ClientWidth);
-        if (ClientHeight < m_Cell -> GetHeight() + GetCharHeight()) {
+        m_Cell->Layout(ClientWidth);
+        if (ClientHeight < m_Cell->GetHeight() + GetCharHeight())
+        {

             SetScrollbars(
                   wxHTML_SCROLL_STEP, wxHTML_SCROLL_STEP,
             SetScrollbars(
                   wxHTML_SCROLL_STEP, wxHTML_SCROLL_STEP,

-                  m_Cell -> GetWidth() / wxHTML_SCROLL_STEP,
-                  (m_Cell -> GetHeight() + GetCharHeight()) / wxHTML_SCROLL_STEP
+                  m_Cell->GetWidth() / wxHTML_SCROLL_STEP,
+                  (m_Cell->GetHeight() + GetCharHeight()) / wxHTML_SCROLL_STEP

                   /*cheat: top-level frag is always container*/);
         }
                   /*cheat: top-level frag is always container*/);
         }

-        else { /* we fit into window, no need for scrollbars */
-            SetScrollbars(wxHTML_SCROLL_STEP, 1, m_Cell -> GetWidth() / wxHTML_SCROLL_STEP, 0); // disable...
+        else /* we fit into window, no need for scrollbars */
+        {
+            SetScrollbars(wxHTML_SCROLL_STEP, 1, m_Cell->GetWidth() / wxHTML_SCROLL_STEP, 0); // disable...

             GetClientSize(&ClientWidth, &ClientHeight);
             GetClientSize(&ClientWidth, &ClientHeight);

-            m_Cell -> Layout(ClientWidth); // ...and relayout
+            m_Cell->Layout(ClientWidth); // ...and relayout

         }
     }
 }
         }
     }
 }


@@ -295,22 +415,24 @@ void wxHtmlWindow::ReadCustomization(wxConfigBase *cfg, wxString path)
     int p_fontsizes[7];
     wxString p_fff, p_ffn;
 
     int p_fontsizes[7];
     wxString p_fff, p_ffn;
 

-    if (path != wxEmptyString) {
-        oldpath = cfg -> GetPath();
-        cfg -> SetPath(path);
+    if (path != wxEmptyString)
+    {
+        oldpath = cfg->GetPath();
+        cfg->SetPath(path);

     }
 
     }
 

-    m_Borders = cfg -> Read("wxHtmlWindow/Borders", m_Borders);
-    p_fff = cfg -> Read("wxHtmlWindow/FontFaceFixed", m_Parser -> m_FontFaceFixed);
-    p_ffn = cfg -> Read("wxHtmlWindow/FontFaceNormal", m_Parser -> m_FontFaceNormal);
-    for (int i = 0; i < 7; i++) {
+    m_Borders = cfg->Read(wxT("wxHtmlWindow/Borders"), m_Borders);
+    p_fff = cfg->Read(wxT("wxHtmlWindow/FontFaceFixed"), m_Parser->m_FontFaceFixed);
+    p_ffn = cfg->Read(wxT("wxHtmlWindow/FontFaceNormal"), m_Parser->m_FontFaceNormal);
+    for (int i = 0; i < 7; i++)
+    {

         tmp.Printf(wxT("wxHtmlWindow/FontsSize%i"), i);
         tmp.Printf(wxT("wxHtmlWindow/FontsSize%i"), i);

-        p_fontsizes[i] = cfg -> Read(tmp, m_Parser -> m_FontsSizes[i]);
+        p_fontsizes[i] = cfg->Read(tmp, m_Parser->m_FontsSizes[i]);

     }
     SetFonts(p_ffn, p_fff, p_fontsizes);
 
     if (path != wxEmptyString)
     }
     SetFonts(p_ffn, p_fff, p_fontsizes);
 
     if (path != wxEmptyString)

-        cfg -> SetPath(oldpath);
+        cfg->SetPath(oldpath);

 }
 
 
 }
 
 


@@ -320,21 +442,23 @@ void wxHtmlWindow::WriteCustomization(wxConfigBase *cfg, wxString path)
     wxString oldpath;
     wxString tmp;
 
     wxString oldpath;
     wxString tmp;
 

-    if (path != wxEmptyString) {
-        oldpath = cfg -> GetPath();
-        cfg -> SetPath(path);
+    if (path != wxEmptyString)
+    {
+        oldpath = cfg->GetPath();
+        cfg->SetPath(path);

     }
 
     }
 

-    cfg -> Write("wxHtmlWindow/Borders", (long) m_Borders);
-    cfg -> Write("wxHtmlWindow/FontFaceFixed", m_Parser -> m_FontFaceFixed);
-    cfg -> Write("wxHtmlWindow/FontFaceNormal", m_Parser -> m_FontFaceNormal);
-    for (int i = 0; i < 7; i++) {
+    cfg->Write(wxT("wxHtmlWindow/Borders"), (long) m_Borders);
+    cfg->Write(wxT("wxHtmlWindow/FontFaceFixed"), m_Parser->m_FontFaceFixed);
+    cfg->Write(wxT("wxHtmlWindow/FontFaceNormal"), m_Parser->m_FontFaceNormal);
+    for (int i = 0; i < 7; i++)
+    {

         tmp.Printf(wxT("wxHtmlWindow/FontsSize%i"), i);
         tmp.Printf(wxT("wxHtmlWindow/FontsSize%i"), i);

-        cfg -> Write(tmp, (long) m_Parser -> m_FontsSizes[i]);
+        cfg->Write(tmp, (long) m_Parser->m_FontsSizes[i]);

     }
 
     if (path != wxEmptyString)
     }
 
     if (path != wxEmptyString)

-        cfg -> SetPath(oldpath);
+        cfg->SetPath(oldpath);

 }
 
 
 }
 
 


@@ -345,22 +469,33 @@ bool wxHtmlWindow::HistoryBack()
 
     if (m_HistoryPos < 1) return FALSE;
 
 
     if (m_HistoryPos < 1) return FALSE;
 

+    // store scroll position into history item:
+    int x, y;
+    GetViewStart(&x, &y);
+    (*m_History)[m_HistoryPos].SetPos(y);
+
+    // go to previous position:

     m_HistoryPos--;
 
     m_HistoryPos--;
 

-    l = m_History[m_HistoryPos].GetPage();
-    a = m_History[m_HistoryPos].GetAnchor();
+    l = (*m_History)[m_HistoryPos].GetPage();
+    a = (*m_History)[m_HistoryPos].GetAnchor();

     m_HistoryOn = FALSE;
     m_tmpCanDrawLocks++;
     if (a == wxEmptyString) LoadPage(l);
     m_HistoryOn = FALSE;
     m_tmpCanDrawLocks++;
     if (a == wxEmptyString) LoadPage(l);

-    else LoadPage(l + "#" + a);
+    else LoadPage(l + wxT("#") + a);

     m_HistoryOn = TRUE;
     wxYield();
     m_tmpCanDrawLocks--;
     m_HistoryOn = TRUE;
     wxYield();
     m_tmpCanDrawLocks--;

-    Scroll(0, m_History[m_HistoryPos].GetPos());
+    Scroll(0, (*m_History)[m_HistoryPos].GetPos());

     Refresh();
     return TRUE;
 }
 
     Refresh();
     return TRUE;
 }
 

+bool wxHtmlWindow::HistoryCanBack()
+{
+    if (m_HistoryPos < 1) return FALSE;
+    return TRUE ;
+}

 
 
 bool wxHtmlWindow::HistoryForward()
 
 
 bool wxHtmlWindow::HistoryForward()


@@ -368,45 +503,97 @@ bool wxHtmlWindow::HistoryForward()
     wxString a, l;
 
     if (m_HistoryPos == -1) return FALSE;
     wxString a, l;
 
     if (m_HistoryPos == -1) return FALSE;

-    if (m_HistoryPos >= (int)m_History.GetCount() - 1)return FALSE;
+    if (m_HistoryPos >= (int)m_History->GetCount() - 1)return FALSE;

 
     m_OpenedPage = wxEmptyString; // this will disable adding new entry into history in LoadPage()
 
     m_HistoryPos++;
 
     m_OpenedPage = wxEmptyString; // this will disable adding new entry into history in LoadPage()
 
     m_HistoryPos++;

-    l = m_History[m_HistoryPos].GetPage();
-    a = m_History[m_HistoryPos].GetAnchor();
+    l = (*m_History)[m_HistoryPos].GetPage();
+    a = (*m_History)[m_HistoryPos].GetAnchor();

     m_HistoryOn = FALSE;
     m_tmpCanDrawLocks++;
     if (a == wxEmptyString) LoadPage(l);
     m_HistoryOn = FALSE;
     m_tmpCanDrawLocks++;
     if (a == wxEmptyString) LoadPage(l);

-    else LoadPage(l + "#" + a);
+    else LoadPage(l + wxT("#") + a);

     m_HistoryOn = TRUE;
     wxYield();
     m_tmpCanDrawLocks--;
     m_HistoryOn = TRUE;
     wxYield();
     m_tmpCanDrawLocks--;

-    Scroll(0, m_History[m_HistoryPos].GetPos());
+    Scroll(0, (*m_History)[m_HistoryPos].GetPos());

     Refresh();
     return TRUE;
 }
 
     Refresh();
     return TRUE;
 }
 

+bool wxHtmlWindow::HistoryCanForward()
+{
+    if (m_HistoryPos == -1) return FALSE;
+    if (m_HistoryPos >= (int)m_History->GetCount() - 1)return FALSE;
+    return TRUE ;
+}

 
 
 void wxHtmlWindow::HistoryClear()
 {
 
 
 void wxHtmlWindow::HistoryClear()
 {

-    m_History.Empty();
+    m_History->Empty();

     m_HistoryPos = -1;
 }
 
     m_HistoryPos = -1;
 }
 

+void wxHtmlWindow::AddProcessor(wxHtmlProcessor *processor)
+{
+    if (!m_Processors)
+    {
+        m_Processors = new wxHtmlProcessorList;
+        m_Processors->DeleteContents(TRUE);
+    }
+    wxHtmlProcessorList::Node *node;
+
+    for (node = m_Processors->GetFirst(); node; node = node->GetNext())
+    {
+        if (processor->GetPriority() > node->GetData()->GetPriority())
+        {
+            m_Processors->Insert(node, processor);
+            return;
+        }
+    }
+    m_Processors->Append(processor);
+}
+
+/*static */ void wxHtmlWindow::AddGlobalProcessor(wxHtmlProcessor *processor)
+{
+    if (!m_GlobalProcessors)
+    {
+        m_GlobalProcessors = new wxHtmlProcessorList;
+        m_GlobalProcessors->DeleteContents(TRUE);
+    }
+    wxHtmlProcessorList::Node *node;
+
+    for (node = m_GlobalProcessors->GetFirst(); node; node = node->GetNext())
+    {
+        if (processor->GetPriority() > node->GetData()->GetPriority())
+        {
+            m_GlobalProcessors->Insert(node, processor);
+            return;
+        }
+    }
+    m_GlobalProcessors->Append(processor);
+}
+

 
 
 wxList wxHtmlWindow::m_Filters;
 wxHtmlFilter *wxHtmlWindow::m_DefaultFilter = NULL;
 
 
 wxList wxHtmlWindow::m_Filters;
 wxHtmlFilter *wxHtmlWindow::m_DefaultFilter = NULL;

+wxCursor *wxHtmlWindow::s_cur_hand = NULL;
+wxCursor *wxHtmlWindow::s_cur_arrow = NULL;
+wxHtmlProcessorList *wxHtmlWindow::m_GlobalProcessors = NULL;

 
 void wxHtmlWindow::CleanUpStatics()
 {
 
 void wxHtmlWindow::CleanUpStatics()
 {

-    if (m_DefaultFilter) delete m_DefaultFilter;
+    delete m_DefaultFilter;

     m_DefaultFilter = NULL;
     m_Filters.DeleteContents(TRUE);
     m_Filters.Clear();
     m_DefaultFilter = NULL;
     m_Filters.DeleteContents(TRUE);
     m_Filters.Clear();

-
+    delete m_GlobalProcessors;
+    m_GlobalProcessors = NULL;
+    delete s_cur_hand;
+    delete s_cur_arrow;

 }
 
 
 }
 
 


@@ -433,17 +620,23 @@ void wxHtmlWindow::OnDraw(wxDC& dc)
     int v_y, v_h;
 
     if (m_tmpCanDrawLocks > 0) return;
     int v_y, v_h;
 
     if (m_tmpCanDrawLocks > 0) return;

+

     dc.SetMapMode(wxMM_TEXT);
     dc.SetMapMode(wxMM_TEXT);

+#if 0
+/* VS - I don't think this is neccessary any longer
+        MSC_VER 1200 means MSVC 6.0 and it works fine */

 #if defined(_MSC_VER) && (_MSC_VER == 1200)
     ::SetMapMode((HDC)dc.GetHDC(), MM_TEXT);
 #if defined(_MSC_VER) && (_MSC_VER == 1200)
     ::SetMapMode((HDC)dc.GetHDC(), MM_TEXT);

+#endif

 #endif
     dc.SetBackgroundMode(wxTRANSPARENT);
 #endif
     dc.SetBackgroundMode(wxTRANSPARENT);

-    ViewStart(&x, &y);
+    GetViewStart(&x, &y);

 
 

-    while (upd) {
+    while (upd)
+    {

         v_y = upd.GetY();
         v_h = upd.GetH();
         v_y = upd.GetY();
         v_h = upd.GetH();

-        if (m_Cell) m_Cell -> Draw(dc, 0, 0, y * wxHTML_SCROLL_STEP + v_y, y * wxHTML_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++;
     }
 }
         upd++;
     }
 }


@@ -455,87 +648,61 @@ void wxHtmlWindow::OnSize(wxSizeEvent& event)
 {
     wxScrolledWindow::OnSize(event);
     CreateLayout();
 {
     wxScrolledWindow::OnSize(event);
     CreateLayout();

+    Refresh();

 }
 
 
 }
 
 

-
-void wxHtmlWindow::OnKeyDown(wxKeyEvent& event)
-{
-    int dummy;
-    int sty, szy, cliy;
-
-    ViewStart(&dummy, &sty);
-    GetClientSize(&dummy, &cliy); cliy /= wxHTML_SCROLL_STEP;
-    GetVirtualSize(&dummy, &szy); szy /= wxHTML_SCROLL_STEP;
-
-    switch (event.KeyCode()) {
-        case WXK_PAGEUP :
-        case WXK_PRIOR :
-                Scroll(-1, sty - (2 * cliy / 3));
-                break;
-        case WXK_PAGEDOWN :
-        case WXK_NEXT :
-                Scroll(-1, sty + (2 * cliy / 3));
-                break;
-        case WXK_HOME :
-                Scroll(-1, 0);
-                break;
-        case WXK_END :
-                Scroll(-1, szy - cliy);
-                break;
-        case WXK_UP :
-                Scroll(-1, sty - 1);
-                break;
-        case WXK_DOWN :
-                Scroll(-1, sty + 1);
-                break;
-    }
-}
-
-
-

 void wxHtmlWindow::OnMouseEvent(wxMouseEvent& event)
 {
     m_tmpMouseMoved = TRUE;
 
 void wxHtmlWindow::OnMouseEvent(wxMouseEvent& event)
 {
     m_tmpMouseMoved = TRUE;
 

-    if (event.ButtonDown()) {
+    if (event.ButtonDown())
+    {

         int sx, sy;
         wxPoint pos;
         wxString lnk;
 
         int sx, sy;
         wxPoint pos;
         wxString lnk;
 

-        ViewStart(&sx, &sy); sx *= wxHTML_SCROLL_STEP; sy *= wxHTML_SCROLL_STEP;
+        GetViewStart(&sx, &sy); sx *= wxHTML_SCROLL_STEP; sy *= wxHTML_SCROLL_STEP;

         pos = event.GetPosition();
 
         if (m_Cell)
         pos = event.GetPosition();
 
         if (m_Cell)

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

     }
 }
 
 
 
     }
 }
 
 
 

-void wxHtmlWindow::OnIdle(wxIdleEvent& event)
+void wxHtmlWindow::OnIdle(wxIdleEvent& WXUNUSED(event))

 {
 {

-    static wxCursor cur_hand(wxCURSOR_HAND), cur_arrow(wxCURSOR_ARROW);
+    if (s_cur_hand == NULL)
+    {
+        s_cur_hand = new wxCursor(wxCURSOR_HAND);
+        s_cur_arrow = new wxCursor(wxCURSOR_ARROW);
+    }

 
 

-    if (m_tmpMouseMoved && (m_Cell != NULL)) {
+    if (m_tmpMouseMoved && (m_Cell != NULL))
+    {

         int sx, sy;
         int x, y;
         wxHtmlLinkInfo *lnk;
 
         int sx, sy;
         int x, y;
         wxHtmlLinkInfo *lnk;
 

-        ViewStart(&sx, &sy); sx *= wxHTML_SCROLL_STEP; sy *= wxHTML_SCROLL_STEP;
+        GetViewStart(&sx, &sy); sx *= wxHTML_SCROLL_STEP; sy *= wxHTML_SCROLL_STEP;

         wxGetMousePosition(&x, &y);
         ScreenToClient(&x, &y);
         wxGetMousePosition(&x, &y);
         ScreenToClient(&x, &y);

-        lnk = m_Cell -> GetLink(sx + x, sy + y);
-
-        if (lnk != m_tmpLastLink) {
-            if (lnk == NULL) {
-                SetCursor(cur_arrow);
-                if (m_RelatedStatusBar != -1) m_RelatedFrame -> SetStatusText(wxEmptyString, m_RelatedStatusBar);
+        lnk = m_Cell->GetLink(sx + x, sy + y);
+
+        if (lnk != m_tmpLastLink)
+        {
+            if (lnk == NULL)
+            {
+                SetCursor(*s_cur_arrow);
+                if (m_RelatedStatusBar != -1) m_RelatedFrame->SetStatusText(wxEmptyString, m_RelatedStatusBar);

             }
             }

-            else {
-                SetCursor(cur_hand);
-                if (m_RelatedStatusBar != -1) 
-                    m_RelatedFrame -> SetStatusText(lnk -> GetHref(), m_RelatedStatusBar);
+            else
+            {
+                SetCursor(*s_cur_hand);
+                if (m_RelatedStatusBar != -1)
+                    m_RelatedFrame->SetStatusText(lnk->GetHref(), m_RelatedStatusBar);

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


@@ -544,7 +711,7 @@ void wxHtmlWindow::OnIdle(wxIdleEvent& event)
 }
 
 
 }
 
 

-
+IMPLEMENT_ABSTRACT_CLASS(wxHtmlProcessor,wxObject)

 
 IMPLEMENT_DYNAMIC_CLASS(wxHtmlWindow,wxScrolledWindow)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxHtmlWindow,wxScrolledWindow)
 


@@ -553,7 +720,6 @@ BEGIN_EVENT_TABLE(wxHtmlWindow, wxScrolledWindow)
     EVT_LEFT_DOWN(wxHtmlWindow::OnMouseEvent)
     EVT_MOTION(wxHtmlWindow::OnMouseEvent)
     EVT_IDLE(wxHtmlWindow::OnIdle)
     EVT_LEFT_DOWN(wxHtmlWindow::OnMouseEvent)
     EVT_MOTION(wxHtmlWindow::OnMouseEvent)
     EVT_IDLE(wxHtmlWindow::OnIdle)

-    EVT_KEY_DOWN(wxHtmlWindow::OnKeyDown)

 END_EVENT_TABLE()
 
 
 END_EVENT_TABLE()