Corrected line endings, deps now relative

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

diff --git a/src/html/htmlcell.cpp b/src/html/htmlcell.cpp
index 909584da202fe00c0d3a07773574286c17eba105..94edca7b6472579252a133dcb0f338e1237de473 100644 (file)
--- a/src/html/htmlcell.cpp
+++ b/src/html/htmlcell.cpp
@@ -8,7 +8,7 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__

-#pragma implementation
+#pragma implementation "htmlcell.h"

 #endif
 
 #include "wx/wxprec.h"
 #endif
 
 #include "wx/wxprec.h"


@@ -17,7 +17,7 @@
 
 #if wxUSE_HTML && wxUSE_STREAMS
 
 
 #if wxUSE_HTML && wxUSE_STREAMS
 

-#ifdef __BORDLANDC__
+#ifdef __BORLANDC__

 #pragma hdrstop
 #endif
 
 #pragma hdrstop
 #endif
 


@@ -255,8 +255,8 @@ void wxHtmlContainerCell::Layout(int w)
        m_Width = 0;
        for (wxHtmlCell *cell = m_Cells; cell; cell = cell->GetNext())
             cell->Layout(0);
        m_Width = 0;
        for (wxHtmlCell *cell = m_Cells; cell; cell = cell->GetNext())
             cell->Layout(0);

-            // this does two things: it recursively calls this code on all child
-            // contrainers and resets children's position to (0,0)
+            // this does two things: it recursively calls this code on all
+            // child contrainers and resets children's position to (0,0)

        return;
     }
 
        return;
     }
 


@@ -465,6 +465,15 @@ void wxHtmlContainerCell::DrawInvisible(wxDC& dc, int x, int y)
 }
 
 
 }
 
 

+wxColour wxHtmlContainerCell::GetBackgroundColour()
+{
+    if (m_UseBkColour)
+        return m_BkColour;
+    else
+        return wxNullColour;
+}
+
+

 
 wxHtmlLinkInfo *wxHtmlContainerCell::GetLink(int x, int y) const
 {
 
 wxHtmlLinkInfo *wxHtmlContainerCell::GetLink(int x, int y) const
 {