From: Václav Slavík <vslavik@fastmail.fm>
Date: Wed, 17 Mar 2004 22:44:32 +0000 (+0000)
Subject: <div> handling fix (Xavier Nodet)
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/c5448f38d7d97fe4e40503b5ed235625d099a5cb

<div> handling fix (Xavier Nodet)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26248 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/docs/changes.txt b/docs/changes.txt
index 1fb06ed883..a6e35f23d5 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -96,6 +96,7 @@ wxMSW:
 wxHTML:
 
 - improved tables layout algorithm (Tim Kosse)
+- <div> handling fix (Xavier Nodet)
 
 
 2.5.1
diff --git a/src/html/m_layout.cpp b/src/html/m_layout.cpp
index aa9ea66ee1..2464a5a9ce 100644
--- a/src/html/m_layout.cpp
+++ b/src/html/m_layout.cpp
@@ -260,11 +260,20 @@ TAG_HANDLER_BEGIN(DIV, "DIV")
             else
                 c->SetAlignHor(old);
 
-            return TRUE;
+            return true;
         }
         else
         {
-            return FALSE;
+            // Same as BR
+            int al = m_WParser->GetContainer()->GetAlignHor();
+            wxHtmlContainerCell *c;
+
+            m_WParser->CloseContainer();
+            c = m_WParser->OpenContainer();
+            c->SetAlignHor(al);
+            c->SetAlign(tag);
+            c->SetMinHeight(m_WParser->GetCharHeight());
+            return false;
         }
     }