X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/01dba85a7fc9a1103f866c7c3a5cc72f21c0784e..f44fdfb032152a62cc0e3a4c0f09330cfab76710:/src/html/m_layout.cpp

diff --git a/src/html/m_layout.cpp b/src/html/m_layout.cpp
index 38f89940e6..08157beaba 100644
--- a/src/html/m_layout.cpp
+++ b/src/html/m_layout.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        mod_layout.cpp
+// Name:        m_layout.cpp
 // Purpose:     wxHtml module for basic paragraphs/layout handling
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
@@ -14,7 +14,7 @@
 
 
 #include "wx/defs.h"
-#if wxUSE_HTML
+#if wxUSE_HTML && wxUSE_STREAMS
 #ifdef __BORDLANDC__
 #pragma hdrstop
 #endif
@@ -29,7 +29,7 @@
 
 #include "wx/html/htmlwin.h"
 
-FORCE_LINK_ME(mod_layout)
+FORCE_LINK_ME(m_layout)
 
 
 TAG_HANDLER_BEGIN(P, "P")
@@ -39,7 +39,7 @@ TAG_HANDLER_BEGIN(P, "P")
         if (m_WParser -> GetContainer() -> GetFirstCell() != NULL) {
             m_WParser -> CloseContainer();
             m_WParser -> OpenContainer();
-    }
+        }
         m_WParser -> GetContainer() -> SetIndent(m_WParser -> GetCharHeight(), wxHTML_INDENT_TOP);
         m_WParser -> GetContainer() -> SetAlign(tag);
         return FALSE;
@@ -60,6 +60,7 @@ TAG_HANDLER_BEGIN(BR, "BR")
         c = m_WParser -> OpenContainer();
         c -> SetAlignHor(al);
         c -> SetAlign(tag);
+        c -> SetMinHeight(m_WParser -> GetCharHeight());
         return FALSE;
     }
 
@@ -149,7 +150,7 @@ TAG_HANDLER_BEGIN(TITLE, "TITLE")
                 wxString *src = m_WParser -> GetSource();
 
                 for (int i = tag.GetBeginPos(); i < tag.GetEndPos1(); i++) title += (*src)[(unsigned int) i];
-                wfr -> SetTitle(title);
+                wfr -> OnSetTitle(title);
             }
         }
         return TRUE;