expand the collapsible panes contents to fill the entire pane area (see #11004)

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

diff --git a/src/html/htmlwin.cpp b/src/html/htmlwin.cpp
index 9b5fc735fa7d8ade199274be8fb6ed23600bbd12..058804ae6d00824fe7730c47c2c16502cda5a356 100644 (file)
--- a/src/html/htmlwin.cpp
+++ b/src/html/htmlwin.cpp
@@ -15,25 +15,37 @@
 
 #if wxUSE_HTML && wxUSE_STREAMS
 
 
 #if wxUSE_HTML && wxUSE_STREAMS
 

-#ifndef WXPRECOMP
+#ifndef WX_PRECOMP
+    #include "wx/list.h"

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

+    #include "wx/dcmemory.h"
+    #include "wx/timer.h"
+    #include "wx/settings.h"
+    #include "wx/dataobj.h"
+    #include "wx/statusbr.h"

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

-#include "wx/list.h"

 #include "wx/clipbrd.h"
 #include "wx/clipbrd.h"

-#include "wx/dataobj.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"
 

+// uncomment this line to visually show the extent of the selection
+//#define DEBUG_HTML_SELECTION
+
+// HTML events:
+IMPLEMENT_DYNAMIC_CLASS(wxHtmlLinkEvent, wxCommandEvent)
+IMPLEMENT_DYNAMIC_CLASS(wxHtmlCellEvent, wxCommandEvent)
+
+wxDEFINE_EVENT( wxEVT_COMMAND_HTML_CELL_CLICKED, wxHtmlCellEvent );
+wxDEFINE_EVENT( wxEVT_COMMAND_HTML_CELL_HOVER, wxHtmlCellEvent );
+wxDEFINE_EVENT( wxEVT_COMMAND_HTML_LINK_CLICKED, wxHtmlLinkEvent );
+

 
 #if wxUSE_CLIPBOARD
 // ----------------------------------------------------------------------------
 
 #if wxUSE_CLIPBOARD
 // ----------------------------------------------------------------------------


@@ -62,7 +74,7 @@ private:
     int m_pos,
         m_orient;
 
     int m_pos,
         m_orient;
 

-    DECLARE_NO_COPY_CLASS(wxHtmlWinAutoScrollTimer)
+    wxDECLARE_NO_COPY_CLASS(wxHtmlWinAutoScrollTimer);

 };
 
 void wxHtmlWinAutoScrollTimer::Notify()
 };
 
 void wxHtmlWinAutoScrollTimer::Notify()


@@ -227,18 +239,36 @@ bool wxHtmlWindowMouseHelper::OnCellClicked(wxHtmlCell *cell,
                                             wxCoord x, wxCoord y,
                                             const wxMouseEvent& event)
 {
                                             wxCoord x, wxCoord y,
                                             const wxMouseEvent& event)
 {

-    wxCHECK_MSG( cell, false, _T("can't be called with NULL cell") );
+    wxHtmlCellEvent ev(wxEVT_COMMAND_HTML_CELL_CLICKED,
+                       m_interface->GetHTMLWindow()->GetId(),
+                       cell, wxPoint(x,y), event);
+
+    if (!m_interface->GetHTMLWindow()->GetEventHandler()->ProcessEvent(ev))
+    {
+        // if the event wasn't handled, do the default processing here:

 
 

-    return cell->ProcessMouseClick(m_interface, wxPoint(x, y), event);
+        wxASSERT_MSG( cell, _T("can't be called with NULL cell") );
+
+        cell->ProcessMouseClick(m_interface, ev.GetPoint(), ev.GetMouseEvent());
+    }
+
+    // true if a link was clicked, false otherwise
+    return ev.GetLinkClicked();

 }
 
 }
 

-void wxHtmlWindowMouseHelper::OnCellMouseHover(wxHtmlCell * WXUNUSED(cell),
-                                               wxCoord WXUNUSED(x),
-                                               wxCoord WXUNUSED(y))
+void wxHtmlWindowMouseHelper::OnCellMouseHover(wxHtmlCell * cell,
+                                               wxCoord x,
+                                               wxCoord y)

 {
 {

-    // do nothing here
+    wxHtmlCellEvent ev(wxEVT_COMMAND_HTML_CELL_HOVER,
+                       m_interface->GetHTMLWindow()->GetId(),
+                       cell, wxPoint(x,y), wxMouseEvent());
+    m_interface->GetHTMLWindow()->GetEventHandler()->ProcessEvent(ev);

 }
 
 }
 

