PRIOR/NEXT build fixes.

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

diff --git a/src/html/htmlwin.cpp b/src/html/htmlwin.cpp
index b7744b5cdcc110325531ad4e2c752c836242db28..7d71dd82d704afe31b391cd33ffe95ee870aac48 100644 (file)
--- a/src/html/htmlwin.cpp
+++ b/src/html/htmlwin.cpp
@@ -4,15 +4,9 @@
 // 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

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

-
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "htmlwin.h"
-#pragma implementation "htmlproc.h"
-#endif
-

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


@@ -36,12 +30,12 @@
 #include "wx/dataobj.h"
 #include "wx/timer.h"
 #include "wx/dcmemory.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"
 
 

-

 #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


@@ -141,10 +135,10 @@ private:
 //-----------------------------------------------------------------------------
 
 WX_DECLARE_OBJARRAY(wxHtmlHistoryItem, wxHtmlHistoryArray);
 //-----------------------------------------------------------------------------
 
 WX_DECLARE_OBJARRAY(wxHtmlHistoryItem, wxHtmlHistoryArray);

-WX_DEFINE_OBJARRAY(wxHtmlHistoryArray);
+WX_DEFINE_OBJARRAY(wxHtmlHistoryArray)

 
 WX_DECLARE_LIST(wxHtmlProcessor, wxHtmlProcessorList);
 
 WX_DECLARE_LIST(wxHtmlProcessor, wxHtmlProcessorList);

-WX_DEFINE_LIST(wxHtmlProcessorList);
+WX_DEFINE_LIST(wxHtmlProcessorList)

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


@@ -153,12 +147,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;


@@ -166,7 +162,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;


@@ -178,6 +174,8 @@ void wxHtmlWindow::Init()
     m_lastDoubleClick = 0;
 #endif // wxUSE_CLIPBOARD
     m_backBuffer = NULL;
     m_lastDoubleClick = 0;
 #endif // wxUSE_CLIPBOARD
     m_backBuffer = NULL;

+    m_eraseBgInOnPaint = false;
+    m_tmpSelFromCell = NULL;

 }
 
 bool wxHtmlWindow::Create(wxWindow *parent, wxWindowID id,
 }
 
 bool wxHtmlWindow::Create(wxWindow *parent, wxWindowID id,


@@ -187,11 +185,11 @@ bool wxHtmlWindow::Create(wxWindow *parent, wxWindowID id,
     if (!wxScrolledWindow::Create(parent, id, pos, size,
                                   style | wxVSCROLL | wxHSCROLL,
                                   name))
     if (!wxScrolledWindow::Create(parent, id, pos, size,
                                   style | wxVSCROLL | wxHSCROLL,
                                   name))

-        return FALSE;
+        return false;

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

-    return TRUE;
+    return true;

 }
 
 
 }
 
 


@@ -228,39 +226,58 @@ 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

 
 
 
 
 
 

-void wxHtmlWindow::SetFonts(wxString normal_face, wxString fixed_face, const int *sizes)
+void wxHtmlWindow::SetFonts(const wxString& normal_face, const wxString& fixed_face, const int *sizes)

 {
 {

-    wxString op = m_OpenedPage;
-

     m_Parser->SetFonts(normal_face, fixed_face, sizes);
     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);
+
+    // re-layout the page after changing fonts:
+    DoSetPage(*(m_Parser->GetSource()));

 }
 
 }
 

+void wxHtmlWindow::SetStandardFonts(int size,
+                                    const wxString& normal_face,
+                                    const wxString& fixed_face)
+{
+    m_Parser->SetStandardFonts(size, normal_face, fixed_face);

 
 

+    // re-layout the page after changing fonts:
+    DoSetPage(*(m_Parser->GetSource()));
+}

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

