DLL compilation fixes

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

diff --git a/src/html/htmlwin.cpp b/src/html/htmlwin.cpp
index 5f14c0e50870e932e9dc3b582819919b23ff1764..6120a8b7bac54d8eaa509f8184e69f6e2e327ec5 100644 (file)
--- a/src/html/htmlwin.cpp
+++ b/src/html/htmlwin.cpp
@@ -9,7 +9,8 @@
 
 
 #ifdef __GNUG__
 
 
 #ifdef __GNUG__

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

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


@@ -17,60 +18,196 @@
 #include "wx/defs.h"
 #if wxUSE_HTML && wxUSE_STREAMS
 
 #include "wx/defs.h"
 #if wxUSE_HTML && wxUSE_STREAMS
 

-#ifdef __BORDLANDC__
+#ifdef __BORLANDC__

 #pragma hdrstop
 #endif
 
 #ifndef WXPRECOMP
 #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"
 #endif
 
 #include "wx/html/htmlwin.h"

-#include "wx/html/forcelnk.h"
-#include "wx/log.h"
+#include "wx/html/htmlproc.h"
+#include "wx/list.h"
+#include "wx/clipbrd.h"
+#include "wx/dataobj.h"
+#include "wx/timer.h"
+#include "wx/dcmemory.h"
+
+#include "wx/arrimpl.cpp"
+#include "wx/listimpl.cpp"
+
+
+
+#if wxUSE_CLIPBOARD
+// ----------------------------------------------------------------------------
+// wxHtmlWinAutoScrollTimer: the timer used to generate a stream of scroll
+// events when a captured mouse is held outside the window
+// ----------------------------------------------------------------------------
+
+class wxHtmlWinAutoScrollTimer : public wxTimer
+{
+public:
+    wxHtmlWinAutoScrollTimer(wxScrolledWindow *win,
+                      wxEventType eventTypeToSend,
+                      int pos, int orient)
+    {
+        m_win = win;
+        m_eventType = eventTypeToSend;
+        m_pos = pos;
+        m_orient = orient;
+    }
+
+    virtual void Notify();
+
+private:
+    wxScrolledWindow *m_win;
+    wxEventType m_eventType;
+    int m_pos,
+        m_orient;
+
+    DECLARE_NO_COPY_CLASS(wxHtmlWinAutoScrollTimer)
+};
+
+void wxHtmlWinAutoScrollTimer::Notify()
+{
+    // only do all this as long as the window is capturing the mouse
+    if ( wxWindow::GetCapture() != m_win )
+    {
+        Stop();
+    }
+    else // we still capture the mouse, continue generating events
+    {
+        // first scroll the window if we are allowed to do it
+        wxScrollWinEvent event1(m_eventType, m_pos, m_orient);
+        event1.SetEventObject(m_win);
+        if ( m_win->GetEventHandler()->ProcessEvent(event1) )
+        {
+            // and then send a pseudo mouse-move event to refresh the selection
+            wxMouseEvent event2(wxEVT_MOTION);
+            wxGetMousePosition(&event2.m_x, &event2.m_y);
+
+            // the mouse event coordinates should be client, not screen as
+            // returned by wxGetMousePosition
+            wxWindow *parentTop = m_win;
+            while ( parentTop->GetParent() )
+                parentTop = parentTop->GetParent();
+            wxPoint ptOrig = parentTop->GetPosition();
+            event2.m_x -= ptOrig.x;
+            event2.m_y -= ptOrig.y;
+
+            event2.SetEventObject(m_win);
+
+            // FIXME: we don't fill in the other members - ok?
+            m_win->GetEventHandler()->ProcessEvent(event2);
+        }
+        else // can't scroll further, stop
+        {
+            Stop();
+        }
+    }
+}
+
+#endif // wxUSE_CLIPBOARD
+

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

-// wxHtmlWindow
+// wxHtmlHistoryItem

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

+// item of history list
+class WXDLLIMPEXP_HTML wxHtmlHistoryItem
+{
+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;
+};

 
 
 
 

-#include "wx/arrimpl.cpp"
-WX_DEFINE_OBJARRAY(HtmlHistoryArray)
+//-----------------------------------------------------------------------------
+// our private arrays:
+//-----------------------------------------------------------------------------
+
+WX_DECLARE_OBJARRAY(wxHtmlHistoryItem, wxHtmlHistoryArray);
+WX_DEFINE_OBJARRAY(wxHtmlHistoryArray);
+
+WX_DECLARE_LIST(wxHtmlProcessor, wxHtmlProcessorList);
+WX_DEFINE_LIST(wxHtmlProcessorList);
+
+//-----------------------------------------------------------------------------
+// wxHtmlWindow
+//-----------------------------------------------------------------------------

 
 
 
 

-wxHtmlWindow::wxHtmlWindow(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size,
-                long style, const wxString& name) : wxScrolledWindow(parent, id, pos, size, style | wxVSCROLL | wxHSCROLL, name)
+void wxHtmlWindow::Init()

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

+    m_tmpLastCell = NULL;

     m_tmpCanDrawLocks = 0;
     m_FS = new wxFileSystem();
     m_RelatedStatusBar = -1;
     m_RelatedFrame = NULL;
     m_tmpCanDrawLocks = 0;
     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_Parser->SetFS(m_FS);
     m_OpenedPage = m_OpenedAnchor = m_OpenedPageTitle = wxEmptyString;
     m_Cell = NULL;
     m_Parser = new wxHtmlWinParser(this);
     m_Parser->SetFS(m_FS);