+
+
+

 //-----------------------------------------------------------------------------
 // wxHtmlWindow
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // wxHtmlWindow
 //-----------------------------------------------------------------------------


@@ -265,7 +295,8 @@ void wxHtmlWindow::Init()
     m_tmpCanDrawLocks = 0;
     m_FS = new wxFileSystem();
 #if wxUSE_STATUSBAR
     m_tmpCanDrawLocks = 0;
     m_FS = new wxFileSystem();
 #if wxUSE_STATUSBAR

-    m_RelatedStatusBar = -1;
+    m_RelatedStatusBar = NULL;
+    m_RelatedStatusBarIndex = -1;

 #endif // wxUSE_STATUSBAR
     m_RelatedFrame = NULL;
     m_TitleFormat = wxT("%s");
 #endif // wxUSE_STATUSBAR
     m_RelatedFrame = NULL;
     m_TitleFormat = wxT("%s");


@@ -277,7 +308,6 @@ void wxHtmlWindow::Init()
     m_HistoryOn = true;
     m_History = new wxHtmlHistoryArray;
     m_Processors = NULL;
     m_HistoryOn = true;
     m_History = new wxHtmlHistoryArray;
     m_Processors = NULL;

-    m_Style = 0;

     SetBorders(10);
     m_selection = NULL;
     m_makingSelection = false;
     SetBorders(10);
     m_selection = NULL;
     m_makingSelection = false;


@@ -285,8 +315,6 @@ void wxHtmlWindow::Init()
     m_timerAutoScroll = NULL;
     m_lastDoubleClick = 0;
 #endif // wxUSE_CLIPBOARD
     m_timerAutoScroll = NULL;
     m_lastDoubleClick = 0;
 #endif // wxUSE_CLIPBOARD

-    m_backBuffer = NULL;
-    m_eraseBgInOnPaint = false;

     m_tmpSelFromCell = NULL;
 }
 
     m_tmpSelFromCell = NULL;
 }
 


@@ -299,7 +327,18 @@ bool wxHtmlWindow::Create(wxWindow *parent, wxWindowID id,
                                   name))
         return false;
 
                                   name))
         return false;
 

-    m_Style = style;
+    // We can't erase our background in EVT_ERASE_BACKGROUND handler and use
+    // double buffering in EVT_PAINT handler as this requires blitting back
+    // something already drawn on the window to the backing store bitmap when
+    // handling EVT_PAINT but blitting in this direction is simply not
+    // supported by OS X.
+    //
+    // So instead we use a hack with artificial EVT_ERASE_BACKGROUND generation
+    // from OnPaint() and this means that we never need the "real" erase event
+    // at all so disable it to avoid executing any user-defined handlers twice
+    // (and to avoid processing unnecessary event if no handlers are defined).
+    SetBackgroundStyle(wxBG_STYLE_PAINT);
+

     SetPage(wxT("<html><body></body></html>"));
     return true;
 }
     SetPage(wxT("<html><body></body></html>"));
     return true;
 }


@@ -325,7 +364,6 @@ wxHtmlWindow::~wxHtmlWindow()
     delete m_FS;
     delete m_History;
     delete m_Processors;
     delete m_FS;
     delete m_History;
     delete m_Processors;

-    delete m_backBuffer;

 }
 
 
 }
 
 


@@ -339,10 +377,17 @@ void wxHtmlWindow::SetRelatedFrame(wxFrame* frame, const wxString& format)
 
 
 #if wxUSE_STATUSBAR
 
 
 #if wxUSE_STATUSBAR

-void wxHtmlWindow::SetRelatedStatusBar(int bar)
+void wxHtmlWindow::SetRelatedStatusBar(int index)
+{
+    m_RelatedStatusBarIndex = index;
+}
+
+void wxHtmlWindow::SetRelatedStatusBar(wxStatusBar* statusbar, int index)

 {
 {

-    m_RelatedStatusBar = bar;
+    m_RelatedStatusBar =  statusbar;
+    m_RelatedStatusBarIndex = index;

 }
 }

