Added missing include

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

diff --git a/src/html/m_tables.cpp b/src/html/m_tables.cpp
index 22aa730ef0adb9ab485e477d59c23921a73fd47e..f50de26c79ec8175f00791be58360c1b040a519f 100644 (file)
--- a/src/html/m_tables.cpp
+++ b/src/html/m_tables.cpp
@@ -15,7 +15,8 @@
 
 #if wxUSE_HTML && wxUSE_STREAMS
 
 
 #if wxUSE_HTML && wxUSE_STREAMS
 

-#ifndef WXPRECOMP
+#ifndef WX_PRECOMP
+    #include "wx/wxcrtvararg.h"

 #endif
 
 #include "wx/html/forcelnk.h"
 #endif
 
 #include "wx/html/forcelnk.h"


@@ -98,7 +99,7 @@ private:
 
 public:
     wxHtmlTableCell(wxHtmlContainerCell *parent, const wxHtmlTag& tag, double pixel_scale = 1.0);
 
 public:
     wxHtmlTableCell(wxHtmlContainerCell *parent, const wxHtmlTag& tag, double pixel_scale = 1.0);

-    ~wxHtmlTableCell();
+    virtual ~wxHtmlTableCell();

 
     virtual void RemoveExtraSpacing(bool top, bool bottom);
 
 
     virtual void RemoveExtraSpacing(bool top, bool bottom);
 


@@ -136,7 +137,11 @@ wxHtmlTableCell::wxHtmlTableCell(wxHtmlContainerCell *parent, const wxHtmlTag& t
 
     /* scan params: */
     if (tag.HasParam(wxT("BGCOLOR")))
 
     /* scan params: */
     if (tag.HasParam(wxT("BGCOLOR")))

+    {

         tag.GetParamAsColour(wxT("BGCOLOR"), &m_tBkg);
         tag.GetParamAsColour(wxT("BGCOLOR"), &m_tBkg);

+        if (m_tBkg.Ok())
+            SetBackgroundColour(m_tBkg);
+    }

     if (tag.HasParam(wxT("VALIGN")))
         m_tValign = tag.GetParam(wxT("VALIGN"));
     else
     if (tag.HasParam(wxT("VALIGN")))
         m_tValign = tag.GetParam(wxT("VALIGN"));
     else


@@ -571,6 +576,10 @@ void wxHtmlTableCell::Layout(int w)
             m_ColsInfo[i].leftpos = wpos;
             wpos += m_ColsInfo[i].pixwidth + m_Spacing;
         }
             m_ColsInfo[i].leftpos = wpos;
             wpos += m_ColsInfo[i].pixwidth + m_Spacing;
         }

+
+        // add the remaining space to the last column
+        if (m_NumCols > 0 && wpos < m_Width)
+            m_ColsInfo[m_NumCols-1].pixwidth += m_Width - wpos;

     }
 
     /* 3.  sub-layout all cells: */
     }
 
     /* 3.  sub-layout all cells: */


@@ -672,7 +681,7 @@ TAG_HANDLER_BEGIN(TABLE, "TABLE,TR,TD,TH")
 
             oldcont = c = m_WParser->OpenContainer();
 
 
             oldcont = c = m_WParser->OpenContainer();
 

-            m_Table = new wxHtmlTableCell(c, tag);
+            m_Table = new wxHtmlTableCell(c, tag, m_WParser->GetPixelScale());

 
             // width:
             {
 
             // width:
             {