Correcting minor painting problems

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

diff --git a/src/html/mod_tables.cpp b/src/html/mod_tables.cpp
index 7f9e31c08ed85cfcdc77a30cc8ec1e3b26d7ba08..35f14a284902b7346aba45fe9e9790202741f6ae 100644 (file)
--- a/src/html/mod_tables.cpp
+++ b/src/html/mod_tables.cpp
@@ -6,8 +6,21 @@
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
 
-#include "wx/defs.h"
+#ifdef __GNUG__
+#pragma implementation
+#endif
+
+#include <wx/wxprec.h>
+
 #if wxUSE_HTML
+#ifdef __BORDLANDC__
+#pragma hdrstop
+#endif
+
+#ifndef WXPRECOMP
+#include <wx/wx.h>
+#endif
+
 
 /*
 REMARKS:
@@ -109,8 +122,8 @@ wxHtmlTableCell::wxHtmlTableCell(wxHtmlContainerCell *parent, const wxHtmlTag& t
     m_tBkg = m_rBkg = -1;
     if (tag.HasParam("BGCOLOR")) tag.ScanParam("BGCOLOR", "#%lX", &m_tBkg);
     if (tag.HasParam("VALIGN")) m_tValign = tag.GetParam("VALIGN"); else m_tValign = wxEmptyString;
-    if (tag.HasParam("CELLSPACING")) tag.ScanParam("CELLSPACING", "%i", &m_Spacing); else m_Spacing = 2;
-    if (tag.HasParam("CELLPADDING")) tag.ScanParam("CELLPADDING", "%i", &m_Padding); else m_Padding = 3;
+    if (tag.HasParam("CELLSPACING") && tag.ScanParam("CELLSPACING", "%i", &m_Spacing) == 1) {} else m_Spacing = 2;
+    if (tag.HasParam("CELLPADDING") && tag.ScanParam("CELLPADDING", "%i", &m_Padding) == 1) {} else m_Padding = 3;
 
     if (m_HasBorders)
         SetBorder(TABLE_BORDER_CLR_1, TABLE_BORDER_CLR_2);
@@ -325,7 +338,7 @@ void wxHtmlTableCell::Layout(int w)
 
     /* 3.  sub-layout all cells: */
     {
-        int *ypos = (int*) malloc(sizeof(int) * (m_NumRows + 1));
+        int *ypos = new int[m_NumRows + 1];
 
         int actcol, actrow;
         int fullwid;
@@ -372,7 +385,7 @@ void wxHtmlTableCell::Layout(int w)
 
         }
         m_Height = ypos[m_NumRows];
-        free(ypos);
+        delete[] ypos;
     }
 }