+

 #endif // wxUSE_STATUSBAR
 
 
 #endif // wxUSE_STATUSBAR
 
 


@@ -444,9 +489,10 @@ bool wxHtmlWindow::AppendToPage(const wxString& source)
 
 bool wxHtmlWindow::LoadPage(const wxString& location)
 {
 
 bool wxHtmlWindow::LoadPage(const wxString& location)
 {

+    wxCHECK_MSG( !location.empty(), false, "location must be non-empty" );
+

     wxBusyCursor busyCursor;
 
     wxBusyCursor busyCursor;
 

-    wxFSFile *f;

     bool rt_val;
     bool needs_refresh = false;
 
     bool rt_val;
     bool needs_refresh = false;
 


@@ -459,43 +505,40 @@ bool wxHtmlWindow::LoadPage(const wxString& location)
         (*m_History)[m_HistoryPos].SetPos(y);
     }
 
         (*m_History)[m_HistoryPos].SetPos(y);
     }
 

-    if (location[0] == wxT('#'))
+    // first check if we're moving to an anchor in the same page
+    size_t posLocalAnchor = location.Find('#');
+    if ( posLocalAnchor != wxString::npos && posLocalAnchor != 0 )

     {
     {

-        // local anchor:
-        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++;
+        // check if the part before the anchor is the same as the (either
+        // relative or absolute) URI of the current page
+        const wxString beforeAnchor = location.substr(0, posLocalAnchor);
+        if ( beforeAnchor != m_OpenedPage &&
+                m_FS->GetPath() + beforeAnchor != m_OpenedPage )
+        {
+            // indicate that we're not moving to a local anchor
+            posLocalAnchor = wxString::npos;
+        }

     }
     }

-    else if (location.Find(wxT('#')) != wxNOT_FOUND &&
-             (m_FS->GetPath() + location.BeforeFirst(wxT('#'))) == m_OpenedPage)
+
+    if ( posLocalAnchor != wxString::npos )

     {
     {

-        wxString anch = location.AfterFirst(wxT('#'));

         m_tmpCanDrawLocks--;
         m_tmpCanDrawLocks--;

-        rt_val = ScrollToAnchor(anch);
+        rt_val = ScrollToAnchor(location.substr(posLocalAnchor + 1));

         m_tmpCanDrawLocks++;
     }
         m_tmpCanDrawLocks++;
     }

-
-    else
+    else // moving to another page

     {
         needs_refresh = true;
 #if wxUSE_STATUSBAR
         // load&display it:
     {
         needs_refresh = true;
 #if wxUSE_STATUSBAR
         // load&display it:

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

         {
         {

-            m_RelatedFrame->SetStatusText(_("Connecting..."), m_RelatedStatusBar);
+            SetHTMLStatusText(_("Connecting..."));

             Refresh(false);
         }
 #endif // wxUSE_STATUSBAR
 
             Refresh(false);
         }
 #endif // wxUSE_STATUSBAR
 

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

 
         // try to interpret 'location' as filename instead of URL:
         if (f == NULL)
 
         // try to interpret 'location' as filename instead of URL:
         if (f == NULL)


@@ -509,6 +552,7 @@ 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--;

+            SetHTMLStatusText(wxEmptyString);

             return false;
         }
 
             return false;
         }
 


@@ -518,10 +562,10 @@ bool wxHtmlWindow::LoadPage(const wxString& location)
             wxString src = wxEmptyString;
 
 #if wxUSE_STATUSBAR
             wxString src = wxEmptyString;
 
 #if wxUSE_STATUSBAR

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

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

-                m_RelatedFrame->SetStatusText(msg, m_RelatedStatusBar);
+                SetHTMLStatusText(msg);

                 Refresh(false);
             }
 #endif // wxUSE_STATUSBAR
                 Refresh(false);
             }
 #endif // wxUSE_STATUSBAR


