Enable UpdateUI events in wxTaskBarIcon.

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

diff --git a/src/html/htmlwin.cpp b/src/html/htmlwin.cpp
index a31d540ccf873cdad70e01c10ad0718d50784747..6acacdb8f63c2373a4e74e1f3a7e34d3f8ee8924 100644 (file)
--- a/src/html/htmlwin.cpp
+++ b/src/html/htmlwin.cpp
@@ -4,11 +4,11 @@
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vaclav Slavik
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vaclav Slavik

-// Licence:     wxWindows Licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 
 /////////////////////////////////////////////////////////////////////////////
 
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "htmlwin.h"
 #pragma implementation "htmlproc.h"
 #endif
 #pragma implementation "htmlwin.h"
 #pragma implementation "htmlproc.h"
 #endif


@@ -33,14 +33,15 @@
 #include "wx/html/htmlproc.h"
 #include "wx/list.h"
 #include "wx/clipbrd.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/timer.h"
 #include "wx/dcmemory.h"

+#include "wx/settings.h"

 
 #include "wx/arrimpl.cpp"
 #include "wx/listimpl.cpp"
 
 
 
 #include "wx/arrimpl.cpp"
 #include "wx/listimpl.cpp"
 
 

-

 #if wxUSE_CLIPBOARD
 // ----------------------------------------------------------------------------
 // wxHtmlWinAutoScrollTimer: the timer used to generate a stream of scroll
 #if wxUSE_CLIPBOARD
 // ----------------------------------------------------------------------------
 // wxHtmlWinAutoScrollTimer: the timer used to generate a stream of scroll


@@ -109,7 +110,8 @@ void wxHtmlWinAutoScrollTimer::Notify()
         }
     }
 }
         }
     }
 }

-#endif
+
+#endif // wxUSE_CLIPBOARD

 
 
 
 
 
 


@@ -118,7 +120,7 @@ void wxHtmlWinAutoScrollTimer::Notify()
 //-----------------------------------------------------------------------------
 
 // item of history list
 //-----------------------------------------------------------------------------
 
 // item of history list