-    SetBorders(10);

     m_HistoryPos = -1;
     m_HistoryOn = TRUE;
     m_HistoryPos = -1;
     m_HistoryOn = TRUE;

+    m_History = new wxHtmlHistoryArray;
+    m_Processors = NULL;
+    m_Style = 0;
+    SetBorders(10);
+    m_selection = NULL;
+    m_makingSelection = false;
+#if wxUSE_CLIPBOARD
+    m_timerAutoScroll = NULL;
+    m_lastDoubleClick = 0;
+#endif // wxUSE_CLIPBOARD
+    m_backBuffer = NULL;
+}
+
+bool wxHtmlWindow::Create(wxWindow *parent, wxWindowID id,
+                          const wxPoint& pos, const wxSize& size,
+                          long style, const wxString& name)
+{
+    if (!wxScrolledWindow::Create(parent, id, pos, size,
+                                  style | wxVSCROLL | wxHSCROLL, name))
+        return FALSE;
+

     m_Style = style;
     SetPage(wxT("<html><body></body></html>"));
     m_Style = style;
     SetPage(wxT("<html><body></body></html>"));

+    return TRUE;

 }
 
 
 }
 
 

-

 wxHtmlWindow::~wxHtmlWindow()
 {
 wxHtmlWindow::~wxHtmlWindow()
 {

+#if wxUSE_CLIPBOARD
+    StopAutoScrolling();
+#endif // wxUSE_CLIPBOARD

     HistoryClear();
 
     if (m_Cell) delete m_Cell;
 
     delete m_Parser;
     delete m_FS;
     HistoryClear();
 
     if (m_Cell) delete m_Cell;
 
     delete m_Parser;
     delete m_FS;

+    delete m_History;
+    delete m_Processors;
+    delete m_backBuffer;

 }
 
 
 }
 
 


@@ -95,7 +232,8 @@ void wxHtmlWindow::SetFonts(wxString normal_face, wxString fixed_face, const int
     wxString op = m_OpenedPage;
 
     m_Parser->SetFonts(normal_face, fixed_face, sizes);
     wxString op = m_OpenedPage;
 
     m_Parser->SetFonts(normal_face, fixed_face, sizes);

-    SetPage(wxT("<html><body></body></html>")); // fonts changed => contents invalid
+    // 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,8 +241,45 @@ 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);
+
+    wxDELETE(m_selection);
+
+    // 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();
+            }
+        }
+    }

 
 

+    // ...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;
     dc->SetMapMode(wxMM_TEXT);
     SetBackgroundColour(wxColour(0xFF, 0xFF, 0xFF));
     m_OpenedPage = m_OpenedAnchor = m_OpenedPageTitle = wxEmptyString;


@@ -114,35 +289,41 @@ bool wxHtmlWindow::SetPage(const wxString& source)
         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;
     m_Cell->SetIndent(m_Borders, wxHTML_INDENT_ALL, wxHTML_UNITS_PIXELS);
     m_Cell->SetAlignHor(wxHTML_ALIGN_CENTER);
     CreateLayout();
     delete dc;
     m_Cell->SetIndent(m_Borders, wxHTML_INDENT_ALL, wxHTML_UNITS_PIXELS);
     m_Cell->SetAlignHor(wxHTML_ALIGN_CENTER);
     CreateLayout();

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

     return TRUE;
 }
 
     return TRUE;
 }
 

+bool wxHtmlWindow::AppendToPage(const wxString& source)
+{
+    return SetPage(*(GetParser()->GetSource()) + source);
+}

 
 bool wxHtmlWindow::LoadPage(const wxString& location)
 {
 
 bool wxHtmlWindow::LoadPage(const wxString& location)
 {

+    wxBusyCursor busyCursor;
+

     wxFSFile *f;
     bool rt_val;
     bool needs_refresh = FALSE;
 
     wxFSFile *f;
     bool rt_val;
     bool needs_refresh = FALSE;
 

-    SetCursor(*wxHOURGLASS_CURSOR);
-    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] == wxT('#')) // 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);


@@ -157,7 +338,7 @@ bool wxHtmlWindow::LoadPage(const wxString& location)
     }
     else if (location.Find(wxT('#')) != wxNOT_FOUND &&
              (m_FS->GetPath() + location.BeforeFirst(wxT('#'))) == m_OpenedPage)
     }
     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);
         wxString anch = location.AfterFirst(wxT('#'));
         m_tmpCanDrawLocks--;
         rt_val = ScrollToAnchor(anch);


@@ -169,31 +350,35 @@ bool wxHtmlWindow::LoadPage(const wxString& location)
         needs_refresh = TRUE;
         // load&display it:
         if (m_RelatedStatusBar != -1)
         needs_refresh = TRUE;
         // load&display it:
         if (m_RelatedStatusBar != -1)

-           {
+        {

             m_RelatedFrame->SetStatusText(_("Connecting..."), m_RelatedStatusBar);
             Refresh(FALSE);
         }
 
             m_RelatedFrame->SetStatusText(_("Connecting..."), m_RelatedStatusBar);
             Refresh(FALSE);
         }
 

