Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merged 2.2 branch

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7748 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Bryan Petty
2000-07-15 19:51:35 +00:00
parent 8a693e6e04
commit f6bcfd974e
1835 changed files with 237729 additions and 67990 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/html/htmlwin.cpp
View File

@@ -15,7 +15,7 @@
#include "wx/wxprec.h"
#include "wx/defs.h"
#if wxUSE_HTML
#if wxUSE_HTML && wxUSE_STREAMS
#ifdef __BORDLANDC__
#pragma hdrstop
@@ -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 | wxHSCROLL, name)
long style, const wxString& name) : wxScrolledWindow(parent, id, pos, size, style | wxVSCROLL | wxHSCROLL, name)
{
m_tmpMouseMoved = FALSE;
m_tmpLastLink = NULL;
@@ -172,7 +172,7 @@ bool wxHtmlWindow::LoadPage(const wxString& location)
if (f == NULL) {
wxString err;
wxLogError(_("Unable to open requested HTML document: %s"), location.mb_str());
wxLogError(_("Unable to open requested HTML document: %s"), location.c_str());
m_tmpCanDrawLocks--;
SetCursor(*wxSTANDARD_CURSOR);
@@ -248,7 +248,7 @@ bool wxHtmlWindow::ScrollToAnchor(const wxString& anchor)
const wxHtmlCell *c = m_Cell -> Find(wxHTML_COND_ISANCHOR, &anchor);
if (!c)
{
wxLogWarning(_("HTML anchor %s does not exist."), anchor.mb_str());
wxLogWarning(_("HTML anchor %s does not exist."), anchor.c_str());
return FALSE;
}
else {
@@ -282,7 +282,7 @@ void wxHtmlWindow::CreateLayout()
if (!m_Cell) return;
if (m_Style == wxHW_SCROLLBAR_NEVER) {
if (m_Style & wxHW_SCROLLBAR_NEVER) {
SetScrollbars(wxHTML_SCROLL_STEP, 1, m_Cell -> GetWidth() / wxHTML_SCROLL_STEP, 0); // always off
GetClientSize(&ClientWidth, &ClientHeight);
m_Cell -> Layout(ClientWidth);
@@ -483,6 +483,7 @@ void wxHtmlWindow::OnSize(wxSizeEvent& event)
{
wxScrolledWindow::OnSize(event);
CreateLayout();
Refresh();
}