+{
+    m_OpenedPage = m_OpenedAnchor = m_OpenedPageTitle = wxEmptyString;
+    return DoSetPage(source);
+}
+
+bool wxHtmlWindow::DoSetPage(const wxString& source)

 {
     wxString newsrc(source);
 
     wxDELETE(m_selection);
 
 {
     wxString newsrc(source);
 
     wxDELETE(m_selection);
 

+    // we will soon delete all the cells, so clear pointers to them:
+    m_tmpSelFromCell = NULL;
+

     // pass HTML through registered processors:
     if (m_Processors || m_GlobalProcessors)
     {
         wxHtmlProcessorList::compatibility_iterator nodeL, nodeG;
         int prL, prG;
 
     // pass HTML through registered processors:
     if (m_Processors || m_GlobalProcessors)
     {
         wxHtmlProcessorList::compatibility_iterator nodeL, nodeG;
         int prL, prG;
 

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

 
         // 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


@@ -290,7 +307,8 @@ bool wxHtmlWindow::SetPage(const wxString& source)
     wxClientDC *dc = new wxClientDC(this);
     dc->SetMapMode(wxMM_TEXT);
     SetBackgroundColour(wxColour(0xFF, 0xFF, 0xFF));
     wxClientDC *dc = new wxClientDC(this);
     dc->SetMapMode(wxMM_TEXT);
     SetBackgroundColour(wxColour(0xFF, 0xFF, 0xFF));

-    m_OpenedPage = m_OpenedAnchor = m_OpenedPageTitle = wxEmptyString;
+    SetBackgroundImage(wxNullBitmap);
+

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


@@ -304,12 +322,12 @@ 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)
 {

-    return SetPage(*(GetParser()->GetSource()) + source);
+    return DoSetPage(*(GetParser()->GetSource()) + source);

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


@@ -318,7 +336,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))


@@ -355,13 +373,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);
 


@@ -377,7 +397,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--;

-            return FALSE;
+            return false;

         }
 
         else
         }
 
         else


@@ -385,12 +405,14 @@ bool wxHtmlWindow::LoadPage(const wxString& location)
             wxList::compatibility_iterator node;
             wxString src = wxEmptyString;
 
             wxList::compatibility_iterator node;
             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)


@@ -419,7 +441,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

         }
     }
 
         }
     }
 


@@ -466,7 +491,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
     {


@@ -475,7 +500,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;

     }
 }
 
     }
 }
 


@@ -589,7 +614,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;


@@ -601,21 +626,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 ;

 }
 
 
 }
 
 


@@ -623,30 +648,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 ;

 }
 
 
 }
 
 


@@ -728,19 +753,19 @@ bool wxHtmlWindow::IsSelectionEnabled() const
 
 
 #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;


@@ -748,13 +773,25 @@ 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;
 }
 

+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)
 #endif // wxUSE_CLIPBOARD
 
 bool wxHtmlWindow::CopySelection(ClipboardType t)


@@ -762,7 +799,7 @@ bool wxHtmlWindow::CopySelection(ClipboardType t)
 #if wxUSE_CLIPBOARD
     if ( m_selection )
     {
 #if wxUSE_CLIPBOARD
     if ( m_selection )
     {

-#ifdef __UNIX__
+#if defined(__UNIX__) && !defined(__WXMAC__)

         wxTheClipboard->UsePrimarySelection(t == Primary);
 #else // !__UNIX__
         // Primary selection exists only under X11, so don't do anything under
         wxTheClipboard->UsePrimarySelection(t == Primary);
 #else // !__UNIX__
         // Primary selection exists only under X11, so don't do anything under


@@ -784,6 +821,8 @@ bool wxHtmlWindow::CopySelection(ClipboardType t)
             return true;
         }
     }
             return true;
         }
     }

+#else
+    wxUnusedVar(t);

 #endif // wxUSE_CLIPBOARD
 
     return false;
 #endif // wxUSE_CLIPBOARD
 
     return false;


