changed \n\r to \r\n

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

diff --git a/src/html/htmlwin.cpp b/src/html/htmlwin.cpp
index e8f244474fd798afaacf2dec25c8fc23a672da83..a0fd8ace9ffebbcab364948ed220c5dddc07be72 100644 (file)
--- a/src/html/htmlwin.cpp
+++ b/src/html/htmlwin.cpp
@@ -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);
@@ -365,6 +365,12 @@ bool wxHtmlWindow::HistoryBack()
 
     if (m_HistoryPos < 1) return FALSE;
 
+    // store scroll position into history item:
+    int x, y;
+    ViewStart(&x, &y);
+    m_History[m_HistoryPos].SetPos(y);
+
+    // go to previous position:
     m_HistoryPos--;
 
     l = m_History[m_HistoryPos].GetPage();
@@ -483,6 +489,7 @@ void wxHtmlWindow::OnSize(wxSizeEvent& event)
 {
     wxScrolledWindow::OnSize(event);
     CreateLayout();
+    Refresh();
 }