-class WXDLLEXPORT wxHtmlHistoryItem
+class WXDLLIMPEXP_HTML wxHtmlHistoryItem

 {
 public:
     wxHtmlHistoryItem(const wxString& p, const wxString& a) {m_Page = p, m_Anchor = a, m_Pos = 0;}
 {
 public:
     wxHtmlHistoryItem(const wxString& p, const wxString& a) {m_Page = p, m_Anchor = a, m_Pos = 0;}


@@ -151,12 +153,14 @@ WX_DEFINE_LIST(wxHtmlProcessorList);
 
 void wxHtmlWindow::Init()
 {
 
 void wxHtmlWindow::Init()
 {

-    m_tmpMouseMoved = FALSE;
+    m_tmpMouseMoved = false;

     m_tmpLastLink = NULL;
     m_tmpLastCell = NULL;
     m_tmpCanDrawLocks = 0;
     m_FS = new wxFileSystem();
     m_tmpLastLink = NULL;
     m_tmpLastCell = NULL;
     m_tmpCanDrawLocks = 0;
     m_FS = new wxFileSystem();

+#if wxUSE_STATUSBAR

     m_RelatedStatusBar = -1;
     m_RelatedStatusBar = -1;

+#endif // wxUSE_STATUSBAR

     m_RelatedFrame = NULL;
     m_TitleFormat = wxT("%s");
     m_OpenedPage = m_OpenedAnchor = m_OpenedPageTitle = wxEmptyString;
     m_RelatedFrame = NULL;
     m_TitleFormat = wxT("%s");
     m_OpenedPage = m_OpenedAnchor = m_OpenedPageTitle = wxEmptyString;


@@ -164,7 +168,7 @@ void wxHtmlWindow::Init()
     m_Parser = new wxHtmlWinParser(this);
     m_Parser->SetFS(m_FS);
     m_HistoryPos = -1;
     m_Parser = new wxHtmlWinParser(this);
     m_Parser->SetFS(m_FS);
     m_HistoryPos = -1;

-    m_HistoryOn = TRUE;
+    m_HistoryOn = true;

     m_History = new wxHtmlHistoryArray;
     m_Processors = NULL;
     m_Style = 0;
     m_History = new wxHtmlHistoryArray;
     m_Processors = NULL;
     m_Style = 0;


@@ -173,7 +177,8 @@ void wxHtmlWindow::Init()
     m_makingSelection = false;
 #if wxUSE_CLIPBOARD
     m_timerAutoScroll = NULL;
     m_makingSelection = false;
 #if wxUSE_CLIPBOARD
     m_timerAutoScroll = NULL;

-#endif
+    m_lastDoubleClick = 0;
+#endif // wxUSE_CLIPBOARD

     m_backBuffer = NULL;
 }
 
     m_backBuffer = NULL;
 }
 


@@ -182,12 +187,13 @@ bool wxHtmlWindow::Create(wxWindow *parent, wxWindowID id,
                           long style, const wxString& name)
 {
     if (!wxScrolledWindow::Create(parent, id, pos, size,
                           long style, const wxString& name)
 {
     if (!wxScrolledWindow::Create(parent, id, pos, size,

-                                  style | wxVSCROLL | wxHSCROLL, name))
-        return FALSE;
+                                  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;
+    return true;

 }
 
 
 }
 
 


@@ -195,10 +201,17 @@ wxHtmlWindow::~wxHtmlWindow()
 {
 #if wxUSE_CLIPBOARD
     StopAutoScrolling();
 {
 #if wxUSE_CLIPBOARD
     StopAutoScrolling();

-#endif
+#endif // wxUSE_CLIPBOARD

     HistoryClear();
 
     HistoryClear();
 

-    if (m_Cell) delete m_Cell;
+    delete m_selection;
+
+    delete m_Cell;
+
+    if ( m_Processors )
+    {
+        WX_CLEAR_LIST(wxHtmlProcessorList, *m_Processors);
+    }

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


@@ -217,10 +230,12 @@ void wxHtmlWindow::SetRelatedFrame(wxFrame* frame, const wxString& format)
 
 
 
 
 
 

+#if wxUSE_STATUSBAR

 void wxHtmlWindow::SetRelatedStatusBar(int bar)
 {
     m_RelatedStatusBar = bar;
 }
 void wxHtmlWindow::SetRelatedStatusBar(int bar)
 {
     m_RelatedStatusBar = bar;
 }

+#endif // wxUSE_STATUSBAR

 
 
 
 
 
 


@@ -231,9 +246,22 @@ void wxHtmlWindow::SetFonts(wxString normal_face, wxString fixed_face, const int
     m_Parser->SetFonts(normal_face, fixed_face, sizes);
     // fonts changed => contents invalid, so reload the page:
     SetPage(wxT("<html><body></body></html>"));
     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.empty())
+        LoadPage(op);

 }
 
 }
 

+void wxHtmlWindow::SetStandardFonts(int size,
+                                    const wxString& normal_face,
+                                    const wxString& fixed_face)
+{
+    wxString op = m_OpenedPage;
+
+    m_Parser->SetStandardFonts(size, normal_face, fixed_face);
+    // fonts changed => contents invalid, so reload the page:
+    SetPage(wxT("<html><body></body></html>"));
+    if (!op.empty())
+        LoadPage(op);
+}

 
 
 bool wxHtmlWindow::SetPage(const wxString& source)
 
 
 bool wxHtmlWindow::SetPage(const wxString& source)


@@ -245,11 +273,11 @@ bool wxHtmlWindow::SetPage(const wxString& source)
     // pass HTML through registered processors:
     if (m_Processors || m_GlobalProcessors)
     {
     // pass HTML through registered processors:
     if (m_Processors || m_GlobalProcessors)
     {

-        wxHtmlProcessorList::Node *nodeL, *nodeG;
+        wxHtmlProcessorList::compatibility_iterator nodeL, nodeG;

         int prL, prG;
 
         int prL, prG;
 

-        nodeL = (m_Processors) ? m_Processors->GetFirst() : NULL;
-        nodeG = (m_GlobalProcessors) ? m_GlobalProcessors->GetFirst() : NULL;
+        nodeL = (m_Processors) ? m_Processors->GetFirst() : wxHtmlProcessorList::compatibility_iterator();
+        nodeG = (m_GlobalProcessors) ? m_GlobalProcessors->GetFirst() : wxHtmlProcessorList::compatibility_iterator();

 
         // VS: there are two lists, global and local, both of them sorted by
         //     priority. Since we have to go through _both_ lists with
 
         // VS: there are two lists, global and local, both of them sorted by
         //     priority. Since we have to go through _both_ lists with


@@ -293,7 +321,7 @@ bool wxHtmlWindow::SetPage(const wxString& source)
     CreateLayout();
     if (m_tmpCanDrawLocks == 0)
         Refresh();
     CreateLayout();
     if (m_tmpCanDrawLocks == 0)
         Refresh();

-    return TRUE;
+    return true;

 }
 
 bool wxHtmlWindow::AppendToPage(const wxString& source)
 }
 
 bool wxHtmlWindow::AppendToPage(const wxString& source)


@@ -307,7 +335,7 @@ bool wxHtmlWindow::LoadPage(const wxString& location)
 
     wxFSFile *f;
     bool rt_val;
 
     wxFSFile *f;
     bool rt_val;

-    bool needs_refresh = FALSE;
+    bool needs_refresh = false;

 
     m_tmpCanDrawLocks++;
     if (m_HistoryOn && (m_HistoryPos != -1))
 
     m_tmpCanDrawLocks++;
     if (m_HistoryOn && (m_HistoryPos != -1))


@@ -344,13 +372,15 @@ bool wxHtmlWindow::LoadPage(const wxString& location)
 
     else
     {
 
     else
     {

-        needs_refresh = TRUE;
+        needs_refresh = true;
+#if wxUSE_STATUSBAR

         // load&display it:
         if (m_RelatedStatusBar != -1)
         {
             m_RelatedFrame->SetStatusText(_("Connecting..."), m_RelatedStatusBar);
         // load&display it:
         if (m_RelatedStatusBar != -1)
         {
             m_RelatedFrame->SetStatusText(_("Connecting..."), m_RelatedStatusBar);

-            Refresh(FALSE);
+            Refresh(false);

         }
         }

+#endif // wxUSE_STATUSBAR

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


@@ -366,20 +396,22 @@ bool wxHtmlWindow::LoadPage(const wxString& location)
         {
             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--;

-            return FALSE;
+            return false;

         }
 
         else
         {
         }
 
         else
         {

-            wxNode *node;
+            wxList::compatibility_iterator node;

             wxString src = wxEmptyString;
 
             wxString src = wxEmptyString;
 

+#if wxUSE_STATUSBAR

             if (m_RelatedStatusBar != -1)
             {
                 wxString msg = _("Loading : ") + location;
                 m_RelatedFrame->SetStatusText(msg, m_RelatedStatusBar);
             if (m_RelatedStatusBar != -1)
             {
                 wxString msg = _("Loading : ") + location;
                 m_RelatedFrame->SetStatusText(msg, m_RelatedStatusBar);

-                Refresh(FALSE);
+                Refresh(false);

             }
             }

+#endif // wxUSE_STATUSBAR

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


@@ -408,7 +440,10 @@ bool wxHtmlWindow::LoadPage(const wxString& location)
 
             delete f;
 
 
             delete f;
 

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

         }
     }
 
         }
     }
 


@@ -455,7 +490,7 @@ bool wxHtmlWindow::ScrollToAnchor(const wxString& anchor)
     if (!c)
     {
         wxLogWarning(_("HTML anchor %s does not exist."), anchor.c_str());
     if (!c)
     {
         wxLogWarning(_("HTML anchor %s does not exist."), anchor.c_str());

-        return FALSE;
+        return false;

     }
     else
     {
     }
     else
     {


@@ -464,7 +499,7 @@ bool wxHtmlWindow::ScrollToAnchor(const wxString& anchor)
         for (y = 0; c != NULL; c = c->GetParent()) y += c->GetPosY();
         Scroll(-1, y / wxHTML_SCROLL_STEP);
         m_OpenedAnchor = anchor;
         for (y = 0; c != NULL; c = c->GetParent()) y += c->GetPosY();
         Scroll(-1, y / wxHTML_SCROLL_STEP);
         m_OpenedAnchor = anchor;

-        return TRUE;
+        return true;

     }
 }
 
     }
 }
 


