X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e92b9e696c76c60084fe731fc242ef21050ecc52..7112cdd1f3c4730391cf0a562f4d7dcee8676f07:/src/html/m_layout.cpp?ds=sidebyside diff --git a/src/html/m_layout.cpp b/src/html/m_layout.cpp index f1627378b6..c54b437c86 100644 --- a/src/html/m_layout.cpp +++ b/src/html/m_layout.cpp @@ -79,7 +79,7 @@ public: wxHtmlRenderingInfo& WXUNUSED(info)) {} private: - DECLARE_NO_COPY_CLASS(wxHtmlPageBreakCell) + wxDECLARE_NO_COPY_CLASS(wxHtmlPageBreakCell); }; bool wxHtmlPageBreakCell::AdjustPagebreak(int* pagebreak, wxArrayInt& known_pagebreaks) const @@ -285,7 +285,7 @@ TAG_HANDLER_BEGIN(TITLE, "TITLE") if (winIface) { wxString title(tag.GetBeginIter(), tag.GetEndIter1()); -#if !wxUSE_UNICODE && wxUSE_WCHAR_T +#if !wxUSE_UNICODE const wxFontEncoding enc = m_WParser->GetInputEncoding(); if ( enc != wxFONTENCODING_DEFAULT ) { @@ -340,7 +340,7 @@ TAG_HANDLER_BEGIN(BODY, "BODY") if ( is ) { wxImage image(*is); - if ( image.Ok() ) + if ( image.IsOk() ) winIface->SetHTMLBackgroundImage(image); }