X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/846914d18d70a51a43f1ebfe0c850a64708cb772..cfd885695ef3adf16de2a7c9bc7b85f33c80ffbe:/src/html/htmlwin.cpp?ds=inline

diff --git a/src/html/htmlwin.cpp b/src/html/htmlwin.cpp
index 380ed40818..ac2e1d135a 100644
--- a/src/html/htmlwin.cpp
+++ b/src/html/htmlwin.cpp
@@ -28,7 +28,9 @@
 #include "wx/html/htmlwin.h"
 #include "wx/html/forcelnk.h"
 
-
+#ifdef __WXMSW__
+#include <windows.h>
+#endif
 
 //-----------------------------------------------------------------------------
 // wxHtmlWindow
@@ -41,7 +43,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;
@@ -69,9 +71,6 @@ wxHtmlWindow::~wxHtmlWindow()
 
     if (m_Cell) delete m_Cell;
 
-    wxList *parser_data = m_Parser -> GetTempData();
-    if (parser_data) delete parser_data;
-
     delete m_Parser;
     delete m_FS;
 }
@@ -158,7 +157,7 @@ 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);
+            err.Printf(_("Unable to open requested location :\n\n%s"), WXSTRINGCAST location);
             m_tmpCanDrawLocks--;
             Refresh();
             wxMessageBox(err, "Error");
@@ -274,11 +273,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...
@@ -421,9 +421,9 @@ void wxHtmlWindow::AddFilter(wxHtmlFilter *filter)
 
 
 
-void wxHtmlWindow::OnLinkClicked(wxHtmlLinkInfo *link)
+void wxHtmlWindow::OnLinkClicked(const wxHtmlLinkInfo& link)
 {
-    LoadPage(link -> GetHref());
+    LoadPage(link.GetHref());
 }
 
 
@@ -472,12 +472,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 - (2 * cliy / 3));
                 break;
         case WXK_PAGEDOWN :
-    case WXK_NEXT :
-                Scroll(-1, sty + cliy);
+        case WXK_NEXT :
+                Scroll(-1, sty + (2 * cliy / 3));
                 break;
         case WXK_HOME :
                 Scroll(-1, 0);
@@ -509,7 +509,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);
     }
 }
 
@@ -591,6 +591,7 @@ FORCE_LINK(m_pre)
 FORCE_LINK(m_hline)
 FORCE_LINK(m_links)
 FORCE_LINK(m_tables)
+FORCE_LINK(m_meta)
 
 
 #endif