@@ -554,8 +598,10 @@ bool wxHtmlWindow::LoadPage(const wxString& location)
             delete f;
 
 #if wxUSE_STATUSBAR
             delete f;
 
 #if wxUSE_STATUSBAR

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

 #endif // wxUSE_STATUSBAR
         }
     }
 #endif // wxUSE_STATUSBAR
         }
     }


@@ -638,14 +684,14 @@ void wxHtmlWindow::CreateLayout()
 
     if (!m_Cell) return;
 
 
     if (!m_Cell) return;
 

-    if (m_Style & wxHW_SCROLLBAR_NEVER)
+    if ( HasFlag(wxHW_SCROLLBAR_NEVER) )

     {
     {

-        SetScrollbars(wxHTML_SCROLL_STEP, 1, m_Cell->GetWidth() / wxHTML_SCROLL_STEP, 0); // always off
+        SetScrollbars(1, 1, 0, 0); // always off

         GetClientSize(&ClientWidth, &ClientHeight);
         m_Cell->Layout(ClientWidth);
     }
         GetClientSize(&ClientWidth, &ClientHeight);
         m_Cell->Layout(ClientWidth);
     }

-
-    else {
+    else // !wxHW_SCROLLBAR_NEVER
+    {

         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())


@@ -842,7 +888,7 @@ void wxHtmlWindow::AddFilter(wxHtmlFilter *filter)
 bool wxHtmlWindow::IsSelectionEnabled() const
 {
 #if wxUSE_CLIPBOARD
 bool wxHtmlWindow::IsSelectionEnabled() const
 {
 #if wxUSE_CLIPBOARD

-    return !(m_Style & wxHW_NO_SELECTION);
+    return !HasFlag(wxHW_NO_SELECTION);

 #else
     return false;
 #endif
 #else
     return false;
 #endif


@@ -856,21 +902,27 @@ wxString wxHtmlWindow::DoSelectionToText(wxHtmlSelection *sel)
         return wxEmptyString;
 
     wxClientDC dc(this);
         return wxEmptyString;
 
     wxClientDC dc(this);

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

     wxString text;
     wxString text;

-    wxHtmlTerminalCellsInterator i(sel->GetFromCell(), end);
-    if ( i )
-    {
-        text << i->ConvertToText(sel);
-        ++i;
-    }
-    const wxHtmlCell *prev = *i;
+
+    wxHtmlTerminalCellsInterator i(sel->GetFromCell(), sel->GetToCell());
+    const wxHtmlCell *prev = NULL;
+

     while ( i )
     {
     while ( i )
     {

-        if ( prev->GetParent() != i->GetParent() )
-            text << _T('\n');
-        text << i->ConvertToText(*i == end ? sel : NULL);
+        // When converting HTML content to plain text, the entire paragraph
+        // (container in wxHTML) goes on single line. A new paragraph (that
+        // should go on its own line) has its own container. Therefore, the
+        // simplest way of detecting where to insert newlines in plain text
+        // is to check if the parent container changed -- if it did, we moved
+        // to a new paragraph.
+        if ( prev && prev->GetParent() != i->GetParent() )
+            text << '\n';
+
+        // NB: we don't need to pass the selection to ConvertToText() in the
+        //     middle of the selected text; it's only useful when only part of
+        //     a cell is selected
+        text << i->ConvertToText(sel);
+

         prev = *i;
         ++i;
     }
         prev = *i;
         ++i;
     }


@@ -928,95 +980,100 @@ bool wxHtmlWindow::CopySelection(ClipboardType t)
 
 void wxHtmlWindow::OnLinkClicked(const wxHtmlLinkInfo& link)
 {
 
 void wxHtmlWindow::OnLinkClicked(const wxHtmlLinkInfo& link)
 {

-    const wxMouseEvent *e = link.GetEvent();
-    if (e == NULL || e->LeftUp())
-        LoadPage(link.GetHref());
-}
-
-void wxHtmlWindow::OnEraseBackground(wxEraseEvent& event)
-{
-    if ( !m_bmpBg.Ok() )
+    wxHtmlLinkEvent event(GetId(), link);
+    event.SetEventObject(this);
+    if (!GetEventHandler()->ProcessEvent(event))

     {
     {

-        // don't even skip the event, if we don't have a bg bitmap we're going
-        // to overwrite background in OnPaint() below anyhow, so letting the
-        // default handling take place would only result in flicker, just set a
-        // flag to erase the background below
-        m_eraseBgInOnPaint = true;
-        return;
+        // the default behaviour is to load the URL in this window
+        const wxMouseEvent *e = event.GetLinkInfo().GetEvent();
+        if (e == NULL || e->LeftUp())
+            LoadPage(event.GetLinkInfo().GetHref());

     }
     }

+}

 
 

-    wxDC& dc = *event.GetDC();
-
-    // if the image is not fully opaque, we have to erase the background before
-    // drawing it, however avoid doing it for opaque images as this would just
-    // result in extra flicker without any other effect as background is
-    // completely covered anyhow
-    if ( m_bmpBg.GetMask() )
+void wxHtmlWindow::DoEraseBackground(wxDC& dc)
+{
+    // if we don't have any background bitmap we just fill it with background
+    // colour and we also must do it if the background bitmap is not fully
+    // opaque as otherwise junk could be left there
+    if ( !m_bmpBg.IsOk() || m_bmpBg.GetMask() )

     {
     {

-        dc.SetBackground(wxBrush(GetBackgroundColour(), wxSOLID));
+        dc.SetBackground(GetBackgroundColour());

         dc.Clear();
     }
 
         dc.Clear();
     }
 

-    const wxSize sizeWin(GetClientSize());
-    const wxSize sizeBmp(m_bmpBg.GetWidth(), m_bmpBg.GetHeight());
-    for ( wxCoord x = 0; x < sizeWin.x; x += sizeBmp.x )
+    if ( m_bmpBg.IsOk() )

     {
     {

-        for ( wxCoord y = 0; y < sizeWin.y; y += sizeBmp.y )
+        // draw the background bitmap tiling it over the entire window area
+        const wxSize sz = GetClientSize();
+        const wxSize sizeBmp(m_bmpBg.GetWidth(), m_bmpBg.GetHeight());
+        for ( wxCoord x = 0; x < sz.x; x += sizeBmp.x )

         {
         {

-            dc.DrawBitmap(m_bmpBg, x, y, true /* use mask */);
+            for ( wxCoord y = 0; y < sz.y; y += sizeBmp.y )
+            {
+                dc.DrawBitmap(m_bmpBg, x, y, true /* use mask */);
+            }

         }
     }
 }
 
 void wxHtmlWindow::OnPaint(wxPaintEvent& WXUNUSED(event))
 {
         }
     }
 }
 
 void wxHtmlWindow::OnPaint(wxPaintEvent& WXUNUSED(event))
 {

-    wxPaintDC dc(this);
+    wxPaintDC dcPaint(this);

 
     if (m_tmpCanDrawLocks > 0 || m_Cell == NULL)
         return;
 
     int x, y;
     GetViewStart(&x, &y);
 
     if (m_tmpCanDrawLocks > 0 || m_Cell == NULL)
         return;
 
     int x, y;
     GetViewStart(&x, &y);

-    wxRect rect = GetUpdateRegion().GetBox();
-    wxSize sz = GetSize();
-
+    const wxRect rect = GetUpdateRegion().GetBox();
+    const wxSize sz = GetClientSize();
+
+    // set up the DC we're drawing on: if the window is already double buffered
+    // we do it directly on wxPaintDC, otherwise we allocate a backing store
+    // buffer and compose the drawing there and then blit it to screen all at
+    // once
+    wxDC *dc;

     wxMemoryDC dcm;
     wxMemoryDC dcm;

-    if ( !m_backBuffer )
-        m_backBuffer = new wxBitmap(sz.x, sz.y);
-    dcm.SelectObject(*m_backBuffer);
-
-    if ( m_eraseBgInOnPaint )
+    if ( IsDoubleBuffered() )

     {
     {

-        dcm.SetBackground(wxBrush(GetBackgroundColour(), wxSOLID));
-        dcm.Clear();
-
-        m_eraseBgInOnPaint = false;
+        dc = &dcPaint;

     }
     }

-    else // someone has already erased the background, keep it
+    else // window is not double buffered by the system, do it ourselves

     {
     {

-        // preserve the existing background, otherwise we'd erase anything the
-        // user code had drawn in its EVT_ERASE_BACKGROUND handler when we do
-        // the Blit back below
-        dcm.Blit(0, rect.GetTop(),
-                 sz.x, rect.GetBottom() - rect.GetTop() + 1,
-                 &dc,
-                 0, rect.GetTop());
+        if ( !m_backBuffer.IsOk() )
+            m_backBuffer.Create(sz.x, sz.y);
+        dcm.SelectObject(m_backBuffer);
+        dc = &dcm;

     }
 
     }
 

-    PrepareDC(dcm);
-    dcm.SetMapMode(wxMM_TEXT);
-    dcm.SetBackgroundMode(wxTRANSPARENT);
+    PrepareDC(*dc);
+
+    // erase the background: for compatibility, we must generate the event to
+    // allow the user-defined handlers to do it
+    wxEraseEvent eraseEvent(GetId(), dc);
+    eraseEvent.SetEventObject(this);
+    if ( !ProcessWindowEvent(eraseEvent) )
+    {
+        // erase background ourselves
+        DoEraseBackground(*dc);
+    }
+    //else: background erased by the user-defined handler
+
+
+    // draw the HTML window contents
+    dc->SetMapMode(wxMM_TEXT);
+    dc->SetBackgroundMode(wxBRUSHSTYLE_TRANSPARENT);

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

-    m_Cell->Draw(dcm, 0, 0,
+    m_Cell->Draw(*dc, 0, 0,

                  y * wxHTML_SCROLL_STEP + rect.GetTop(),
                  y * wxHTML_SCROLL_STEP + rect.GetBottom(),
                  rinfo);
 
                  y * wxHTML_SCROLL_STEP + rect.GetTop(),
                  y * wxHTML_SCROLL_STEP + rect.GetBottom(),
                  rinfo);
 

-//#define DEBUG_HTML_SELECTION

 #ifdef DEBUG_HTML_SELECTION
     {
     int xc, yc, x, y;
 #ifdef DEBUG_HTML_SELECTION
     {
     int xc, yc, x, y;


@@ -1029,27 +1086,30 @@ void wxHtmlWindow::OnPaint(wxPaintEvent& WXUNUSED(event))
     wxHtmlCell *after =
         m_Cell->FindCellByPos(x, y, wxHTML_FIND_NEAREST_AFTER);
 
     wxHtmlCell *after =
         m_Cell->FindCellByPos(x, y, wxHTML_FIND_NEAREST_AFTER);
 

-    dcm.SetBrush(*wxTRANSPARENT_BRUSH);
-    dcm.SetPen(*wxBLACK_PEN);
+    dc->SetBrush(*wxTRANSPARENT_BRUSH);
+    dc->SetPen(*wxBLACK_PEN);

     if (at)
     if (at)

-        dcm.DrawRectangle(at->GetAbsPos(),
+        dc->DrawRectangle(at->GetAbsPos(),

                           wxSize(at->GetWidth(),at->GetHeight()));
                           wxSize(at->GetWidth(),at->GetHeight()));

-    dcm.SetPen(*wxGREEN_PEN);
+    dc->SetPen(*wxGREEN_PEN);

     if (before)
     if (before)

-        dcm.DrawRectangle(before->GetAbsPos().x+1, before->GetAbsPos().y+1,
+        dc->DrawRectangle(before->GetAbsPos().x+1, before->GetAbsPos().y+1,

                           before->GetWidth()-2,before->GetHeight()-2);
                           before->GetWidth()-2,before->GetHeight()-2);

-    dcm.SetPen(*wxRED_PEN);
+    dc->SetPen(*wxRED_PEN);

     if (after)
     if (after)

-        dcm.DrawRectangle(after->GetAbsPos().x+2, after->GetAbsPos().y+2,
+        dc->DrawRectangle(after->GetAbsPos().x+2, after->GetAbsPos().y+2,

                           after->GetWidth()-4,after->GetHeight()-4);
     }
                           after->GetWidth()-4,after->GetHeight()-4);
     }

-#endif
+#endif // DEBUG_HTML_SELECTION

 
 

-    dcm.SetDeviceOrigin(0,0);
-    dc.Blit(0, rect.GetTop(),
-            sz.x, rect.GetBottom() - rect.GetTop() + 1,
-            &dcm,
-            0, rect.GetTop());
+    if ( dc != &dcPaint )
+    {
+        dc->SetDeviceOrigin(0,0);
+        dcPaint.Blit(0, rect.GetTop(),
+                     sz.x, rect.GetBottom() - rect.GetTop() + 1,
+                     dc,
+                     0, rect.GetTop());
+    }

 }
 
 
 }
 
 


@@ -1057,9 +1117,10 @@ void wxHtmlWindow::OnPaint(wxPaintEvent& WXUNUSED(event))
 
 void wxHtmlWindow::OnSize(wxSizeEvent& event)
 {
 
 void wxHtmlWindow::OnSize(wxSizeEvent& event)
 {

-    wxDELETE(m_backBuffer);
+    event.Skip();
+
+    m_backBuffer = wxNullBitmap;

 
 

-    wxScrolledWindow::OnSize(event);

     CreateLayout();
 
     // Recompute selection if necessary:
     CreateLayout();
 
     // Recompute selection if necessary:


@@ -1106,9 +1167,10 @@ void wxHtmlWindow::OnMouseDown(wxMouseEvent& event)
             CaptureMouse();
         }
     }
             CaptureMouse();
         }
     }

-#else
-    wxUnusedVar(event);

 #endif // wxUSE_CLIPBOARD
 #endif // wxUSE_CLIPBOARD

+
+    // in any case, let the default handler set focus to this window
+    event.Skip();

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


@@ -1119,9 +1181,13 @@ void wxHtmlWindow::OnMouseUp(wxMouseEvent& event)
         ReleaseMouse();
         m_makingSelection = false;
 
         ReleaseMouse();
         m_makingSelection = false;
 

-        // did the user move the mouse far enough from starting point?
-        if ( CopySelection(Primary) )
+        // if m_selection=NULL, the user didn't move the mouse far enough from
+        // starting point and the mouse up event is part of a click, the user
+        // is not selecting text:
+        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;
             // we don't want mouse up event that ended selecting to be
             // handled as mouse click and e.g. follow hyperlink:
             return;


@@ -1129,12 +1195,23 @@ void wxHtmlWindow::OnMouseUp(wxMouseEvent& event)
     }
 #endif // wxUSE_CLIPBOARD
 
     }
 #endif // wxUSE_CLIPBOARD
 

