compilation fix for non-threaded compilation (threads are still broken

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

diff --git a/src/html/m_layout.cpp b/src/html/m_layout.cpp
index 749df786da0d911469abce295903a6b6876c54ef..df2615cf1db4eba008200052c3ce98c0dbcfca66 100644 (file)
--- 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$
 // Purpose:     wxHtml module for basic paragraphs/layout handling
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$


@@ -29,7 +29,7 @@
 
 #include "wx/html/htmlwin.h"
 
 
 #include "wx/html/htmlwin.h"
 

-FORCE_LINK_ME(mod_layout)
+FORCE_LINK_ME(m_layout)

 
 
 TAG_HANDLER_BEGIN(P, "P")
 
 
 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();
         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;
         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 = m_WParser -> OpenContainer();
         c -> SetAlignHor(al);
         c -> SetAlign(tag);

+        c -> SetMinHeight(m_WParser -> GetCharHeight());

         return FALSE;
     }
 
         return FALSE;
     }
 


@@ -148,8 +149,8 @@ TAG_HANDLER_BEGIN(TITLE, "TITLE")
                 wxString title = "";
                 wxString *src = m_WParser -> GetSource();
 
                 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;
             }
         }
         return TRUE;