Applied patch [ 710608 ] wxImage::GetImageExtWildcard for image load/save dialogs.

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

diff --git a/src/html/m_layout.cpp b/src/html/m_layout.cpp
index 15aa9a2fa4eb7bdf5447d041afe7d34f61011869..f99e547ca131f3ee46105740960182708da3be17 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
 {
-  public:
+public:
     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)
 };
 
@@ -205,9 +211,9 @@ TAG_HANDLER_BEGIN(DIV, "DIV")
 
     TAG_HANDLER_PROC(tag)
     {
-        if(tag.HasParam("STYLE"))
+        if(tag.HasParam(wxT("STYLE")))
         {
-            if(tag.GetParam("STYLE").IsSameAs(wxString("PAGE-BREAK-BEFORE:ALWAYS"), FALSE))
+            if(tag.GetParam(wxT("STYLE")).IsSameAs(wxT("PAGE-BREAK-BEFORE:ALWAYS"), FALSE))
             {
                 m_WParser->CloseContainer();
                 m_WParser->OpenContainer()->InsertCell(new wxHtmlPageBreakCell);
@@ -221,7 +227,7 @@ TAG_HANDLER_BEGIN(DIV, "DIV")
                 return FALSE;
             }
         }
-        else if(tag.HasParam("ALIGN"))
+        else if(tag.HasParam(wxT("ALIGN")))
         {
             int old = m_WParser->GetAlign();
             wxHtmlContainerCell *c = m_WParser->GetContainer();