-    SetFocus();
-

     wxPoint pos = CalcUnscrolledPosition(event.GetPosition());
     wxHtmlWindowMouseHelper::HandleMouseClick(m_Cell, pos, event);
 }
 
     wxPoint pos = CalcUnscrolledPosition(event.GetPosition());
     wxHtmlWindowMouseHelper::HandleMouseClick(m_Cell, pos, event);
 }
 

+#if wxUSE_CLIPBOARD
+void wxHtmlWindow::OnMouseCaptureLost(wxMouseCaptureLostEvent& WXUNUSED(event))
+{
+    if ( !m_makingSelection )
+        return;
+
+    // discard the selecting operation
+    m_makingSelection = false;
+    wxDELETE(m_selection);
+    m_tmpSelFromCell = NULL;
+    Refresh();
+}
+#endif // wxUSE_CLIPBOARD

 
 
 void wxHtmlWindow::OnInternalIdle()
 
 
 void wxHtmlWindow::OnInternalIdle()


@@ -1245,7 +1322,8 @@ void wxHtmlWindow::OnInternalIdle()
                     if ( m_tmpSelFromCell->IsBefore(selcell) )
                     {
                         m_selection->Set(m_tmpSelFromPos, m_tmpSelFromCell,
                     if ( m_tmpSelFromCell->IsBefore(selcell) )
                     {
                         m_selection->Set(m_tmpSelFromPos, m_tmpSelFromCell,

-                                         wxPoint(x,y), selcell);                                    }
+                                         wxPoint(x,y), selcell);
+                    }

                     else
                     {
                         m_selection->Set(wxPoint(x,y), selcell,
                     else
                     {
                         m_selection->Set(wxPoint(x,y), selcell,


@@ -1351,9 +1429,14 @@ void wxHtmlWindow::OnMouseLeave(wxMouseEvent& event)
 
 void wxHtmlWindow::OnKeyUp(wxKeyEvent& event)
 {
 
 void wxHtmlWindow::OnKeyUp(wxKeyEvent& event)
 {

-    if ( IsSelectionEnabled() && event.GetKeyCode() == 'C' && event.CmdDown() )
+    if ( IsSelectionEnabled() &&
+            (event.GetKeyCode() == 'C' && event.CmdDown()) )

     {
     {

-        (void) CopySelection();
+        wxClipboardTextEvent evt(wxEVT_COMMAND_TEXT_COPY, GetId());
+
+        evt.SetEventObject(this);
+
+        GetEventHandler()->ProcessEvent(evt);

     }
 }
 
     }
 }
 


@@ -1362,6 +1445,11 @@ void wxHtmlWindow::OnCopy(wxCommandEvent& WXUNUSED(event))
     (void) CopySelection();
 }
 
     (void) CopySelection();
 }
 

+void wxHtmlWindow::OnClipboardEvent(wxClipboardTextEvent& WXUNUSED(event))
+{
+    (void) CopySelection();
+}
+

 void wxHtmlWindow::OnDoubleClick(wxMouseEvent& event)
 {
     // select word under cursor:
 void wxHtmlWindow::OnDoubleClick(wxMouseEvent& event)
 {
     // select word under cursor:


@@ -1493,14 +1581,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_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_PAINT(wxHtmlWindow::OnPaint)
 #if wxUSE_CLIPBOARD
     EVT_LEFT_DCLICK(wxHtmlWindow::OnDoubleClick)
     EVT_ENTER_WINDOW(wxHtmlWindow::OnMouseEnter)
     EVT_LEAVE_WINDOW(wxHtmlWindow::OnMouseLeave)

+    EVT_MOUSE_CAPTURE_LOST(wxHtmlWindow::OnMouseCaptureLost)

     EVT_KEY_UP(wxHtmlWindow::OnKeyUp)
     EVT_MENU(wxID_COPY, wxHtmlWindow::OnCopy)
     EVT_KEY_UP(wxHtmlWindow::OnKeyUp)
     EVT_MENU(wxID_COPY, wxHtmlWindow::OnCopy)

+    EVT_TEXT_COPY(wxID_ANY, wxHtmlWindow::OnClipboardEvent)

 #endif // wxUSE_CLIPBOARD
 END_EVENT_TABLE()
 
 #endif // wxUSE_CLIPBOARD
 END_EVENT_TABLE()
 


@@ -1554,8 +1643,19 @@ void wxHtmlWindow::SetHTMLBackgroundImage(const wxBitmap& bmpBg)
 void wxHtmlWindow::SetHTMLStatusText(const wxString& text)
 {
 #if wxUSE_STATUSBAR
 void wxHtmlWindow::SetHTMLStatusText(const wxString& text)
 {
 #if wxUSE_STATUSBAR

-    if (m_RelatedStatusBar != -1)
-        m_RelatedFrame->SetStatusText(text, m_RelatedStatusBar);
+    if (m_RelatedStatusBarIndex != -1)
+    {
+        if (m_RelatedStatusBar)
+        {
+            m_RelatedStatusBar->SetStatusText(text, m_RelatedStatusBarIndex);
+        }
+        else if (m_RelatedFrame)
+        {
+            m_RelatedFrame->SetStatusText(text, m_RelatedStatusBarIndex);
+        }
+    }
+#else
+    wxUnusedVar(text);

 #endif // wxUSE_STATUSBAR
 }
 
 #endif // wxUSE_STATUSBAR
 }
 


@@ -1612,4 +1712,3 @@ IMPLEMENT_DYNAMIC_CLASS(wxHtmlWinModule, wxModule)
 FORCE_WXHTML_MODULES()
 
 #endif // wxUSE_HTML
 FORCE_WXHTML_MODULES()
 
 #endif // wxUSE_HTML

-