don't use assert dialog under wxDFB, it does more harm than good

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

diff --git a/src/html/htmlwin.cpp b/src/html/htmlwin.cpp
index 75e39a8ba7a98d727fb7237c1b2be7d98732f59d..3ef8f9a1f9e6493f1d89623aad7d0e02d5e367db 100644 (file)
--- a/src/html/htmlwin.cpp
+++ b/src/html/htmlwin.cpp
@@ -15,7 +15,7 @@
 
 #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/list.h"
     #include "wx/log.h"
     #include "wx/intl.h"


@@ -25,6 +25,7 @@
     #include "wx/timer.h"
     #include "wx/settings.h"
     #include "wx/dataobj.h"
     #include "wx/timer.h"
     #include "wx/settings.h"
     #include "wx/dataobj.h"

+    #include "wx/statusbr.h"

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


@@ -291,7 +292,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");


@@ -363,10 +365,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_RelatedStatusBar = bar;
+    m_RelatedStatusBarIndex = index;

 }
 }

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

 #endif // wxUSE_STATUSBAR
 
 
 #endif // wxUSE_STATUSBAR
 
 


@@ -468,9 +477,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;
 


@@ -483,43 +493,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++;
+        // 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 && 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 if (location.Find(wxT('#')) != wxNOT_FOUND &&
-             (m_FS->GetPath() + location.BeforeFirst(wxT('#'))) == m_OpenedPage)
-    {
-        wxString anch = location.AfterFirst(wxT('#'));
-        m_tmpCanDrawLocks--;
-        rt_val = ScrollToAnchor(anch);
-        m_tmpCanDrawLocks++;
-    }
-
-    else
+    else // 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)


@@ -533,6 +540,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;
         }
 


@@ -542,10 +550,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


@@ -578,8 +586,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
         }
     }


@@ -983,7 +993,7 @@ void wxHtmlWindow::OnEraseBackground(wxEraseEvent& event)
     // completely covered anyhow
     if ( m_bmpBg.GetMask() )
     {
     // completely covered anyhow
     if ( m_bmpBg.GetMask() )
     {

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

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


@@ -1017,7 +1027,7 @@ void wxHtmlWindow::OnPaint(wxPaintEvent& WXUNUSED(event))
 
     if ( m_eraseBgInOnPaint )
     {
 
     if ( m_eraseBgInOnPaint )
     {

-        dcm.SetBackground(wxBrush(GetBackgroundColour(), wxSOLID));
+        dcm.SetBackground(wxBrush(GetBackgroundColour(), wxBRUSHSTYLE_SOLID));

         dcm.Clear();
 
         m_eraseBgInOnPaint = false;
         dcm.Clear();
 
         m_eraseBgInOnPaint = false;


@@ -1035,7 +1045,7 @@ void wxHtmlWindow::OnPaint(wxPaintEvent& WXUNUSED(event))
 
     PrepareDC(dcm);
     dcm.SetMapMode(wxMM_TEXT);
 
     PrepareDC(dcm);
     dcm.SetMapMode(wxMM_TEXT);

-    dcm.SetBackgroundMode(wxTRANSPARENT);
+    dcm.SetBackgroundMode(wxBRUSHSTYLE_TRANSPARENT);

 
     wxHtmlRenderingInfo rinfo;
     wxDefaultHtmlRenderingStyle rstyle;
 
     wxHtmlRenderingInfo rinfo;
     wxDefaultHtmlRenderingStyle rstyle;


@@ -1136,9 +1146,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)


@@ -1149,9 +1160,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;


@@ -1159,8 +1174,6 @@ 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);
 }


@@ -1610,8 +1623,17 @@ 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
 #else
     wxUnusedVar(text);
 #endif // wxUSE_STATUSBAR