fix for assert when setting tooltip for a readonly combo

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

diff --git a/src/html/m_layout.cpp b/src/html/m_layout.cpp
index ccd8b2f8acf9112450c37821eeb2e73db6994c0e..08157beabab95558522b29f846810788490d0ee9 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$


@@ -14,7 +14,7 @@
 
 
 #include "wx/defs.h"
 
 
 #include "wx/defs.h"

-#if wxUSE_HTML
+#if wxUSE_HTML && wxUSE_STREAMS

 #ifdef __BORDLANDC__
 #pragma hdrstop
 #endif
 #ifdef __BORDLANDC__
 #pragma hdrstop
 #endif


@@ -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")