@@ -578,7 +613,7 @@ bool wxHtmlWindow::HistoryBack()
 {
     wxString a, l;
 
 {
     wxString a, l;
 

-    if (m_HistoryPos < 1) return FALSE;
+    if (m_HistoryPos < 1) return false;

 
     // store scroll position into history item:
     int x, y;
 
     // store scroll position into history item:
     int x, y;


@@ -590,21 +625,21 @@ bool wxHtmlWindow::HistoryBack()
 
     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_HistoryOn = false;

     m_tmpCanDrawLocks++;
     if (a == wxEmptyString) LoadPage(l);
     else LoadPage(l + wxT("#") + a);
     m_tmpCanDrawLocks++;
     if (a == wxEmptyString) LoadPage(l);
     else LoadPage(l + wxT("#") + a);

-    m_HistoryOn = TRUE;
+    m_HistoryOn = true;

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

-    return TRUE;
+    return true;

 }
 
 bool wxHtmlWindow::HistoryCanBack()
 {
 }
 
 bool wxHtmlWindow::HistoryCanBack()
 {

-    if (m_HistoryPos < 1) return FALSE;
-    return TRUE ;
+    if (m_HistoryPos < 1) return false;
+    return true ;

 }
 
 
 }
 
 


@@ -612,30 +647,30 @@ bool wxHtmlWindow::HistoryForward()
 {
     wxString a, l;
 
 {
     wxString a, l;
 

-    if (m_HistoryPos == -1) return FALSE;
-    if (m_HistoryPos >= (int)m_History->GetCount() - 1)return FALSE;
+    if (m_HistoryPos == -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++;
     l = (*m_History)[m_HistoryPos].GetPage();
     a = (*m_History)[m_HistoryPos].GetAnchor();
 
     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();

-    m_HistoryOn = FALSE;
+    m_HistoryOn = false;

     m_tmpCanDrawLocks++;
     if (a == wxEmptyString) LoadPage(l);
     else LoadPage(l + wxT("#") + a);
     m_tmpCanDrawLocks++;
     if (a == wxEmptyString) LoadPage(l);
     else LoadPage(l + wxT("#") + a);

-    m_HistoryOn = TRUE;
+    m_HistoryOn = true;

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

-    return TRUE;
+    return true;

 }
 
 bool wxHtmlWindow::HistoryCanForward()
 {
 }
 
 bool wxHtmlWindow::HistoryCanForward()
 {

-    if (m_HistoryPos == -1) return FALSE;
-    if (m_HistoryPos >= (int)m_History->GetCount() - 1)return FALSE;
-    return TRUE ;
+    if (m_HistoryPos == -1) return false;
+    if (m_HistoryPos >= (int)m_History->GetCount() - 1)return false;
+    return true ;

 }
 
 
 }
 
 


@@ -650,9 +685,8 @@ void wxHtmlWindow::AddProcessor(wxHtmlProcessor *processor)
     if (!m_Processors)
     {
         m_Processors = new wxHtmlProcessorList;
     if (!m_Processors)
     {
         m_Processors = new wxHtmlProcessorList;

-        m_Processors->DeleteContents(TRUE);

     }
     }

-    wxHtmlProcessorList::Node *node;
+    wxHtmlProcessorList::compatibility_iterator node;

 
     for (node = m_Processors->GetFirst(); node; node = node->GetNext())
     {
 
     for (node = m_Processors->GetFirst(); node; node = node->GetNext())
     {


@@ -670,9 +704,8 @@ void wxHtmlWindow::AddProcessor(wxHtmlProcessor *processor)
     if (!m_GlobalProcessors)
     {
         m_GlobalProcessors = new wxHtmlProcessorList;
     if (!m_GlobalProcessors)
     {
         m_GlobalProcessors = new wxHtmlProcessorList;

-        m_GlobalProcessors->DeleteContents(TRUE);

     }
     }

-    wxHtmlProcessorList::Node *node;
+    wxHtmlProcessorList::compatibility_iterator node;

 
     for (node = m_GlobalProcessors->GetFirst(); node; node = node->GetNext())
     {
 
     for (node = m_GlobalProcessors->GetFirst(); node; node = node->GetNext())
     {


@@ -689,18 +722,15 @@ void wxHtmlWindow::AddProcessor(wxHtmlProcessor *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()
 {
     wxDELETE(m_DefaultFilter);
 wxHtmlProcessorList *wxHtmlWindow::m_GlobalProcessors = NULL;
 
 void wxHtmlWindow::CleanUpStatics()
 {
     wxDELETE(m_DefaultFilter);

-    m_Filters.DeleteContents(TRUE);
-    m_Filters.Clear();
+    WX_CLEAR_LIST(wxList, m_Filters);
+    if (m_GlobalProcessors)
+        WX_CLEAR_LIST(wxHtmlProcessorList, *m_GlobalProcessors);

     wxDELETE(m_GlobalProcessors);
     wxDELETE(m_GlobalProcessors);

-    wxDELETE(s_cur_hand);
-    wxDELETE(s_cur_arrow);

 }
 
 
 }
 
 


@@ -719,22 +749,22 @@ bool wxHtmlWindow::IsSelectionEnabled() const
     return false;
 #endif
 }
     return false;
 #endif
 }

-    
+

 
 #if wxUSE_CLIPBOARD
 
 #if wxUSE_CLIPBOARD

-wxString wxHtmlWindow::SelectionToText()
+wxString wxHtmlWindow::DoSelectionToText(wxHtmlSelection *sel)

 {
 {

-    if ( !m_selection )
+    if ( !sel )

         return wxEmptyString;
 
     wxClientDC dc(this);
 
         return wxEmptyString;
 
     wxClientDC dc(this);
 

-    const wxHtmlCell *end = m_selection->GetToCell();
+    const wxHtmlCell *end = sel->GetToCell();

     wxString text;
     wxString text;

-    wxHtmlTerminalCellsInterator i(m_selection->GetFromCell(), end);
+    wxHtmlTerminalCellsInterator i(sel->GetFromCell(), end);

     if ( i )
     {
     if ( i )
     {

-        text << i->ConvertToText(m_selection);
+        text << i->ConvertToText(sel);

         ++i;
     }
     const wxHtmlCell *prev = *i;
         ++i;
     }
     const wxHtmlCell *prev = *i;


@@ -742,29 +772,58 @@ wxString wxHtmlWindow::SelectionToText()
     {
         if ( prev->GetParent() != i->GetParent() )
             text << _T('\n');
     {
         if ( prev->GetParent() != i->GetParent() )
             text << _T('\n');

-        text << i->ConvertToText(*i == end ? m_selection : NULL);
+        text << i->ConvertToText(*i == end ? sel : NULL);

         prev = *i;
         ++i;
     }
     return text;
 }
 
         prev = *i;
         ++i;
     }
     return text;
 }
 

-void wxHtmlWindow::CopySelection(ClipboardType t)
+wxString wxHtmlWindow::ToText()

 {
 {

+    if (m_Cell)
+    {
+        wxHtmlSelection sel;
+        sel.Set(m_Cell->GetFirstTerminal(), m_Cell->GetLastTerminal());
+        return DoSelectionToText(&sel);
+    }
+    else
+        return wxEmptyString;
+}
+
+#endif // wxUSE_CLIPBOARD
+
+bool wxHtmlWindow::CopySelection(ClipboardType t)
+{
+#if wxUSE_CLIPBOARD

     if ( m_selection )
     {
     if ( m_selection )
     {

+#ifdef __UNIX__

         wxTheClipboard->UsePrimarySelection(t == Primary);
         wxTheClipboard->UsePrimarySelection(t == Primary);

-        wxString txt(SelectionToText());
+#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 false;
+#endif // __UNIX__/!__UNIX__
+

         if ( wxTheClipboard->Open() )
         {
         if ( wxTheClipboard->Open() )
         {

+            const wxString txt(SelectionToText());

             wxTheClipboard->SetData(new wxTextDataObject(txt));
             wxTheClipboard->Close();
             wxLogTrace(_T("wxhtmlselection"),
                        _("Copied to clipboard:\"%s\""), txt.c_str());
             wxTheClipboard->SetData(new wxTextDataObject(txt));
             wxTheClipboard->Close();
             wxLogTrace(_T("wxhtmlselection"),
                        _("Copied to clipboard:\"%s\""), txt.c_str());

+
+            return true;

         }
     }
         }
     }

+#endif // wxUSE_CLIPBOARD
+
+    return false;

 }
 }

-#endif

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


@@ -789,7 +848,7 @@ void wxHtmlWindow::OnCellMouseHover(wxHtmlCell * WXUNUSED(cell),
     // do nothing here
 }
 
     // do nothing here
 }
 

-void wxHtmlWindow::OnEraseBackground(wxEraseEvent& event)
+void wxHtmlWindow::OnEraseBackground(wxEraseEvent& WXUNUSED(event))

 {
 }
 
 {
 }
 


@@ -807,13 +866,13 @@ void wxHtmlWindow::OnPaint(wxPaintEvent& WXUNUSED(event))
     wxMemoryDC dcm;
     if ( !m_backBuffer )
         m_backBuffer = new wxBitmap(sz.x, sz.y);
     wxMemoryDC dcm;
     if ( !m_backBuffer )
         m_backBuffer = new wxBitmap(sz.x, sz.y);

-    dcm.SelectObject(*m_backBuffer);    
+    dcm.SelectObject(*m_backBuffer);

     dcm.SetBackground(wxBrush(GetBackgroundColour(), wxSOLID));
     dcm.Clear();
     PrepareDC(dcm);
     dcm.SetMapMode(wxMM_TEXT);
     dcm.SetBackgroundMode(wxTRANSPARENT);
     dcm.SetBackground(wxBrush(GetBackgroundColour(), wxSOLID));
     dcm.Clear();
     PrepareDC(dcm);
     dcm.SetMapMode(wxMM_TEXT);
     dcm.SetBackgroundMode(wxTRANSPARENT);

-    
+

     wxHtmlRenderingInfo rinfo;
     wxDefaultHtmlRenderingStyle rstyle;
     rinfo.SetSelection(m_selection);
     wxHtmlRenderingInfo rinfo;
     wxDefaultHtmlRenderingStyle rstyle;
     rinfo.SetSelection(m_selection);


@@ -823,6 +882,35 @@ void wxHtmlWindow::OnPaint(wxPaintEvent& WXUNUSED(event))
                  y * wxHTML_SCROLL_STEP + rect.GetBottom(),
                  rinfo);
 
                  y * wxHTML_SCROLL_STEP + rect.GetBottom(),
                  rinfo);
 

+//#define DEBUG_HTML_SELECTION
+#ifdef DEBUG_HTML_SELECTION
+    {
+    int xc, yc, x, y;
+    wxGetMousePosition(&xc, &yc);
+    ScreenToClient(&xc, &yc);
+    CalcUnscrolledPosition(xc, yc, &x, &y);
+    wxHtmlCell *at = m_Cell->FindCellByPos(x, y);
+    wxHtmlCell *before =
+        m_Cell->FindCellByPos(x, y, wxHTML_FIND_NEAREST_BEFORE);
+    wxHtmlCell *after =
+        m_Cell->FindCellByPos(x, y, wxHTML_FIND_NEAREST_AFTER);
+
+    dcm.SetBrush(*wxTRANSPARENT_BRUSH);
+    dcm.SetPen(*wxBLACK_PEN);
+    if (at)
+        dcm.DrawRectangle(at->GetAbsPos(),
+                          wxSize(at->GetWidth(),at->GetHeight()));
+    dcm.SetPen(*wxGREEN_PEN);
+    if (before)
+        dcm.DrawRectangle(before->GetAbsPos().x+1, before->GetAbsPos().y+1,
+                          before->GetWidth()-2,before->GetHeight()-2);
+    dcm.SetPen(*wxRED_PEN);
+    if (after)
+        dcm.DrawRectangle(after->GetAbsPos().x+2, after->GetAbsPos().y+2,
+                          after->GetWidth()-4,after->GetHeight()-4);
+    }
+#endif
+

     dcm.SetDeviceOrigin(0,0);
     dc.Blit(0, rect.GetTop(),
             sz.x, rect.GetBottom() - rect.GetTop() + 1,
     dcm.SetDeviceOrigin(0,0);
     dc.Blit(0, rect.GetTop(),
             sz.x, rect.GetBottom() - rect.GetTop() + 1,


@@ -847,32 +935,44 @@ void wxHtmlWindow::OnSize(wxSizeEvent& event)
                          m_selection->GetToCell());
         m_selection->ClearPrivPos();
     }
                          m_selection->GetToCell());
         m_selection->ClearPrivPos();
     }

