X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c88293a4045cce459d50469d5cae27e8509570e1..24b9f055150de329d1fb61df5ce8d14e6d657cd0:/src/html/m_hline.cpp?ds=sidebyside diff --git a/src/html/m_hline.cpp b/src/html/m_hline.cpp index fdb5a1fa48..77f4abcb64 100644 --- a/src/html/m_hline.cpp +++ b/src/html/m_hline.cpp @@ -15,7 +15,7 @@ #include "wx/defs.h" -#if wxUSE_HTML +#if wxUSE_HTML && wxUSE_STREAMS #ifdef __BORDLANDC__ #pragma hdrstop #endif @@ -43,7 +43,7 @@ class wxHtmlLineCell : public wxHtmlCell public: wxHtmlLineCell(int size) : wxHtmlCell() {m_Height = size;} void Draw(wxDC& dc, int x, int y, int view_y1, int view_y2); - void Layout(int w) {m_Width = w; if (m_Next) m_Next -> Layout(w);} + void Layout(int w) {m_Width = w; if (m_Next) m_Next->Layout(w);} }; @@ -72,19 +72,19 @@ TAG_HANDLER_BEGIN(HR, "HR") wxHtmlContainerCell *c; int sz; - m_WParser -> CloseContainer(); - c = m_WParser -> OpenContainer(); + m_WParser->CloseContainer(); + c = m_WParser->OpenContainer(); - c -> SetIndent(m_WParser -> GetCharHeight(), wxHTML_INDENT_VERTICAL); - c -> SetAlignHor(wxHTML_ALIGN_CENTER); - c -> SetAlign(tag); - c -> SetWidthFloat(tag); + c->SetIndent(m_WParser->GetCharHeight(), wxHTML_INDENT_VERTICAL); + c->SetAlignHor(wxHTML_ALIGN_CENTER); + c->SetAlign(tag); + c->SetWidthFloat(tag); sz = 1; - if (tag.HasParam(wxT("SIZE")) && tag.ScanParam(wxT("SIZE"), wxT("%i"), &sz) == 1) {} - c -> InsertCell(new wxHtmlLineCell((int)((double)sz * m_WParser -> GetPixelScale()))); + tag.GetParamAsInt(wxT("SIZE"), &sz); + c->InsertCell(new wxHtmlLineCell((int)((double)sz * m_WParser->GetPixelScale()))); - m_WParser -> CloseContainer(); - m_WParser -> OpenContainer(); + m_WParser->CloseContainer(); + m_WParser->OpenContainer(); return FALSE; }