-        f = m_FS->OpenFile(location);
+        f = m_Parser->OpenURL(wxHTML_URL_PAGE, location);

 
 

+        // try to interpret 'location' as filename instead of URL:

         if (f == NULL)
         if (f == NULL)

-           {
-            wxString err;
+        {
+            wxFileName fn(location);
+            wxString location2 = wxFileSystem::FileNameToURL(fn);
+            f = m_Parser->OpenURL(wxHTML_URL_PAGE, location2);
+        }

 
 

+        if (f == NULL)
+        {

             wxLogError(_("Unable to open requested HTML document: %s"), location.c_str());
             m_tmpCanDrawLocks--;
             wxLogError(_("Unable to open requested HTML document: %s"), location.c_str());
             m_tmpCanDrawLocks--;

-
-            SetCursor(*wxSTANDARD_CURSOR);

             return FALSE;
         }
 
         else
             return FALSE;
         }
 
         else

-       {
+        {

             wxNode *node;
             wxString src = wxEmptyString;
 
             if (m_RelatedStatusBar != -1)
             wxNode *node;
             wxString src = wxEmptyString;
 
             if (m_RelatedStatusBar != -1)

-               {
+            {

                 wxString msg = _("Loading : ") + location;
                 m_RelatedFrame->SetStatusText(msg, m_RelatedStatusBar);
                 Refresh(FALSE);
                 wxString msg = _("Loading : ") + location;
                 m_RelatedFrame->SetStatusText(msg, m_RelatedStatusBar);
                 Refresh(FALSE);


@@ -201,17 +386,17 @@ bool wxHtmlWindow::LoadPage(const wxString& location)
 
             node = m_Filters.GetFirst();
             while (node)
 
             node = m_Filters.GetFirst();
             while (node)

-               {
+            {

                 wxHtmlFilter *h = (wxHtmlFilter*) node->GetData();
                 if (h->CanRead(*f))
                 wxHtmlFilter *h = (wxHtmlFilter*) node->GetData();
                 if (h->CanRead(*f))

-                       {
+                {

                     src = h->ReadFile(*f);
                     break;
                 }
                 node = node->GetNext();
             }
             if (src == wxEmptyString)
                     src = h->ReadFile(*f);
                     break;
                 }
                 node = node->GetNext();
             }
             if (src == wxEmptyString)

-               {
+            {

                 if (m_DefaultFilter == NULL) m_DefaultFilter = GetDefaultFilter();
                 src = m_DefaultFilter->ReadFile(*f);
             }
                 if (m_DefaultFilter == NULL) m_DefaultFilter = GetDefaultFilter();
                 src = m_DefaultFilter->ReadFile(*f);
             }


@@ -220,8 +405,7 @@ bool wxHtmlWindow::LoadPage(const wxString& location)
             rt_val = SetPage(src);
             m_OpenedPage = f->GetLocation();
             if (f->GetAnchor() != wxEmptyString)
             rt_val = SetPage(src);
             m_OpenedPage = f->GetLocation();
             if (f->GetAnchor() != wxEmptyString)

-               {
-                wxYield();
+            {

                 ScrollToAnchor(f->GetAnchor());
             }
 
                 ScrollToAnchor(f->GetAnchor());
             }
 


@@ -233,21 +417,24 @@ bool wxHtmlWindow::LoadPage(const wxString& location)
 
     if (m_HistoryOn) // add this page to history there:
     {
 
     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));
+        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));
     }
 
     if (m_OpenedPageTitle == wxEmptyString)
         OnSetTitle(wxFileNameFromPath(m_OpenedPage));

-    SetCursor(*wxSTANDARD_CURSOR);

 
     if (needs_refresh)
     {
 
     if (needs_refresh)
     {

-        wxYield();

         m_tmpCanDrawLocks--;
         Refresh();
     }
         m_tmpCanDrawLocks--;
         Refresh();
     }


@@ -258,6 +445,12 @@ bool wxHtmlWindow::LoadPage(const wxString& location)
 }
 
 
 }
 
 