@@ -812,15 +851,47 @@ void wxHtmlWindow::OnCellMouseHover(wxHtmlCell * WXUNUSED(cell),
     // do nothing here
 }
 
     // do nothing here
 }
 

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

 {
 {

+    if ( !m_bmpBg.Ok() )
+    {
+        // 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;
+    }
+
+    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() )
+    {
+        dc.SetBackground(wxBrush(GetBackgroundColour(), wxSOLID));
+        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 )
+    {
+        for ( wxCoord y = 0; y < sizeWin.y; y += sizeBmp.y )
+        {
+            dc.DrawBitmap(m_bmpBg, x, y, true /* use mask */);
+        }
+    }

 }
 
 void wxHtmlWindow::OnPaint(wxPaintEvent& WXUNUSED(event))
 {
     wxPaintDC dc(this);
 
 }
 
 void wxHtmlWindow::OnPaint(wxPaintEvent& WXUNUSED(event))
 {
     wxPaintDC dc(this);
 

-    if (m_tmpCanDrawLocks > 0 || m_Cell == NULL) return;
+    if (m_tmpCanDrawLocks > 0 || m_Cell == NULL)
+        return;

 
     int x, y;
     GetViewStart(&x, &y);
 
     int x, y;
     GetViewStart(&x, &y);


@@ -831,8 +902,25 @@ void wxHtmlWindow::OnPaint(wxPaintEvent& WXUNUSED(event))
     if ( !m_backBuffer )
         m_backBuffer = new wxBitmap(sz.x, sz.y);
     dcm.SelectObject(*m_backBuffer);
     if ( !m_backBuffer )
         m_backBuffer = new wxBitmap(sz.x, sz.y);
     dcm.SelectObject(*m_backBuffer);

-    dcm.SetBackground(wxBrush(GetBackgroundColour(), wxSOLID));
-    dcm.Clear();
+
+    if ( m_eraseBgInOnPaint )
+    {
+        dcm.SetBackground(wxBrush(GetBackgroundColour(), wxSOLID));
+        dcm.Clear();
+
+        m_eraseBgInOnPaint = false;
+    }
+    else // someone has already erased the background, keep it
+    {
+        // 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());
+    }
+

     PrepareDC(dcm);
     dcm.SetMapMode(wxMM_TEXT);
     dcm.SetBackgroundMode(wxTRANSPARENT);
     PrepareDC(dcm);
     dcm.SetMapMode(wxMM_TEXT);
     dcm.SetBackgroundMode(wxTRANSPARENT);


@@ -845,8 +933,8 @@ void wxHtmlWindow::OnPaint(wxPaintEvent& WXUNUSED(event))
                  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 
+
+//#define DEBUG_HTML_SELECTION

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


@@ -854,11 +942,11 @@ void wxHtmlWindow::OnPaint(wxPaintEvent& WXUNUSED(event))
     ScreenToClient(&xc, &yc);
     CalcUnscrolledPosition(xc, yc, &x, &y);
     wxHtmlCell *at = m_Cell->FindCellByPos(x, y);
     ScreenToClient(&xc, &yc);
     CalcUnscrolledPosition(xc, yc, &x, &y);
     wxHtmlCell *at = m_Cell->FindCellByPos(x, y);

-    wxHtmlCell *before = 
+    wxHtmlCell *before =

         m_Cell->FindCellByPos(x, y, wxHTML_FIND_NEAREST_BEFORE);
         m_Cell->FindCellByPos(x, y, wxHTML_FIND_NEAREST_BEFORE);

-    wxHtmlCell *after = 
+    wxHtmlCell *after =

         m_Cell->FindCellByPos(x, y, wxHTML_FIND_NEAREST_AFTER);
         m_Cell->FindCellByPos(x, y, wxHTML_FIND_NEAREST_AFTER);

-    
+

     dcm.SetBrush(*wxTRANSPARENT_BRUSH);
     dcm.SetPen(*wxBLACK_PEN);
     if (at)
     dcm.SetBrush(*wxTRANSPARENT_BRUSH);
     dcm.SetPen(*wxBLACK_PEN);
     if (at)


@@ -874,7 +962,7 @@ void wxHtmlWindow::OnPaint(wxPaintEvent& WXUNUSED(event))
                           after->GetWidth()-4,after->GetHeight()-4);
     }
 #endif
                           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,


@@ -936,6 +1024,8 @@ void wxHtmlWindow::OnMouseDown(wxMouseEvent& event)
             CaptureMouse();
         }
     }
             CaptureMouse();
         }
     }

+#else
+    wxUnusedVar(event);

 #endif // wxUSE_CLIPBOARD
 }
 
 #endif // wxUSE_CLIPBOARD
 }
 


