fixed (rare but fatal) bug in wxWindowDisabler

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

diff --git a/src/html/m_hline.cpp b/src/html/m_hline.cpp
index 5a581789721216c9f2e278d32d7f484d5e36bbc1..fdb5a1fa48b85a6a2dd0e99336e8016ec3dd0843 100644 (file)
--- a/src/html/m_hline.cpp
+++ b/src/html/m_hline.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        mod_hline.cpp
+// Name:        m_hline.cpp

 // Purpose:     wxHtml module for horizontal line (HR tag)
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
 // Purpose:     wxHtml module for horizontal line (HR tag)
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$


@@ -31,7 +31,7 @@
 
 #include "wx/html/htmlcell.h"
 
 
 #include "wx/html/htmlcell.h"
 

-FORCE_LINK_ME(mod_hline)
+FORCE_LINK_ME(m_hline)

 
 
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------


@@ -79,9 +79,9 @@ TAG_HANDLER_BEGIN(HR, "HR")
         c -> SetAlignHor(wxHTML_ALIGN_CENTER);
         c -> SetAlign(tag);
         c -> SetWidthFloat(tag);
         c -> SetAlignHor(wxHTML_ALIGN_CENTER);
         c -> SetAlign(tag);
         c -> SetWidthFloat(tag);

+        sz = 1;

         if (tag.HasParam(wxT("SIZE")) && tag.ScanParam(wxT("SIZE"), wxT("%i"), &sz) == 1) {}
         if (tag.HasParam(wxT("SIZE")) && tag.ScanParam(wxT("SIZE"), wxT("%i"), &sz) == 1) {}

-        else sz = 1;
-        c -> InsertCell(new wxHtmlLineCell(sz));
+        c -> InsertCell(new wxHtmlLineCell((int)((double)sz * m_WParser -> GetPixelScale())));

 
         m_WParser -> CloseContainer();
         m_WParser -> OpenContainer();
 
         m_WParser -> CloseContainer();
         m_WParser -> OpenContainer();