X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/69941f05864fa8b37856ccc1338124bfac756a2b..c6e7d14fa96da41236095a18ee8c1e3ad13d3dd0:/src/html/m_layout.cpp

diff --git a/src/html/m_layout.cpp b/src/html/m_layout.cpp
index c34aa54868..df2615cf1d 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$
@@ -10,15 +10,17 @@
 #pragma implementation
 #endif
 
-#include <wx/wxprec.h>
+#include "wx/wxprec.h"
 
+
+#include "wx/defs.h"
 #if wxUSE_HTML
 #ifdef __BORDLANDC__
 #pragma hdrstop
 #endif
 
 #ifndef WXPRECOMP
-#include <wx/wx.h>
+#include "wx/wx.h"
 #endif
 
 
@@ -27,7 +29,7 @@
 
 #include "wx/html/htmlwin.h"
 
-FORCE_LINK_ME(mod_layout)
+FORCE_LINK_ME(m_layout)
 
 
 TAG_HANDLER_BEGIN(P, "P")
@@ -37,8 +39,8 @@ TAG_HANDLER_BEGIN(P, "P")
         if (m_WParser -> GetContainer() -> GetFirstCell() != NULL) {
             m_WParser -> CloseContainer();
             m_WParser -> OpenContainer();
-    }
-        m_WParser -> GetContainer() -> SetIndent(m_WParser -> GetCharHeight(), HTML_INDENT_TOP);
+        }
+        m_WParser -> GetContainer() -> SetIndent(m_WParser -> GetCharHeight(), wxHTML_INDENT_TOP);
         m_WParser -> GetContainer() -> SetAlign(tag);
         return FALSE;
     }
@@ -58,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;
     }
 
@@ -72,13 +75,13 @@ TAG_HANDLER_BEGIN(CENTER, "CENTER")
         int old = m_WParser -> GetAlign();
         wxHtmlContainerCell *c = m_WParser -> GetContainer();
 
-        m_WParser -> SetAlign(HTML_ALIGN_CENTER);
+        m_WParser -> SetAlign(wxHTML_ALIGN_CENTER);
         if (c -> GetFirstCell() != NULL) {
             m_WParser -> CloseContainer();
             m_WParser -> OpenContainer();
         }
         else
-            c -> SetAlignHor(HTML_ALIGN_CENTER);
+            c -> SetAlignHor(wxHTML_ALIGN_CENTER);
 
         if (tag.HasEnding()) {
             ParseInner(tag);
@@ -146,8 +149,8 @@ TAG_HANDLER_BEGIN(TITLE, "TITLE")
                 wxString title = "";
                 wxString *src = m_WParser -> GetSource();
 
-                for (int i = tag.GetBeginPos(); i < tag.GetEndPos1(); i++) title += (*src)[i];
-                wfr -> SetTitle(title);
+                for (int i = tag.GetBeginPos(); i < tag.GetEndPos1(); i++) title += (*src)[(unsigned int) i];
+                wfr -> OnSetTitle(title);
             }
         }
         return TRUE;
@@ -165,25 +168,25 @@ TAG_HANDLER_BEGIN(BODY, "BODY")
         unsigned long tmp;
         wxColour clr;
 
-        if (tag.HasParam("TEXT")) {
-            if (tag.ScanParam("TEXT", "#%lX", &tmp) == 1) {
+        if (tag.HasParam(wxT("TEXT"))) {
+            if (tag.ScanParam(wxT("TEXT"), wxT("#%lX"), &tmp) == 1) {
                 clr = wxColour((tmp & 0xFF0000) >> 16 , (tmp & 0x00FF00) >> 8, (tmp & 0x0000FF));
                 m_WParser -> SetActualColor(clr);
                 m_WParser -> GetContainer() -> InsertCell(new wxHtmlColourCell(clr));
             }
 	}
 
-        if (tag.HasParam("LINK")) {
-            if (tag.ScanParam("LINK", "#%lX", &tmp) == 1) {
+        if (tag.HasParam(wxT("LINK"))) {
+            if (tag.ScanParam(wxT("LINK"), wxT("#%lX"), &tmp) == 1) {
                 clr = wxColour((tmp & 0xFF0000) >> 16 , (tmp & 0x00FF00) >> 8, (tmp & 0x0000FF));
                 m_WParser -> SetLinkColor(clr);
 	    }
         }
 
-        if (tag.HasParam("BGCOLOR")) {
-            if (tag.ScanParam("BGCOLOR", "#%lX", &tmp) == 1) {
+        if (tag.HasParam(wxT("BGCOLOR"))) {
+            if (tag.ScanParam(wxT("BGCOLOR"), wxT("#%lX"), &tmp) == 1) {
                 clr = wxColour((tmp & 0xFF0000) >> 16 , (tmp & 0x00FF00) >> 8, (tmp & 0x0000FF));
-                m_WParser -> GetContainer() -> InsertCell(new wxHtmlColourCell(clr, HTML_CLR_BACKGROUND));
+                m_WParser -> GetContainer() -> InsertCell(new wxHtmlColourCell(clr, wxHTML_CLR_BACKGROUND));
                 if (m_WParser -> GetWindow() != NULL)
                     m_WParser -> GetWindow() -> SetBackgroundColour(clr);
 	    }
@@ -203,15 +206,15 @@ TAG_HANDLER_BEGIN(BLOCKQUOTE, "BLOCKQUOTE")
     
         m_WParser -> CloseContainer();
         c = m_WParser -> OpenContainer();
-        if (c -> GetAlignHor() == HTML_ALIGN_RIGHT)
-            c -> SetIndent(5 * m_WParser -> GetCharWidth(), HTML_INDENT_RIGHT);
+        if (c -> GetAlignHor() == wxHTML_ALIGN_RIGHT)
+            c -> SetIndent(5 * m_WParser -> GetCharWidth(), wxHTML_INDENT_RIGHT);
         else
-            c -> SetIndent(5 * m_WParser -> GetCharWidth(), HTML_INDENT_LEFT);
-        c -> SetIndent(m_WParser -> GetCharHeight(), HTML_INDENT_TOP);
+            c -> SetIndent(5 * m_WParser -> GetCharWidth(), wxHTML_INDENT_LEFT);
+        c -> SetIndent(m_WParser -> GetCharHeight(), wxHTML_INDENT_TOP);
         m_WParser -> OpenContainer();
         ParseInner(tag);
         c = m_WParser -> CloseContainer();
-        c -> SetIndent(m_WParser -> GetCharHeight(), HTML_INDENT_BOTTOM);
+        c -> SetIndent(m_WParser -> GetCharHeight(), wxHTML_INDENT_BOTTOM);
         m_WParser -> CloseContainer();
         m_WParser -> OpenContainer();
         return TRUE;