@@ -976,7 +1066,7 @@ void wxHtmlWindow::OnMouseUp(wxMouseEvent& event)
 void wxHtmlWindow::OnInternalIdle()
 {
     wxWindow::OnInternalIdle();
 void wxHtmlWindow::OnInternalIdle()
 {
     wxWindow::OnInternalIdle();

-    
+

     if (m_tmpMouseMoved && (m_Cell != NULL))
     {
 #ifdef DEBUG_HTML_SELECTION
     if (m_tmpMouseMoved && (m_Cell != NULL))
     {
 #ifdef DEBUG_HTML_SELECTION


@@ -995,7 +1085,7 @@ void wxHtmlWindow::OnInternalIdle()
             if ( !m_tmpSelFromCell )
                 m_tmpSelFromCell = m_Cell->FindCellByPos(
                                          m_tmpSelFromPos.x,m_tmpSelFromPos.y);
             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.
             // 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.


@@ -1017,7 +1107,7 @@ void wxHtmlWindow::OnInternalIdle()
                     dirFromPos.y += m_tmpSelFromCell->GetHeight();
                 }
             }
                     dirFromPos.y += m_tmpSelFromCell->GetHeight();
                 }
             }

-            bool goingDown = dirFromPos.y < y || 
+            bool goingDown = dirFromPos.y < y ||

                              (dirFromPos.y == y && dirFromPos.x < x);
 
             // determine selection span:
                              (dirFromPos.y == y && dirFromPos.x < x);
 
             // determine selection span:


@@ -1106,6 +1196,7 @@ void wxHtmlWindow::OnInternalIdle()
 
             if (lnk != m_tmpLastLink)
             {
 
             if (lnk != m_tmpLastLink)
             {

+#if wxUSE_STATUSBAR

                 if (lnk == NULL)
                 {
                     if (m_RelatedStatusBar != -1)
                 if (lnk == NULL)
                 {
                     if (m_RelatedStatusBar != -1)


@@ -1118,6 +1209,7 @@ void wxHtmlWindow::OnInternalIdle()
                         m_RelatedFrame->SetStatusText(lnk->GetHref(),
                                                       m_RelatedStatusBar);
                 }
                         m_RelatedFrame->SetStatusText(lnk->GetHref(),
                                                       m_RelatedStatusBar);
                 }

+#endif // wxUSE_STATUSBAR

                 m_tmpLastLink = lnk;
             }
 
                 m_tmpLastLink = lnk;
             }
 


@@ -1129,7 +1221,7 @@ void wxHtmlWindow::OnInternalIdle()
                 OnCellMouseHover(cell, x, y);
         }
 
                 OnCellMouseHover(cell, x, y);
         }
 

-        m_tmpMouseMoved = FALSE;
+        m_tmpMouseMoved = false;

     }
 }
 
     }
 }
 


@@ -1215,8 +1307,7 @@ void wxHtmlWindow::OnMouseLeave(wxMouseEvent& event)
 
 void wxHtmlWindow::OnKeyUp(wxKeyEvent& event)
 {
 
 void wxHtmlWindow::OnKeyUp(wxKeyEvent& event)
 {

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

     {
         (void) CopySelection();
     }
     {
         (void) CopySelection();
     }


@@ -1336,18 +1427,18 @@ IMPLEMENT_DYNAMIC_CLASS_XTI(wxHtmlWindow, wxScrolledWindow,"wx/html/htmlwin.h")
 
 wxBEGIN_PROPERTIES_TABLE(wxHtmlWindow)
 /*
 
 wxBEGIN_PROPERTIES_TABLE(wxHtmlWindow)
 /*

-       TODO PROPERTIES
-               style , wxHW_SCROLLBAR_AUTO
-               borders , (dimension)
-               url , string
-               htmlcode , string
+    TODO PROPERTIES
+        style , wxHW_SCROLLBAR_AUTO
+        borders , (dimension)
+        url , string
+        htmlcode , string

 */
 wxEND_PROPERTIES_TABLE()
 
 wxBEGIN_HANDLERS_TABLE(wxHtmlWindow)
 wxEND_HANDLERS_TABLE()
 
 */
 wxEND_PROPERTIES_TABLE()
 
 wxBEGIN_HANDLERS_TABLE(wxHtmlWindow)
 wxEND_HANDLERS_TABLE()
 

-wxCONSTRUCTOR_5( wxHtmlWindow , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size , long , WindowStyle ) 
+wxCONSTRUCTOR_5( wxHtmlWindow , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size , long , WindowStyle )

 #else
 IMPLEMENT_DYNAMIC_CLASS(wxHtmlWindow,wxScrolledWindow)
 #endif
 #else
 IMPLEMENT_DYNAMIC_CLASS(wxHtmlWindow,wxScrolledWindow)
 #endif


@@ -1382,7 +1473,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(); }
 };