+bool wxHtmlWindow::LoadFile(const wxFileName& filename)
+{
+    wxString url = wxFileSystem::FileNameToURL(filename);
+    return LoadPage(url);
+}
+

 
 bool wxHtmlWindow::ScrollToAnchor(const wxString& anchor)
 {
 
 bool wxHtmlWindow::ScrollToAnchor(const wxString& anchor)
 {


@@ -311,7 +504,7 @@ void wxHtmlWindow::CreateLayout()
         GetClientSize(&ClientWidth, &ClientHeight);
         m_Cell->Layout(ClientWidth);
         if (ClientHeight < m_Cell->GetHeight() + GetCharHeight())
         GetClientSize(&ClientWidth, &ClientHeight);
         m_Cell->Layout(ClientWidth);
         if (ClientHeight < m_Cell->GetHeight() + GetCharHeight())

-           {
+        {

             SetScrollbars(
                   wxHTML_SCROLL_STEP, wxHTML_SCROLL_STEP,
                   m_Cell->GetWidth() / wxHTML_SCROLL_STEP,
             SetScrollbars(
                   wxHTML_SCROLL_STEP, wxHTML_SCROLL_STEP,
                   m_Cell->GetWidth() / wxHTML_SCROLL_STEP,


@@ -319,7 +512,7 @@ void wxHtmlWindow::CreateLayout()
                   /*cheat: top-level frag is always container*/);
         }
         else /* we fit into window, no need for scrollbars */
                   /*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...
             GetClientSize(&ClientWidth, &ClientHeight);
             m_Cell->Layout(ClientWidth); // ...and relayout
             SetScrollbars(wxHTML_SCROLL_STEP, 1, m_Cell->GetWidth() / wxHTML_SCROLL_STEP, 0); // disable...
             GetClientSize(&ClientWidth, &ClientHeight);
             m_Cell->Layout(ClientWidth); // ...and relayout


@@ -342,9 +535,9 @@ void wxHtmlWindow::ReadCustomization(wxConfigBase *cfg, wxString path)
         cfg->SetPath(path);
     }
 
         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);
+    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);
     for (int i = 0; i < 7; i++)
     {
         tmp.Printf(wxT("wxHtmlWindow/FontsSize%i"), i);


@@ -369,9 +562,9 @@ void wxHtmlWindow::WriteCustomization(wxConfigBase *cfg, wxString path)
         cfg->SetPath(path);
     }
 
         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);
+    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);
     for (int i = 0; i < 7; i++)
     {
         tmp.Printf(wxT("wxHtmlWindow/FontsSize%i"), i);


@@ -392,22 +585,21 @@ bool wxHtmlWindow::HistoryBack()
 
     // store scroll position into history item:
     int x, y;
 
     // store scroll position into history item:
     int x, y;

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

 
     // go to previous position:
     m_HistoryPos--;
 
 
     // go to previous position:
     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);
     else LoadPage(l + wxT("#") + a);
     m_HistoryOn = TRUE;
     m_HistoryOn = FALSE;
     m_tmpCanDrawLocks++;
     if (a == wxEmptyString) LoadPage(l);
     else LoadPage(l + wxT("#") + a);
     m_HistoryOn = TRUE;

-    wxYield();

     m_tmpCanDrawLocks--;
     m_tmpCanDrawLocks--;

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

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


@@ -424,21 +616,20 @@ 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);
     else LoadPage(l + wxT("#") + a);
     m_HistoryOn = TRUE;
     m_HistoryOn = FALSE;
     m_tmpCanDrawLocks++;
     if (a == wxEmptyString) LoadPage(l);
     else LoadPage(l + wxT("#") + a);
     m_HistoryOn = TRUE;

-    wxYield();

     m_tmpCanDrawLocks--;
     m_tmpCanDrawLocks--;

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

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


@@ -446,32 +637,69 @@ bool wxHtmlWindow::HistoryForward()
 bool wxHtmlWindow::HistoryCanForward()
 {
     if (m_HistoryPos == -1) return FALSE;
 bool wxHtmlWindow::HistoryCanForward()
 {
     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;

     return TRUE ;
 }
 
 
 void wxHtmlWindow::HistoryClear()
 {
     return TRUE ;
 }
 
 
 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;
-    m_DefaultFilter = NULL;
+    wxDELETE(m_DefaultFilter);

     m_Filters.DeleteContents(TRUE);
     m_Filters.Clear();
     m_Filters.DeleteContents(TRUE);
     m_Filters.Clear();

-    if (s_cur_hand) delete s_cur_hand;
-    if (s_cur_arrow) delete s_cur_arrow;
+    wxDELETE(m_GlobalProcessors);

 }
 
 
 }
 
 


@@ -482,41 +710,136 @@ void wxHtmlWindow::AddFilter(wxHtmlFilter *filter)
 }
 
 
 }
 
 

+bool wxHtmlWindow::IsSelectionEnabled() const
+{
+#if wxUSE_CLIPBOARD
+    return !(m_Style & wxHW_NO_SELECTION);
+#else
+    return false;
+#endif
+}
+
+
+#if wxUSE_CLIPBOARD
+wxString wxHtmlWindow::SelectionToText()
+{
+    if ( !m_selection )
+        return wxEmptyString;
+
+    wxClientDC dc(this);
+
+    const wxHtmlCell *end = m_selection->GetToCell();
+    wxString text;
+    wxHtmlTerminalCellsInterator i(m_selection->GetFromCell(), end);
+    if ( i )
+    {
+        text << i->ConvertToText(m_selection);
+        ++i;
+    }
+    const wxHtmlCell *prev = *i;
+    while ( i )
+    {
+        if ( prev->GetParent() != i->GetParent() )
+            text << _T('\n');
+        text << i->ConvertToText(*i == end ? m_selection : NULL);
+        prev = *i;
+        ++i;
+    }
+    return text;
+}
+
+#endif // wxUSE_CLIPBOARD
+
+void wxHtmlWindow::CopySelection(ClipboardType t)
+{
+#if wxUSE_CLIPBOARD
+    if ( m_selection )
+    {
+#ifdef __UNIX__
+        wxTheClipboard->UsePrimarySelection(t == Primary);
+#else // !__UNIX__
+        // Primary selection exists only under X11, so don't do anything under
+        // the other platforms when we try to access it
+        //
+        // TODO: this should be abstracted at wxClipboard level!
+        if ( t == Primary )
+            return;
+#endif // __UNIX__/!__UNIX__
+
+        if ( wxTheClipboard->Open() )
+        {
+            const wxString txt(SelectionToText());
+            wxTheClipboard->SetData(new wxTextDataObject(txt));
+            wxTheClipboard->Close();
+            wxLogTrace(_T("wxhtmlselection"),
+                       _("Copied to clipboard:\"%s\""), txt.c_str());
+        }
+    }
+#endif // wxUSE_CLIPBOARD
+}

 
 
 void wxHtmlWindow::OnLinkClicked(const wxHtmlLinkInfo& link)
 {
 
 
 void wxHtmlWindow::OnLinkClicked(const wxHtmlLinkInfo& link)
 {

-    LoadPage(link.GetHref());
+    const wxMouseEvent *e = link.GetEvent();
+    if (e == NULL || e->LeftUp())
+        LoadPage(link.GetHref());

 }
 
 }
 

+void wxHtmlWindow::OnCellClicked(wxHtmlCell *cell,
+                                 wxCoord x, wxCoord y,
+                                 const wxMouseEvent& event)
+{
+    wxCHECK_RET( cell, _T("can't be called with NULL cell") );

 
 

+    cell->OnMouseClick(this, x, y, event);
+}

 
 

-void wxHtmlWindow::OnDraw(wxDC& dc)
+void wxHtmlWindow::OnCellMouseHover(wxHtmlCell * WXUNUSED(cell),
+                                    wxCoord WXUNUSED(x), wxCoord WXUNUSED(y))

 {
 {

-    int x, y;
-    wxRegionIterator upd(GetUpdateRegion()); // get the update rect list
-    int v_y, v_h;
+    // do nothing here
+}

 
 

-    if (m_tmpCanDrawLocks > 0) return;
+void wxHtmlWindow::OnEraseBackground(wxEraseEvent& event)
+{
+}

 
 

-    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);
-#endif
-#endif
-    dc.SetBackgroundMode(wxTRANSPARENT);
-    ViewStart(&x, &y);
+void wxHtmlWindow::OnPaint(wxPaintEvent& WXUNUSED(event))
+{
+    wxPaintDC dc(this);

 
 

-    while (upd)
-    {
-        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);
-        upd++;
-    }
+    if (m_tmpCanDrawLocks > 0 || m_Cell == NULL) return;
+
+    int x, y;
+    GetViewStart(&x, &y);
+    wxRect rect = GetUpdateRegion().GetBox();
+    wxSize sz = GetSize();
+
+    wxMemoryDC dcm;
+    if ( !m_backBuffer )
+        m_backBuffer = new wxBitmap(sz.x, sz.y);
+    dcm.SelectObject(*m_backBuffer);
+    dcm.SetBackground(wxBrush(GetBackgroundColour(), wxSOLID));
+    dcm.Clear();
+    PrepareDC(dcm);
+    dcm.SetMapMode(wxMM_TEXT);
+    dcm.SetBackgroundMode(wxTRANSPARENT);
+
+    wxHtmlRenderingInfo rinfo;
+    wxDefaultHtmlRenderingStyle rstyle;
+    rinfo.SetSelection(m_selection);
+    rinfo.SetStyle(&rstyle);
+    m_Cell->Draw(dcm, 0, 0,
+                 y * wxHTML_SCROLL_STEP + rect.GetTop(),
+                 y * wxHTML_SCROLL_STEP + rect.GetBottom(),
+                 rinfo);
+ 
+    dcm.SetDeviceOrigin(0,0);
+    dc.Blit(0, rect.GetTop(),
+            sz.x, rect.GetBottom() - rect.GetTop() + 1,
+            &dcm,
+            0, rect.GetTop());

 }
 
 
 }
 
 


@@ -524,80 +847,426 @@ void wxHtmlWindow::OnDraw(wxDC& dc)
 
 void wxHtmlWindow::OnSize(wxSizeEvent& event)
 {
 
 void wxHtmlWindow::OnSize(wxSizeEvent& event)
 {

+    wxDELETE(m_backBuffer);
+

     wxScrolledWindow::OnSize(event);
     CreateLayout();
     wxScrolledWindow::OnSize(event);
     CreateLayout();

+
+    // Recompute selection if necessary:
+    if ( m_selection )
+    {
+        m_selection->Set(m_selection->GetFromCell(),
+                         m_selection->GetToCell());
+        m_selection->ClearPrivPos();
+    }
+

     Refresh();
 }
 
 
     Refresh();
 }
 
 

-void wxHtmlWindow::OnMouseEvent(wxMouseEvent& event)
+void wxHtmlWindow::OnMouseMove(wxMouseEvent& event)

 {
 {

-    m_tmpMouseMoved = TRUE;
+    m_tmpMouseMoved = true;
+}

 
 

-    if (event.ButtonDown())
+void wxHtmlWindow::OnMouseDown(wxMouseEvent& event)
+{
+#if wxUSE_CLIPBOARD
+    if ( event.LeftDown() && IsSelectionEnabled() )

     {
     {

-        int sx, sy;
-        wxPoint pos;
-        wxString lnk;
+        const long TRIPLECLICK_LEN = 200; // 0.2 sec after doubleclick
+        if ( wxGetLocalTimeMillis() - m_lastDoubleClick <= TRIPLECLICK_LEN )
+        {
+            SelectLine(CalcUnscrolledPosition(event.GetPosition()));

 
 

-        ViewStart(&sx, &sy); sx *= wxHTML_SCROLL_STEP; sy *= wxHTML_SCROLL_STEP;
-        pos = event.GetPosition();
+            CopySelection();
+        }
+        else
+        {
+            m_makingSelection = true;

 
 

-        if (m_Cell)
-            m_Cell->OnMouseClick(this, sx + pos.x, sy + pos.y, event);
+            if ( m_selection )
+            {
+                wxDELETE(m_selection);
+                Refresh();
+            }
+            m_tmpSelFromPos = CalcUnscrolledPosition(event.GetPosition());
+            m_tmpSelFromCell = NULL;
+
+            CaptureMouse();
+        }

     }
     }

+#endif // wxUSE_CLIPBOARD

 }
 
 }
 

+void wxHtmlWindow::OnMouseUp(wxMouseEvent& event)
+{
+#if wxUSE_CLIPBOARD
+    if ( m_makingSelection )
+    {
+        ReleaseMouse();
+        m_makingSelection = false;
+
+        // did the user move the mouse far enough from starting point?
+        if ( m_selection )
+        {
+            CopySelection(Primary);

 
 

+            // we don't want mouse up event that ended selecting to be
+            // handled as mouse click and e.g. follow hyperlink:
+            return;
+        }
+    }
+#endif // wxUSE_CLIPBOARD

 
 

-void wxHtmlWindow::OnIdle(wxIdleEvent& WXUNUSED(event))
-{
-    if (s_cur_hand == NULL)
+    SetFocus();
+    if ( m_Cell )

     {
     {

-        s_cur_hand = new wxCursor(wxCURSOR_HAND);
-        s_cur_arrow = new wxCursor(wxCURSOR_ARROW);
+        wxPoint pos = CalcUnscrolledPosition(event.GetPosition());
+        wxHtmlCell *cell = m_Cell->FindCellByPos(pos.x, pos.y);
+
+        // check is needed because FindCellByPos returns terminal cell and
+        // containers may have empty borders -- in this case NULL will be
+        // returned
+        if ( cell )
+            OnCellClicked(cell, pos.x, pos.y, event);

     }
     }

+}

 
 

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

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

-        int sx, sy;
-        int x, y;
-        wxHtmlLinkInfo *lnk;
-
-        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 != m_tmpLastLink)
-           {
-            if (lnk == NULL)
-               {
-                SetCursor(*s_cur_arrow);
-                if (m_RelatedStatusBar != -1) m_RelatedFrame->SetStatusText(wxEmptyString, m_RelatedStatusBar);
+        int xc, yc, x, y;
+        wxGetMousePosition(&xc, &yc);
+        ScreenToClient(&xc, &yc);
+        CalcUnscrolledPosition(xc, yc, &x, &y);
+
+        wxHtmlCell *cell = m_Cell->FindCellByPos(x, y);
+
+        // handle selection update:
+        if ( m_makingSelection )
+        {
+            bool goingDown = m_tmpSelFromPos.y < y ||
+                             m_tmpSelFromPos.y == y && m_tmpSelFromPos.x < x;
+
+            if ( !m_tmpSelFromCell )
+                m_tmpSelFromCell = m_Cell->FindCellByPos(
+                                         m_tmpSelFromPos.x,m_tmpSelFromPos.y);
+            if ( /*still*/ !m_tmpSelFromCell )
+            {
+                if (goingDown)
+                {
+                    m_tmpSelFromCell = m_Cell->FindCellByPos(
+                                         m_tmpSelFromPos.x,m_tmpSelFromPos.y,
+                                         wxHTML_FIND_NEAREST_AFTER);
+                    if (!m_tmpSelFromCell)
+                        m_tmpSelFromCell = m_Cell->GetFirstTerminal();
+                }
+                else
+                {
+                    m_tmpSelFromCell = m_Cell->FindCellByPos(
+                                         m_tmpSelFromPos.x,m_tmpSelFromPos.y,
+                                         wxHTML_FIND_NEAREST_BEFORE);
+                    if (!m_tmpSelFromCell)
+                        m_tmpSelFromCell = m_Cell->GetLastTerminal();
+                }
+            }
+
+            wxHtmlCell *selcell = cell;
+            if (!selcell)
+            {
+                if (goingDown)
+                {
+                    selcell = m_Cell->FindCellByPos(x, y,
+                                                 wxHTML_FIND_NEAREST_AFTER);
+                    if (!selcell)
+                        selcell = m_Cell->GetLastTerminal();
+                }
+                else
+                {
+                    selcell = m_Cell->FindCellByPos(x, y,
+                                                 wxHTML_FIND_NEAREST_BEFORE);
+                    if (!selcell)
+                        selcell = m_Cell->GetFirstTerminal();
+                }
+            }
+
+            // NB: it may *rarely* happen that the code above didn't find one
+            //     of the cells, e.g. if wxHtmlWindow doesn't contain any
+            //     visible cells.
+            if ( selcell && m_tmpSelFromCell )
+            {
+                if ( !m_selection )
+                {
+                    // start selecting only if mouse movement was big enough
+                    // (otherwise it was meant as mouse click, not selection):
+                    const int PRECISION = 2;
+                    wxPoint diff = m_tmpSelFromPos - wxPoint(x,y);
+                    if (abs(diff.x) > PRECISION || abs(diff.y) > PRECISION)
+                    {
+                        m_selection = new wxHtmlSelection();
+                    }
+                }
+                if ( m_selection )
+                {
+                    if ( m_tmpSelFromCell->IsBefore(selcell) )
+                    {
+                        m_selection->Set(m_tmpSelFromPos, m_tmpSelFromCell,
+                                         wxPoint(x,y), selcell);                                    }
+                    else
+                    {
+                        m_selection->Set(wxPoint(x,y), selcell,
+                                         m_tmpSelFromPos, m_tmpSelFromCell);
+                    }
+                    m_selection->ClearPrivPos();
+                    Refresh();
+                }

             }
             }

+        }
+
+        // handle cursor and status bar text changes:
+        if ( cell != m_tmpLastCell )
+        {
+            wxHtmlLinkInfo *lnk = cell ? cell->GetLink(x, y) : NULL;
+            wxCursor cur;
+            if (cell)
+                cur = cell->GetCursor();

             else
             else

-               {
-                SetCursor(*s_cur_hand);
-                if (m_RelatedStatusBar != -1)
-                    m_RelatedFrame->SetStatusText(lnk->GetHref(), m_RelatedStatusBar);
+                cur = *wxSTANDARD_CURSOR;
+            SetCursor(cur);
+
+            if (lnk != m_tmpLastLink)
+            {
+                if (lnk == NULL)
+                {
+                    if (m_RelatedStatusBar != -1)
+                        m_RelatedFrame->SetStatusText(wxEmptyString,
+                                                      m_RelatedStatusBar);
+                }
+                else
+                {
+                    if (m_RelatedStatusBar != -1)
+                        m_RelatedFrame->SetStatusText(lnk->GetHref(),
+                                                      m_RelatedStatusBar);
+                }
+                m_tmpLastLink = lnk;

             }
             }

-            m_tmpLastLink = lnk;
+
+            m_tmpLastCell = cell;
+        }
+        else // mouse moved but stayed in the same cell
+        {
+            if ( cell )
+                OnCellMouseHover(cell, x, y);

         }
         }