-    
+

     Refresh();
 }
 
 
     Refresh();
 }
 
 

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

 {
     m_tmpMouseMoved = true;
 }
 
 void wxHtmlWindow::OnMouseDown(wxMouseEvent& event)
 {
 {
     m_tmpMouseMoved = true;
 }
 
 void wxHtmlWindow::OnMouseDown(wxMouseEvent& event)
 {

+#if wxUSE_CLIPBOARD

     if ( event.LeftDown() && IsSelectionEnabled() )
     {
     if ( event.LeftDown() && IsSelectionEnabled() )
     {

-        m_makingSelection = true;
-            
-        if ( m_selection )
+        const long TRIPLECLICK_LEN = 200; // 0.2 sec after doubleclick
+        if ( wxGetLocalTimeMillis() - m_lastDoubleClick <= TRIPLECLICK_LEN )

         {
         {

-            wxDELETE(m_selection);
-            Refresh();
+            SelectLine(CalcUnscrolledPosition(event.GetPosition()));
+
+            (void) CopySelection();

         }
         }

-        m_tmpSelFromPos = CalcUnscrolledPosition(event.GetPosition());
-        m_tmpSelFromCell = NULL;
+        else
+        {
+            m_makingSelection = true;
+
+            if ( m_selection )
+            {
+                wxDELETE(m_selection);
+                Refresh();
+            }
+            m_tmpSelFromPos = CalcUnscrolledPosition(event.GetPosition());
+            m_tmpSelFromCell = NULL;

 
 

-        CaptureMouse();
+            CaptureMouse();
+        }

     }
     }

+#endif // wxUSE_CLIPBOARD

 }
 
 void wxHtmlWindow::OnMouseUp(wxMouseEvent& event)
 }
 
 void wxHtmlWindow::OnMouseUp(wxMouseEvent& event)


