added missing module.h include (bug 748158)

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

diff --git a/src/html/m_layout.cpp b/src/html/m_layout.cpp
index e501f1f6dc7a3853bf7239dd3b19d31c74c3643c..abd44132e9980c84a4ebfec171386e7c5f71a137 100644 (file)
--- a/src/html/m_layout.cpp
+++ b/src/html/m_layout.cpp
@@ -68,12 +68,18 @@ FORCE_LINK_ME(m_layout)
 
 class WXDLLEXPORT wxHtmlPageBreakCell : public wxHtmlCell
 {
 
 class WXDLLEXPORT wxHtmlPageBreakCell : public wxHtmlCell
 {

-  public:
+public:

     wxHtmlPageBreakCell() {}
 
     wxHtmlPageBreakCell() {}
 

-    bool AdjustPagebreak(int* pagebreak, int* known_pagebreaks = NULL, int number_of_pages = 0) const;
+    bool AdjustPagebreak(int* pagebreak,
+                         int* known_pagebreaks = NULL,
+                         int number_of_pages = 0) const;
+    void Draw(wxDC& WXUNUSED(dc),
+              int WXUNUSED(x), int WXUNUSED(y),
+              int WXUNUSED(view_y1), int WXUNUSED(view_y2),
+              wxHtmlRenderingState& WXUNUSED(state)) {}

 
 

-  private:
+private:

     DECLARE_NO_COPY_CLASS(wxHtmlPageBreakCell)
 };
 
     DECLARE_NO_COPY_CLASS(wxHtmlPageBreakCell)
 };
 


@@ -130,7 +136,7 @@ TAG_HANDLER_BEGIN(P, "P")
 
     TAG_HANDLER_PROC(tag)
     {
 
     TAG_HANDLER_PROC(tag)
     {

-        if (m_WParser->GetContainer()->GetFirstCell() != NULL)
+        if (m_WParser->GetContainer()->GetFirstChild() != NULL)

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


@@ -171,7 +177,7 @@ TAG_HANDLER_BEGIN(CENTER, "CENTER")
         wxHtmlContainerCell *c = m_WParser->GetContainer();
 
         m_WParser->SetAlign(wxHTML_ALIGN_CENTER);
         wxHtmlContainerCell *c = m_WParser->GetContainer();
 
         m_WParser->SetAlign(wxHTML_ALIGN_CENTER);

-        if (c->GetFirstCell() != NULL)
+        if (c->GetFirstChild() != NULL)

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


@@ -184,7 +190,7 @@ TAG_HANDLER_BEGIN(CENTER, "CENTER")
             ParseInner(tag);
 
             m_WParser->SetAlign(old);
             ParseInner(tag);
 
             m_WParser->SetAlign(old);

-            if (c->GetFirstCell() != NULL)
+            if (c->GetFirstChild() != NULL)

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


@@ -225,7 +231,7 @@ TAG_HANDLER_BEGIN(DIV, "DIV")
         {
             int old = m_WParser->GetAlign();
             wxHtmlContainerCell *c = m_WParser->GetContainer();
         {
             int old = m_WParser->GetAlign();
             wxHtmlContainerCell *c = m_WParser->GetContainer();

-            if (c->GetFirstCell() != NULL)
+            if (c->GetFirstChild() != NULL)

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


@@ -242,7 +248,7 @@ TAG_HANDLER_BEGIN(DIV, "DIV")
             ParseInner(tag);
 
             m_WParser->SetAlign(old);
             ParseInner(tag);
 
             m_WParser->SetAlign(old);

-            if (c->GetFirstCell() != NULL)
+            if (c->GetFirstChild() != NULL)

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