Updated MicroWindows makefile

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

diff --git a/src/html/m_layout.cpp b/src/html/m_layout.cpp
index c026d8cabb522448e283901dfabd8606822e2c00..c8fe7096be433699ecc24715d1c576fc5e5cd81a 100644 (file)
--- a/src/html/m_layout.cpp
+++ b/src/html/m_layout.cpp
@@ -36,7 +36,7 @@ TAG_HANDLER_BEGIN(P, "P")
 
     TAG_HANDLER_PROC(tag)
     {
 
     TAG_HANDLER_PROC(tag)
     {

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

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


@@ -56,7 +56,7 @@ TAG_HANDLER_BEGIN(BR, "BR")
     {
         int al = m_WParser->GetContainer()->GetAlignHor();
         wxHtmlContainerCell *c;
     {
         int al = m_WParser->GetContainer()->GetAlignHor();
         wxHtmlContainerCell *c;

-    
+

         m_WParser->CloseContainer();
         c = m_WParser->OpenContainer();
         c->SetAlignHor(al);
         m_WParser->CloseContainer();
         c = m_WParser->OpenContainer();
         c->SetAlignHor(al);


@@ -77,7 +77,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->GetFirstCell() != NULL)

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


@@ -85,12 +85,12 @@ TAG_HANDLER_BEGIN(CENTER, "CENTER")
         else
             c->SetAlignHor(wxHTML_ALIGN_CENTER);
 
         else
             c->SetAlignHor(wxHTML_ALIGN_CENTER);
 

-        if (tag.HasEnding()) 
+        if (tag.HasEnding())

            {
             ParseInner(tag);
 
             m_WParser->SetAlign(old);
            {
             ParseInner(tag);
 
             m_WParser->SetAlign(old);

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

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


@@ -113,7 +113,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->GetFirstCell() != NULL)

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


@@ -121,7 +121,7 @@ TAG_HANDLER_BEGIN(DIV, "DIV")
             c->SetAlign(tag);
             m_WParser->SetAlign(c->GetAlignHor());
         }
             c->SetAlign(tag);
             m_WParser->SetAlign(c->GetAlignHor());
         }

-        else 
+        else

            {
             c->SetAlign(tag);
             m_WParser->SetAlign(c->GetAlignHor());
            {
             c->SetAlign(tag);
             m_WParser->SetAlign(c->GetAlignHor());


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

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

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


@@ -150,10 +150,10 @@ TAG_HANDLER_BEGIN(TITLE, "TITLE")
 
     TAG_HANDLER_PROC(tag)
     {
 
     TAG_HANDLER_PROC(tag)
     {

-        if (m_WParser->GetWindow()) 
+        if (m_WParser->GetWindow())

            {
             wxHtmlWindow *wfr = (wxHtmlWindow*)(m_WParser->GetWindow());
            {
             wxHtmlWindow *wfr = (wxHtmlWindow*)(m_WParser->GetWindow());

-            if (wfr) 
+            if (wfr)

                {
                 wxString title = "";
                 wxString *src = m_WParser->GetSource();
                {
                 wxString title = "";
                 wxString *src = m_WParser->GetSource();


@@ -174,37 +174,23 @@ TAG_HANDLER_BEGIN(BODY, "BODY")
 
     TAG_HANDLER_PROC(tag)
     {
 
     TAG_HANDLER_PROC(tag)
     {

-        unsigned long tmp;

         wxColour clr;
 
         wxColour clr;
 

-        if (tag.HasParam(wxT("TEXT"))) 
-           {
-            if (tag.ScanParam(wxT("TEXT"), wxT("#%lX"), &tmp) == 1) 
-               {
-                clr = wxColour((tmp & 0xFF0000) >> 16 , (tmp & 0x00FF00) >> 8, (tmp & 0x0000FF));
-                m_WParser->SetActualColor(clr);
-                m_WParser->GetContainer()->InsertCell(new wxHtmlColourCell(clr));
-            }
-       }
-
-        if (tag.HasParam(wxT("LINK"))) 
+        if (tag.GetParamAsColour(wxT("TEXT"), &clr))

            {
            {

-            if (tag.ScanParam(wxT("LINK"), wxT("#%lX"), &tmp) == 1) 
-               {
-                clr = wxColour((tmp & 0xFF0000) >> 16 , (tmp & 0x00FF00) >> 8, (tmp & 0x0000FF));
-                m_WParser->SetLinkColor(clr);
-           }
+            m_WParser->SetActualColor(clr);
+            m_WParser->GetContainer()->InsertCell(new wxHtmlColourCell(clr));

         }
 
         }
 

-        if (tag.HasParam(wxT("BGCOLOR"))) 
+        if (tag.GetParamAsColour(wxT("LINK"), &clr))
+            m_WParser->SetLinkColor(clr);
+
+        if (tag.GetParamAsColour(wxT("BGCOLOR"), &clr))

            {
            {

-            if (tag.ScanParam(wxT("BGCOLOR"), wxT("#%lX"), &tmp) == 1) 
-               {
-                clr = wxColour((tmp & 0xFF0000) >> 16 , (tmp & 0x00FF00) >> 8, (tmp & 0x0000FF));
-                m_WParser->GetContainer()->InsertCell(new wxHtmlColourCell(clr, wxHTML_CLR_BACKGROUND));
-                if (m_WParser->GetWindow() != NULL)
-                    m_WParser->GetWindow()->SetBackgroundColour(clr);
-           }
+            m_WParser->GetContainer()->InsertCell(
+                new wxHtmlColourCell(clr, wxHTML_CLR_BACKGROUND));
+            if (m_WParser->GetWindow() != NULL)
+                m_WParser->GetWindow()->SetBackgroundColour(clr);

         }
         return FALSE;
     }
         }
         return FALSE;
     }


@@ -218,15 +204,15 @@ TAG_HANDLER_BEGIN(BLOCKQUOTE, "BLOCKQUOTE")
     TAG_HANDLER_PROC(tag)
     {
         wxHtmlContainerCell *c;
     TAG_HANDLER_PROC(tag)
     {
         wxHtmlContainerCell *c;

-    
+

         m_WParser->CloseContainer();
         c = m_WParser->OpenContainer();
         m_WParser->CloseContainer();
         c = m_WParser->OpenContainer();

-    
+

            if (c->GetAlignHor() == wxHTML_ALIGN_RIGHT)
             c->SetIndent(5 * m_WParser->GetCharWidth(), wxHTML_INDENT_RIGHT);
         else
             c->SetIndent(5 * m_WParser->GetCharWidth(), wxHTML_INDENT_LEFT);
            if (c->GetAlignHor() == wxHTML_ALIGN_RIGHT)
             c->SetIndent(5 * m_WParser->GetCharWidth(), wxHTML_INDENT_RIGHT);
         else
             c->SetIndent(5 * m_WParser->GetCharWidth(), wxHTML_INDENT_LEFT);

-    
+

            c->SetIndent(m_WParser->GetCharHeight(), wxHTML_INDENT_TOP);
         m_WParser->OpenContainer();
         ParseInner(tag);
            c->SetIndent(m_WParser->GetCharHeight(), wxHTML_INDENT_TOP);
         m_WParser->OpenContainer();
         ParseInner(tag);