+

         m_tmpMouseMoved = FALSE;
     }
 }
 
         m_tmpMouseMoved = FALSE;
     }
 }
 

+#if wxUSE_CLIPBOARD
+void wxHtmlWindow::StopAutoScrolling()
+{
+    if ( m_timerAutoScroll )
+    {
+        wxDELETE(m_timerAutoScroll);
+    }
+}
+
+void wxHtmlWindow::OnMouseEnter(wxMouseEvent& event)
+{
+    StopAutoScrolling();
+    event.Skip();
+}
+
+void wxHtmlWindow::OnMouseLeave(wxMouseEvent& event)
+{
+    // don't prevent the usual processing of the event from taking place
+    event.Skip();
+
+    // when a captured mouse leave a scrolled window we start generate
+    // scrolling events to allow, for example, extending selection beyond the
+    // visible area in some controls
+    if ( wxWindow::GetCapture() == this )
+    {
+        // where is the mouse leaving?
+        int pos, orient;
+        wxPoint pt = event.GetPosition();
+        if ( pt.x < 0 )
+        {
+            orient = wxHORIZONTAL;
+            pos = 0;
+        }
+        else if ( pt.y < 0 )
+        {
+            orient = wxVERTICAL;
+            pos = 0;
+        }
+        else // we're lower or to the right of the window
+        {
+            wxSize size = GetClientSize();
+            if ( pt.x > size.x )
+            {
+                orient = wxHORIZONTAL;
+                pos = GetVirtualSize().x / wxHTML_SCROLL_STEP;
+            }
+            else if ( pt.y > size.y )
+            {
+                orient = wxVERTICAL;
+                pos = GetVirtualSize().y / wxHTML_SCROLL_STEP;
+            }
+            else // this should be impossible
+            {
+                // but seems to happen sometimes under wxMSW - maybe it's a bug
+                // there but for now just ignore it
+
+                //wxFAIL_MSG( _T("can't understand where has mouse gone") );
+
+                return;
+            }
+        }
+
+        // only start the auto scroll timer if the window can be scrolled in
+        // this direction
+        if ( !HasScrollbar(orient) )
+            return;
+
+        delete m_timerAutoScroll;
+        m_timerAutoScroll = new wxHtmlWinAutoScrollTimer
+                                (
+                                    this,
+                                    pos == 0 ? wxEVT_SCROLLWIN_LINEUP
+                                             : wxEVT_SCROLLWIN_LINEDOWN,
+                                    pos,
+                                    orient
+                                );
+        m_timerAutoScroll->Start(50); // FIXME: make configurable
+    }
+}
+
+void wxHtmlWindow::OnKeyUp(wxKeyEvent& event)
+{
+    if ( IsSelectionEnabled() &&
+         event.GetKeyCode() == 'C' && event.ControlDown() )
+    {
+        if ( m_selection )
+            CopySelection();
+    }
+}
+
+void wxHtmlWindow::OnCopy(wxCommandEvent& event)
+{
+    if ( m_selection )
+        CopySelection();
+}
+
+void wxHtmlWindow::OnDoubleClick(wxMouseEvent& event)
+{
+    // select word under cursor:
+    if ( IsSelectionEnabled() )
+    {
+        SelectWord(CalcUnscrolledPosition(event.GetPosition()));

 
 

+        CopySelection(Primary);

 
 

+        m_lastDoubleClick = wxGetLocalTimeMillis();
+    }
+    else
+        event.Skip();
+}
+
+void wxHtmlWindow::SelectWord(const wxPoint& pos)
+{
+    wxHtmlCell *cell = m_Cell->FindCellByPos(pos.x, pos.y);
+    if ( cell )
+    {
+        delete m_selection;
+        m_selection = new wxHtmlSelection();
+        m_selection->Set(cell, cell);
+        RefreshRect(wxRect(CalcScrolledPosition(cell->GetAbsPos()),
+                           wxSize(cell->GetWidth(), cell->GetHeight())));
+    }
+}
+
+void wxHtmlWindow::SelectLine(const wxPoint& pos)
+{
+    wxHtmlCell *cell = m_Cell->FindCellByPos(pos.x, pos.y);
+    if ( cell )
+    {
+        // We use following heuristic to find a "line": let the line be all
+        // cells in same container as the cell under mouse cursor that are
+        // neither completely above nor completely bellow the clicked cell
+        // (i.e. are likely to be words positioned on same line of text).
+
+        int y1 = cell->GetAbsPos().y;
+        int y2 = y1 + cell->GetHeight();
+        int y;
+        const wxHtmlCell *c;
+        const wxHtmlCell *before = NULL;
+        const wxHtmlCell *after = NULL;
+
+        // find last cell of line:
+        for ( c = cell->GetNext(); c; c = c->GetNext())
+        {
+            y = c->GetAbsPos().y;
+            if ( y + c->GetHeight() > y1 && y < y2 )
+                after = c;
+            else
+                break;
+        }
+        if ( !after )
+            after = cell;
+
+        // find first cell of line:
+        for ( c = cell->GetParent()->GetFirstChild();
+                c && c != cell; c = c->GetNext())
+        {
+            y = c->GetAbsPos().y;
+            if ( y + c->GetHeight() > y1 && y < y2 )
+            {
+                if ( ! before )
+                    before = c;
+            }
+            else
+                before = NULL;
+        }
+        if ( !before )
+            before = cell;
+
+        delete m_selection;
+        m_selection = new wxHtmlSelection();
+        m_selection->Set(before, after);
+
+        Refresh();
+    }
+}
+#endif // wxUSE_CLIPBOARD
+
+
+
+IMPLEMENT_ABSTRACT_CLASS(wxHtmlProcessor,wxObject)

 
 IMPLEMENT_DYNAMIC_CLASS(wxHtmlWindow,wxScrolledWindow)
 
 BEGIN_EVENT_TABLE(wxHtmlWindow, wxScrolledWindow)
     EVT_SIZE(wxHtmlWindow::OnSize)
 
 IMPLEMENT_DYNAMIC_CLASS(wxHtmlWindow,wxScrolledWindow)
 
 BEGIN_EVENT_TABLE(wxHtmlWindow, wxScrolledWindow)
     EVT_SIZE(wxHtmlWindow::OnSize)