@@ -884,27 +984,24 @@ void wxHtmlWindow::OnMouseUp(wxMouseEvent& event)
         m_makingSelection = false;
 
         // did the user move the mouse far enough from starting point?
         m_makingSelection = false;
 
         // did the user move the mouse far enough from starting point?

-        if ( m_selection )
+        if ( CopySelection(Primary) )

         {
         {

-#ifdef __UNIX__
-            CopySelection(Primary);
-#endif

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

-#endif
-    
+#endif // wxUSE_CLIPBOARD
+

     SetFocus();
     if ( m_Cell )
     {
         wxPoint pos = CalcUnscrolledPosition(event.GetPosition());
         wxHtmlCell *cell = m_Cell->FindCellByPos(pos.x, pos.y);
 
     SetFocus();
     if ( m_Cell )
     {
         wxPoint pos = CalcUnscrolledPosition(event.GetPosition());
         wxHtmlCell *cell = m_Cell->FindCellByPos(pos.x, pos.y);
 

-        // VZ: is it possible that we don't find anything at all?
-        // VS: yes. FindCellByPos returns terminal cell and
-        //     containers may have empty borders
+        // 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);
     }
         if ( cell )
             OnCellClicked(cell, pos.x, pos.y, event);
     }


@@ -912,16 +1009,15 @@ void wxHtmlWindow::OnMouseUp(wxMouseEvent& event)
 
 
 
 
 
 

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

 {
 {

-    if (s_cur_hand == NULL)
-    {
-        s_cur_hand = new wxCursor(wxCURSOR_HAND);
-        s_cur_arrow = new wxCursor(wxCURSOR_ARROW);
-    }
+    wxWindow::OnInternalIdle();

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

+#ifdef DEBUG_HTML_SELECTION
+        Refresh();
+#endif

         int xc, yc, x, y;
         wxGetMousePosition(&xc, &yc);
         ScreenToClient(&xc, &yc);
         int xc, yc, x, y;
         wxGetMousePosition(&xc, &yc);
         ScreenToClient(&xc, &yc);


@@ -932,10 +1028,36 @@ void wxHtmlWindow::OnIdle(wxIdleEvent& WXUNUSED(event))
         // handle selection update:
         if ( m_makingSelection )
         {
         // handle selection update:
         if ( m_makingSelection )
         {

-            bool goingDown = m_tmpSelFromPos.y < y ||
-                             m_tmpSelFromPos.y == y && m_tmpSelFromPos.x < x;
-

             if ( !m_tmpSelFromCell )
             if ( !m_tmpSelFromCell )

+                m_tmpSelFromCell = m_Cell->FindCellByPos(
+                                         m_tmpSelFromPos.x,m_tmpSelFromPos.y);
+
+            // NB: a trick - we adjust selFromPos to be upper left or bottom
+            //     right corner of the first cell of the selection depending
+            //     on whether the mouse is moving to the right or to the left.
+            //     This gives us more "natural" behaviour when selecting
+            //     a line (specifically, first cell of the next line is not
+            //     included if you drag selection from left to right over
+            //     entire line):
+            wxPoint dirFromPos;
+            if ( !m_tmpSelFromCell )
+            {
+                dirFromPos = m_tmpSelFromPos;
+            }
+            else
+            {
+                dirFromPos = m_tmpSelFromCell->GetAbsPos();
+                if ( x < m_tmpSelFromPos.x )
+                {
+                    dirFromPos.x += m_tmpSelFromCell->GetWidth();
+                    dirFromPos.y += m_tmpSelFromCell->GetHeight();
+                }
+            }
+            bool goingDown = dirFromPos.y < y ||
+                             (dirFromPos.y == y && dirFromPos.x < x);
+
+            // determine selection span:
+            if ( /*still*/ !m_tmpSelFromCell )

             {
                 if (goingDown)
                 {
             {
                 if (goingDown)
                 {


@@ -961,14 +1083,14 @@ void wxHtmlWindow::OnIdle(wxIdleEvent& WXUNUSED(event))
                 if (goingDown)
                 {
                     selcell = m_Cell->FindCellByPos(x, y,
                 if (goingDown)
                 {
                     selcell = m_Cell->FindCellByPos(x, y,

-                                                 wxHTML_FIND_NEAREST_AFTER);
+                                                 wxHTML_FIND_NEAREST_BEFORE);

                     if (!selcell)
                         selcell = m_Cell->GetLastTerminal();
                 }
                 else
                 {
                     selcell = m_Cell->FindCellByPos(x, y,
                     if (!selcell)
                         selcell = m_Cell->GetLastTerminal();
                 }
                 else
                 {
                     selcell = m_Cell->FindCellByPos(x, y,

-                                                 wxHTML_FIND_NEAREST_BEFORE);
+                                                 wxHTML_FIND_NEAREST_AFTER);

                     if (!selcell)
                         selcell = m_Cell->GetFirstTerminal();
                 }
                     if (!selcell)
                         selcell = m_Cell->GetFirstTerminal();
                 }


@@ -976,9 +1098,9 @@ void wxHtmlWindow::OnIdle(wxIdleEvent& WXUNUSED(event))
 
             // NB: it may *rarely* happen that the code above didn't find one
             //     of the cells, e.g. if wxHtmlWindow doesn't contain any
 
             // 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. 
+            //     visible cells.

             if ( selcell && m_tmpSelFromCell )
             if ( selcell && m_tmpSelFromCell )

-            {                
+            {

                 if ( !m_selection )
                 {
                     // start selecting only if mouse movement was big enough
                 if ( !m_selection )
                 {
                     // start selecting only if mouse movement was big enough


@@ -1006,26 +1128,34 @@ void wxHtmlWindow::OnIdle(wxIdleEvent& WXUNUSED(event))
                 }
             }
         }
                 }
             }
         }

-        
+

         // handle cursor and status bar text changes:
         if ( cell != m_tmpLastCell )
         {
             wxHtmlLinkInfo *lnk = cell ? cell->GetLink(x, y) : NULL;
         // 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
+                cur = *wxSTANDARD_CURSOR;
+            SetCursor(cur);

 
             if (lnk != m_tmpLastLink)
             {
 
             if (lnk != m_tmpLastLink)
             {

+#if wxUSE_STATUSBAR

                 if (lnk == NULL)
                 {
                 if (lnk == NULL)
                 {

-                    SetCursor(*s_cur_arrow);

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

-                        m_RelatedFrame->SetStatusText(wxEmptyString, m_RelatedStatusBar);
+                        m_RelatedFrame->SetStatusText(wxEmptyString,
+                                                      m_RelatedStatusBar);

                 }
                 else
                 {
                 }
                 else
                 {

-                    SetCursor(*s_cur_hand);

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

-                        m_RelatedFrame->SetStatusText(lnk->GetHref(), m_RelatedStatusBar);
+                        m_RelatedFrame->SetStatusText(lnk->GetHref(),
+                                                      m_RelatedStatusBar);

                 }
                 }

+#endif // wxUSE_STATUSBAR

                 m_tmpLastLink = lnk;
             }
 
                 m_tmpLastLink = lnk;
             }
 


@@ -1037,7 +1167,7 @@ void wxHtmlWindow::OnIdle(wxIdleEvent& WXUNUSED(event))
                 OnCellMouseHover(cell, x, y);
         }
 
                 OnCellMouseHover(cell, x, y);
         }
 

-        m_tmpMouseMoved = FALSE;
+        m_tmpMouseMoved = false;

     }
 }
 
     }
 }
 


@@ -1123,27 +1253,142 @@ void wxHtmlWindow::OnMouseLeave(wxMouseEvent& event)
 
 void wxHtmlWindow::OnKeyUp(wxKeyEvent& event)
 {
 
 void wxHtmlWindow::OnKeyUp(wxKeyEvent& event)
 {

-    if ( event.GetKeyCode() == 'C' && event.ControlDown() )
+    if ( IsSelectionEnabled() &&
+         event.GetKeyCode() == 'C' && event.ControlDown() )
+    {
+        (void) CopySelection();
+    }
+}
+
+void wxHtmlWindow::OnCopy(wxCommandEvent& WXUNUSED(event))
+{
+    (void) CopySelection();
+}
+
+void wxHtmlWindow::OnDoubleClick(wxMouseEvent& event)
+{
+    // select word under cursor:
+    if ( IsSelectionEnabled() )

     {
     {

-        if ( m_selection )
-            CopySelection();
+        SelectWord(CalcUnscrolledPosition(event.GetPosition()));
+
+        (void) CopySelection(Primary);
+
+        m_lastDoubleClick = wxGetLocalTimeMillis();

     }
     else
         event.Skip();
 }
 
     }
     else
         event.Skip();
 }
 

-void wxHtmlWindow::OnCopy(wxCommandEvent& event)
+void wxHtmlWindow::SelectWord(const wxPoint& pos)

 {
 {

-    if ( m_selection )
-        CopySelection();
+    if ( m_Cell )
+    {
+        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)
+{
+    if ( m_Cell )
+    {
+        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
+
+void wxHtmlWindow::SelectAll()
+{
+    if ( m_Cell )
+    {
+        delete m_selection;
+        m_selection = new wxHtmlSelection();
+        m_selection->Set(m_Cell->GetFirstTerminal(), m_Cell->GetLastTerminal());
+        Refresh();
+    }
+}
+
+#endif // wxUSE_CLIPBOARD

 
 
 
 IMPLEMENT_ABSTRACT_CLASS(wxHtmlProcessor,wxObject)
 
 
 
 
 IMPLEMENT_ABSTRACT_CLASS(wxHtmlProcessor,wxObject)
 

+#if wxUSE_EXTENDED_RTTI
+IMPLEMENT_DYNAMIC_CLASS_XTI(wxHtmlWindow, wxScrolledWindow,"wx/html/htmlwin.h")
+
+wxBEGIN_PROPERTIES_TABLE(wxHtmlWindow)
+/*
+    TODO PROPERTIES
+        style , wxHW_SCROLLBAR_AUTO
+        borders , (dimension)
+        url , string
+        htmlcode , string
+*/
+wxEND_PROPERTIES_TABLE()
+
+wxBEGIN_HANDLERS_TABLE(wxHtmlWindow)
+wxEND_HANDLERS_TABLE()
+
+wxCONSTRUCTOR_5( wxHtmlWindow , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size , long , WindowStyle )
+#else

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

+#endif

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


@@ -1151,15 +1396,15 @@ BEGIN_EVENT_TABLE(wxHtmlWindow, wxScrolledWindow)
     EVT_LEFT_UP(wxHtmlWindow::OnMouseUp)
     EVT_RIGHT_UP(wxHtmlWindow::OnMouseUp)
     EVT_MOTION(wxHtmlWindow::OnMouseMove)
     EVT_LEFT_UP(wxHtmlWindow::OnMouseUp)
     EVT_RIGHT_UP(wxHtmlWindow::OnMouseUp)
     EVT_MOTION(wxHtmlWindow::OnMouseMove)

-    EVT_IDLE(wxHtmlWindow::OnIdle)

     EVT_ERASE_BACKGROUND(wxHtmlWindow::OnEraseBackground)
     EVT_PAINT(wxHtmlWindow::OnPaint)
 #if wxUSE_CLIPBOARD
     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)
     EVT_ENTER_WINDOW(wxHtmlWindow::OnMouseEnter)
     EVT_LEAVE_WINDOW(wxHtmlWindow::OnMouseLeave)
     EVT_KEY_UP(wxHtmlWindow::OnKeyUp)
     EVT_MENU(wxID_COPY, wxHtmlWindow::OnCopy)

-#endif
+#endif // wxUSE_CLIPBOARD

 END_EVENT_TABLE()
 
 
 END_EVENT_TABLE()
 
 


@@ -1175,7 +1420,7 @@ class wxHtmlWinModule: public wxModule
 DECLARE_DYNAMIC_CLASS(wxHtmlWinModule)
 public:
     wxHtmlWinModule() : wxModule() {}
 DECLARE_DYNAMIC_CLASS(wxHtmlWinModule)
 public:
     wxHtmlWinModule() : wxModule() {}

-    bool OnInit() { return TRUE; }
+    bool OnInit() { return true; }

     void OnExit() { wxHtmlWindow::CleanUpStatics(); }
 };
 
     void OnExit() { wxHtmlWindow::CleanUpStatics(); }
 };
 


@@ -1187,4 +1432,5 @@ IMPLEMENT_DYNAMIC_CLASS(wxHtmlWinModule, wxModule)
 #include "wx/html/forcelnk.h"
 FORCE_WXHTML_MODULES()
 
 #include "wx/html/forcelnk.h"
 FORCE_WXHTML_MODULES()
 

-#endif
+#endif // wxUSE_HTML
+