X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/69941f05864fa8b37856ccc1338124bfac756a2b..328bfc22243e3d4672ddf626db4f78e4269c7275:/src/html/m_pre.cpp
diff --git a/src/html/m_pre.cpp b/src/html/m_pre.cpp
index 25e24cf402..f87983853a 100644
--- a/src/html/m_pre.cpp
+++ b/src/html/m_pre.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: mod_pre.cpp
+// Name: m_pre.cpp
// Purpose: wxHtml module for
...
tag (code citation)
// Author: Vaclav Slavik
// RCS-ID: $Id$
@@ -11,103 +11,25 @@
#pragma implementation
#endif
-#include
+#include "wx/wxprec.h"
-#if wxUSE_HTML
+#include "wx/defs.h"
+#if wxUSE_HTML && wxUSE_STREAMS
#ifdef __BORDLANDC__
#pragma hdrstop
#endif
#ifndef WXPRECOMP
-#include
#endif
-
#include "wx/html/forcelnk.h"
#include "wx/html/m_templ.h"
#include "wx/html/htmlcell.h"
-#include
-
-FORCE_LINK_ME(mod_pre)
-
-
-//-----------------------------------------------------------------------------
-// wxHtmlCodeCell
-//-----------------------------------------------------------------------------
-
-class wxHtmlPRECell : public wxHtmlCell
-{
- private:
- wxString** m_Text;
- // list of wxString objects.
- int m_LinesCnt;
- // number of lines
- int m_LineHeight;
- // height of single line of text
-
- public:
- wxHtmlPRECell(const wxString& s, wxDC& dc);
- ~wxHtmlPRECell();
- void Draw(wxDC& dc, int x, int y, int view_y1, int view_y2);
-};
-
-
-wxHtmlPRECell::wxHtmlPRECell(const wxString& s, wxDC& dc) : wxHtmlCell()
-{
- wxStringTokenizer tokenizer(s, "\n");
- wxString tmp;
- long int x, z;
- int i;
-
- m_LineHeight = dc.GetCharHeight();
- m_LinesCnt = 0;
- m_Text = NULL;
- m_Width = m_Height = 0;
-
- i = 0;
-#if (wxVERSION_NUMBER < 2100)
- while (tokenizer.HasMoreToken()) {
-#else
- while (tokenizer.HasMoreTokens()) {
-#endif
- if (i % 10 == 0) m_Text = (wxString**) realloc(m_Text, sizeof(wxString*) * (i + 10));
- tmp = tokenizer.NextToken();
- tmp.Replace(" ", " ", TRUE);
- tmp.Replace(""", "\"", TRUE);
- tmp.Replace("<", "<", TRUE);
- tmp.Replace(">", ">", TRUE);
- tmp.Replace("&", "&", TRUE);
- tmp.Replace("\t", " ", TRUE);
- tmp.Replace("\r", "", TRUE);
- m_Text[i++] = new wxString(tmp);
-
- dc.GetTextExtent(tmp, &x, &z, &z);
- if (x > m_Width) m_Width = x;
- m_Height += m_LineHeight;
- m_LinesCnt++;
- }
-}
-
-
-
-wxHtmlPRECell::~wxHtmlPRECell()
-{
- for (int i = 0; i < m_LinesCnt; i++) delete m_Text[i];
- free(m_Text);
-}
-
-
-void wxHtmlPRECell::Draw(wxDC& dc, int x, int y, int view_y1, int view_y2)
-{
- for (int i = 0; i < m_LinesCnt; i++)
- dc.DrawText(*(m_Text[i]), x + m_PosX, y + m_PosY + m_LineHeight * i);
-
- wxHtmlCell::Draw(dc, x, y, view_y1, view_y2);
-}
-
-
+#include "wx/tokenzr.h"
+#include "wx/encconv.h"
+FORCE_LINK_ME(m_pre)
//-----------------------------------------------------------------------------
// The list handler:
@@ -120,39 +42,49 @@ TAG_HANDLER_BEGIN(PRE, "PRE")
{
wxHtmlContainerCell *c;
- int fixed = m_WParser -> GetFontFixed(),
- italic = m_WParser -> GetFontItalic(),
- underlined = m_WParser -> GetFontUnderlined(),
- bold = m_WParser -> GetFontBold(),
- fsize = m_WParser -> GetFontSize();
-
- m_WParser -> CloseContainer();
- c = m_WParser -> OpenContainer();
- c -> SetAlignHor(HTML_ALIGN_LEFT);
- c -> SetIndent(m_WParser -> GetCharHeight(), HTML_INDENT_VERTICAL);
-
- m_WParser -> SetFontUnderlined(FALSE);
- m_WParser -> SetFontBold(FALSE);
- m_WParser -> SetFontItalic(FALSE);
- m_WParser -> SetFontFixed(TRUE);
- m_WParser -> SetFontSize(0);
- c -> InsertCell(new wxHtmlFontCell(m_WParser -> CreateCurrentFont()));
-
- {
- wxString cit;
- cit = m_WParser -> GetSource() -> Mid(tag.GetBeginPos(), tag.GetEndPos1() - tag.GetBeginPos());
- c -> InsertCell(new wxHtmlPRECell(cit, *(m_WParser -> GetDC())));
- }
-
- m_WParser -> SetFontUnderlined(underlined);
- m_WParser -> SetFontBold(bold);
- m_WParser -> SetFontItalic(italic);
- m_WParser -> SetFontFixed(fixed);
- m_WParser -> SetFontSize(fsize);
- c -> InsertCell(new wxHtmlFontCell(m_WParser -> CreateCurrentFont()));
-
- m_WParser -> CloseContainer();
- m_WParser -> OpenContainer();
+ int fixed = m_WParser->GetFontFixed(),
+ italic = m_WParser->GetFontItalic(),
+ underlined = m_WParser->GetFontUnderlined(),
+ bold = m_WParser->GetFontBold(),
+ fsize = m_WParser->GetFontSize();
+
+ c = m_WParser->GetContainer();
+ m_WParser->SetFontUnderlined(FALSE);
+ m_WParser->SetFontBold(FALSE);
+ m_WParser->SetFontItalic(FALSE);
+ m_WParser->SetFontFixed(TRUE);
+ m_WParser->SetFontSize(3);
+ c->InsertCell(new wxHtmlFontCell(m_WParser->CreateCurrentFont()));
+
+ m_WParser->CloseContainer();
+ c = m_WParser->OpenContainer();
+ c->SetAlignHor(wxHTML_ALIGN_LEFT);
+
+ wxString src, srcMid;
+
+ src = *m_WParser->GetSource();
+ srcMid = src.Mid(tag.GetBeginPos(),
+ tag.GetEndPos1() - tag.GetBeginPos());
+ srcMid.Replace(wxT("\t"), wxT(" "));
+ srcMid.Replace(wxT(" "), wxT(" "));
+ srcMid.Replace(wxT("\n"), wxT("
"));
+
+ // It is safe to temporarily change the source being parsed,
+ // provided we restore the state back after parsing
+ m_Parser->SetSource(srcMid);
+ m_Parser->DoParsing();
+ m_Parser->SetSource(src);
+
+ m_WParser->CloseContainer();
+ c = m_WParser->OpenContainer();
+
+ m_WParser->SetFontUnderlined(underlined);
+ m_WParser->SetFontBold(bold);
+ m_WParser->SetFontItalic(italic);
+ m_WParser->SetFontFixed(fixed);
+ m_WParser->SetFontSize(fsize);
+ c->InsertCell(new wxHtmlFontCell(m_WParser->CreateCurrentFont()));
+
return TRUE;
}