From f3bcfd9bcd48fa82418ef5fde6b777662e818928 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Fri, 14 Jan 2000 21:40:41 +0000 Subject: [PATCH] wxHtmlWindow's flags is now wxHSCROLL | wxVSCROLL git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5394 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/html/htmlwin.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/html/htmlwin.cpp b/src/html/htmlwin.cpp index 447a322890..7850f761ce 100644 --- a/src/html/htmlwin.cpp +++ b/src/html/htmlwin.cpp @@ -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,7 +155,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"); @@ -271,11 +271,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... -- 2.45.2