Added geometry option to setup.h; added some missing make and project files

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

diff --git a/src/html/m_dflist.cpp b/src/html/m_dflist.cpp
index 8deb90d5583a300d121996a75ec320c1534cfa5e..28c34616c9a10decf308e2a1b7308b4f21416202 100644 (file)
--- a/src/html/m_dflist.cpp
+++ b/src/html/m_dflist.cpp
@@ -15,7 +15,7 @@
 
 
 #include "wx/defs.h"
-#if wxUSE_HTML
+#if wxUSE_HTML && wxUSE_STREAMS
 
 #ifdef __BORDLANDC__
 #pragma hdrstop
@@ -43,38 +43,44 @@ TAG_HANDLER_BEGIN(DEFLIST, "DL,DT,DD")
         wxHtmlContainerCell *c;
 
 
-        if (tag.GetName() == "DL") {
-            if (m_WParser -> GetContainer() -> GetFirstCell() != NULL) {
-                m_WParser -> CloseContainer();
-                m_WParser -> OpenContainer();
+        if (tag.GetName() == wxT("DL")) 
+           {
+            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()->SetIndent(m_WParser->GetCharHeight(), wxHTML_INDENT_TOP);
 
             ParseInner(tag);
 
-            if (m_WParser -> GetContainer() -> GetFirstCell() != NULL) {
-                m_WParser -> CloseContainer();
-                m_WParser -> OpenContainer();
+            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()->SetIndent(m_WParser->GetCharHeight(), wxHTML_INDENT_TOP);
 
             return TRUE;
         }
         
-        else if (tag.GetName() == "DT") {
-            if (!tag.IsEnding()) {
-                m_WParser -> CloseContainer();
-                c = m_WParser -> OpenContainer();
-                c -> SetAlignHor(wxHTML_ALIGN_LEFT);
-                c -> SetMinHeight(m_WParser -> GetCharHeight());
+        else if (tag.GetName() == wxT("DT")) 
+           {
+            if (!tag.IsEnding()) 
+               {
+                m_WParser->CloseContainer();
+                c = m_WParser->OpenContainer();
+                c->SetAlignHor(wxHTML_ALIGN_LEFT);
+                c->SetMinHeight(m_WParser->GetCharHeight());
             }
             return FALSE;
         }
         
-        else if (!tag.IsEnding()) { // "DD"
-            m_WParser -> CloseContainer();
-            c = m_WParser -> OpenContainer();
-            c -> SetIndent(5 * m_WParser -> GetCharWidth(), wxHTML_INDENT_LEFT);
+        else if (!tag.IsEnding()) // "DD"
+           {
+            m_WParser->CloseContainer();
+            c = m_WParser->OpenContainer();
+            c->SetIndent(5 * m_WParser->GetCharWidth(), wxHTML_INDENT_LEFT);
             return FALSE;
         }