test for disabled scroll directions in kbd handler

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

diff --git a/src/html/htmlwin.cpp b/src/html/htmlwin.cpp
index 76e0c45e646d6e520cf85e980e037c7b10c0c553..81d3a5d785739c7e2d624da10ac15545b0442be7 100644 (file)
--- a/src/html/htmlwin.cpp
+++ b/src/html/htmlwin.cpp
@@ -27,7 +27,7 @@
 
 #include "wx/html/htmlwin.h"
 #include "wx/html/forcelnk.h"
-
+#include "wx/log.h"
 
 
 //-----------------------------------------------------------------------------
@@ -41,7 +41,7 @@ WX_DEFINE_OBJARRAY(HtmlHistoryArray)
 
 
 wxHtmlWindow::wxHtmlWindow(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size,
-                long style, const wxString& name) : wxScrolledWindow(parent, id, pos, size, wxVSCROLL, name)
+                long style, const wxString& name) : wxScrolledWindow(parent, id, pos, size, wxVSCROLL | wxHSCROLL, name)
 {
     m_tmpMouseMoved = FALSE;
     m_tmpLastLink = NULL;
@@ -155,10 +155,8 @@ bool wxHtmlWindow::LoadPage(const wxString& location)
         if (f == NULL) {
             wxString err;
 
-            err.Printf(_("The browser is unable to open requested location :\n\n%s"), WXSTRINGCAST location);
+            wxLogError(_("Unable to open requested HTML document: %s"), location.mb_str());
             m_tmpCanDrawLocks--;
-            Refresh();
-            wxMessageBox(err, "Error");
 
             SetCursor(*wxSTANDARD_CURSOR);
             return FALSE;
@@ -212,8 +210,10 @@ bool wxHtmlWindow::LoadPage(const wxString& location)
         m_History.Add(new HtmlHistoryItem(m_OpenedPage, m_OpenedAnchor));
     }
 
+    if (m_OpenedPageTitle == wxEmptyString)
+        OnSetTitle(wxFileNameFromPath(m_OpenedPage));
     SetCursor(*wxSTANDARD_CURSOR);
-
+    
     wxYield();
     m_tmpCanDrawLocks--;
     Refresh();
@@ -225,7 +225,11 @@ bool wxHtmlWindow::LoadPage(const wxString& location)
 bool wxHtmlWindow::ScrollToAnchor(const wxString& anchor)
 {
     const wxHtmlCell *c = m_Cell -> Find(wxHTML_COND_ISANCHOR, &anchor);
-    if (!c) return FALSE;
+    if (!c)
+    {
+        wxLogWarning(_("HTML anchor %s does not exist."), anchor.mb_str());
+        return FALSE;
+    }
     else {
         int y;
 
@@ -271,11 +275,12 @@ void wxHtmlWindow::CreateLayout()
 #endif
         GetClientSize(&ClientWidth, &ClientHeight);
         m_Cell -> Layout(ClientWidth);
-        if (ClientHeight < m_Cell -> GetHeight()) {
-            SetScrollbars(wxHTML_SCROLL_STEP, wxHTML_SCROLL_STEP,
-                          m_Cell -> GetWidth() / wxHTML_SCROLL_STEP,
-                          m_Cell -> GetHeight() / wxHTML_SCROLL_STEP
-                          /*cheat: top-level frag is always container*/);
+        if (ClientHeight < m_Cell -> GetHeight() + GetCharHeight()) {
+            SetScrollbars(
+                  wxHTML_SCROLL_STEP, wxHTML_SCROLL_STEP,
+                  m_Cell -> GetWidth() / wxHTML_SCROLL_STEP,
+                  (m_Cell -> GetHeight() + GetCharHeight()) / wxHTML_SCROLL_STEP
+                  /*cheat: top-level frag is always container*/);
         }
         else { /* we fit into window, no need for scrollbars */
             SetScrollbars(wxHTML_SCROLL_STEP, 1, m_Cell -> GetWidth() / wxHTML_SCROLL_STEP, 0); // disable...
@@ -418,9 +423,9 @@ void wxHtmlWindow::AddFilter(wxHtmlFilter *filter)
 
 
 
-void wxHtmlWindow::OnLinkClicked(wxHtmlLinkInfo *link)
+void wxHtmlWindow::OnLinkClicked(const wxHtmlLinkInfo& link)
 {
-    LoadPage(link -> GetHref());
+    LoadPage(link.GetHref());
 }
 
 
@@ -433,8 +438,12 @@ void wxHtmlWindow::OnDraw(wxDC& dc)
 
     if (m_tmpCanDrawLocks > 0) return;
     dc.SetMapMode(wxMM_TEXT);
+#if 0
+/* VS - I don't think this is neccessary any longer 
+        MSC_VER 1200 means MSVC 6.0 and it works fine */
 #if defined(_MSC_VER) && (_MSC_VER == 1200)
     ::SetMapMode((HDC)dc.GetHDC(), MM_TEXT);
+#endif
 #endif
     dc.SetBackgroundMode(wxTRANSPARENT);
     ViewStart(&x, &y);
@@ -469,12 +478,12 @@ void wxHtmlWindow::OnKeyDown(wxKeyEvent& event)
 
     switch (event.KeyCode()) {
         case WXK_PAGEUP :
-    case WXK_PRIOR :
-                Scroll(-1, sty - cliy);
+        case WXK_PRIOR :
+                Scroll(-1, sty - (5 * cliy / 6));
                 break;
         case WXK_PAGEDOWN :
-    case WXK_NEXT :
-                Scroll(-1, sty + cliy);
+        case WXK_NEXT :
+                Scroll(-1, sty + (5 * cliy / 6));
                 break;
         case WXK_HOME :
                 Scroll(-1, 0);
@@ -506,7 +515,7 @@ void wxHtmlWindow::OnMouseEvent(wxMouseEvent& event)
         pos = event.GetPosition();
 
         if (m_Cell)
-            m_Cell -> OnMouseClick(this, sx + pos.x, sy + pos.y, event.ButtonDown(1), event.ButtonDown(2), event.ButtonDown(3));
+            m_Cell -> OnMouseClick(this, sx + pos.x, sy + pos.y, event);
     }
 }
 
@@ -588,6 +597,7 @@ FORCE_LINK(m_pre)
 FORCE_LINK(m_hline)
 FORCE_LINK(m_links)
 FORCE_LINK(m_tables)
+FORCE_LINK(m_meta)
 
 
 #endif