-    EVT_LEFT_DOWN(wxHtmlWindow::OnMouseEvent)
-    EVT_MOTION(wxHtmlWindow::OnMouseEvent)
+    EVT_LEFT_DOWN(wxHtmlWindow::OnMouseDown)
+    EVT_LEFT_UP(wxHtmlWindow::OnMouseUp)
+    EVT_RIGHT_UP(wxHtmlWindow::OnMouseUp)
+    EVT_MOTION(wxHtmlWindow::OnMouseMove)

     EVT_IDLE(wxHtmlWindow::OnIdle)
     EVT_IDLE(wxHtmlWindow::OnIdle)

+    EVT_ERASE_BACKGROUND(wxHtmlWindow::OnEraseBackground)
+    EVT_PAINT(wxHtmlWindow::OnPaint)
+#if wxUSE_CLIPBOARD
+    EVT_LEFT_DCLICK(wxHtmlWindow::OnDoubleClick)
+    EVT_ENTER_WINDOW(wxHtmlWindow::OnMouseEnter)
+    EVT_LEAVE_WINDOW(wxHtmlWindow::OnMouseLeave)
+    EVT_KEY_UP(wxHtmlWindow::OnKeyUp)
+    EVT_MENU(wxID_COPY, wxHtmlWindow::OnCopy)
+#endif // wxUSE_CLIPBOARD

 END_EVENT_TABLE()
 
 
 END_EVENT_TABLE()
 
 


@@ -620,20 +1289,10 @@ public:
 IMPLEMENT_DYNAMIC_CLASS(wxHtmlWinModule, wxModule)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxHtmlWinModule, wxModule)
 
 

+// This hack forces the linker to always link in m_* files
+// (wxHTML doesn't work without handlers from these files)
+#include "wx/html/forcelnk.h"
+FORCE_WXHTML_MODULES()

 
 

+#endif // wxUSE_HTML

 
 

-///// default mod handlers are forced there:
-
-FORCE_LINK(m_layout)
-FORCE_LINK(m_fonts)
-FORCE_LINK(m_image)
-FORCE_LINK(m_list)
-FORCE_LINK(m_dflist)
-FORCE_LINK(m_pre)
-FORCE_LINK(m_hline)
-FORCE_LINK(m_links)
-FORCE_LINK(m_tables)
-FORCE_LINK(m_meta)
-
-
-#endif