fixed a design flaw in wxFontMapper that prevented automatic creation of wxConfig...

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

diff --git a/src/html/m_tables.cpp b/src/html/m_tables.cpp
index 01d149d748ea5efb4d23762ec8e21af4a2ac109e..e6505e6898e8e53405a03ba079269d0688016ad1 100644 (file)
--- a/src/html/m_tables.cpp
+++ b/src/html/m_tables.cpp
@@ -20,7 +20,6 @@
 #endif
 
 #ifndef WXPRECOMP
 #endif
 
 #ifndef WXPRECOMP

-#include "wx/wx.h"

 #endif
 
 
 #endif
 
 


@@ -49,8 +48,10 @@ FORCE_LINK_ME(m_tables)
 
 
 typedef struct {
 
 
 typedef struct {

-        int width, units;                      // universal
-        int leftpos, pixwidth, maxrealwidth;   // temporary (depends on width of table)
+        int width, units;
+                // universal
+        int leftpos, pixwidth, maxrealwidth;
+                // temporary (depends on width of table)

     } colStruct;
 
 typedef enum {
     } colStruct;
 
 typedef enum {


@@ -90,7 +91,7 @@ class wxHtmlTableCell : public wxHtmlContainerCell
                 // number of actual column (ranging from 0..m_NumCols)
 
         // default values (for table and row):
                 // number of actual column (ranging from 0..m_NumCols)
 
         // default values (for table and row):

-        int m_tBkg, m_rBkg;
+        wxColour m_tBkg, m_rBkg;

         wxString m_tValign, m_rValign;
 
         double m_PixelScale;
         wxString m_tValign, m_rValign;
 
         double m_PixelScale;


@@ -117,18 +118,23 @@ wxHtmlTableCell::wxHtmlTableCell(wxHtmlContainerCell *parent, const wxHtmlTag& t
  : wxHtmlContainerCell(parent)
 {
     m_PixelScale = pixel_scale;
  : wxHtmlContainerCell(parent)
 {
     m_PixelScale = pixel_scale;

-    m_HasBorders = (tag.HasParam(wxT("BORDER")) && tag.GetParam(wxT("BORDER")) != wxT("0"));
+    m_HasBorders = (tag.GetParam(wxT("BORDER")) != wxT("0"));

     m_ColsInfo = NULL;
     m_NumCols = m_NumRows = 0;
     m_CellInfo = NULL;
     m_ActualCol = m_ActualRow = -1;
 
     /* scan params: */
     m_ColsInfo = NULL;
     m_NumCols = m_NumRows = 0;
     m_CellInfo = NULL;
     m_ActualCol = m_ActualRow = -1;
 
     /* scan params: */

-    m_tBkg = m_rBkg = -1;
-    if (tag.HasParam(wxT("BGCOLOR"))) tag.ScanParam(wxT("BGCOLOR"), wxT("#%lX"), &m_tBkg);
-    if (tag.HasParam(wxT("VALIGN"))) m_tValign = tag.GetParam(wxT("VALIGN")); else m_tValign = wxEmptyString;
-    if (tag.HasParam(wxT("CELLSPACING")) && tag.ScanParam(wxT("CELLSPACING"), wxT("%i"), &m_Spacing) == 1) {} else m_Spacing = 2;
-    if (tag.HasParam(wxT("CELLPADDING")) && tag.ScanParam(wxT("CELLPADDING"), wxT("%i"), &m_Padding) == 1) {} else m_Padding = 3;
+    if (tag.HasParam(wxT("BGCOLOR")))
+        tag.GetParamAsColour(wxT("BGCOLOR"), &m_tBkg);
+    if (tag.HasParam(wxT("VALIGN")))
+        m_tValign = tag.GetParam(wxT("VALIGN"));
+    else
+        m_tValign = wxEmptyString;
+    if (!tag.GetParamAsInt(wxT("CELLSPACING"), &m_Spacing))
+        m_Spacing = 2;
+    if (!tag.GetParamAsInt(wxT("CELLPADDING"), &m_Padding))
+        m_Padding = 3;

     m_Spacing = (int)(m_PixelScale * (double)m_Spacing);
     m_Padding = (int)(m_PixelScale * (double)m_Padding);
 
     m_Spacing = (int)(m_PixelScale * (double)m_Spacing);
     m_Padding = (int)(m_PixelScale * (double)m_Padding);
 


@@ -141,7 +147,7 @@ wxHtmlTableCell::wxHtmlTableCell(wxHtmlContainerCell *parent, const wxHtmlTag& t
 wxHtmlTableCell::~wxHtmlTableCell()
 {
     if (m_ColsInfo) free(m_ColsInfo);
 wxHtmlTableCell::~wxHtmlTableCell()
 {
     if (m_ColsInfo) free(m_ColsInfo);

-    if (m_CellInfo) 
+    if (m_CellInfo)

     {
         for (int i = 0; i < m_NumRows; i++)
             free(m_CellInfo[i]);
     {
         for (int i = 0; i < m_NumRows; i++)
             free(m_CellInfo[i]);


@@ -155,7 +161,7 @@ void wxHtmlTableCell::ReallocCols(int cols)
 {
     int i,j;
 
 {
     int i,j;
 

-    for (i = 0; i < m_NumRows; i++) 
+    for (i = 0; i < m_NumRows; i++)

     {
         m_CellInfo[i] = (cellStruct*) realloc(m_CellInfo[i], sizeof(cellStruct) * cols);
         for (j = m_NumCols; j < cols; j++)
     {
         m_CellInfo[i] = (cellStruct*) realloc(m_CellInfo[i], sizeof(cellStruct) * cols);
         for (j = m_NumCols; j < cols; j++)


@@ -163,7 +169,7 @@ void wxHtmlTableCell::ReallocCols(int cols)
     }
 
     m_ColsInfo = (colStruct*) realloc(m_ColsInfo, sizeof(colStruct) * cols);
     }
 
     m_ColsInfo = (colStruct*) realloc(m_ColsInfo, sizeof(colStruct) * cols);

-    for (j = m_NumCols; j < cols; j++) 
+    for (j = m_NumCols; j < cols; j++)

     {
            m_ColsInfo[j].width = 0;
            m_ColsInfo[j].units = wxHTML_UNITS_PERCENT;
     {
            m_ColsInfo[j].width = 0;
            m_ColsInfo[j].units = wxHTML_UNITS_PERCENT;


@@ -177,11 +183,11 @@ void wxHtmlTableCell::ReallocCols(int cols)
 void wxHtmlTableCell::ReallocRows(int rows)
 {
     m_CellInfo = (cellStruct**) realloc(m_CellInfo, sizeof(cellStruct*) * rows);
 void wxHtmlTableCell::ReallocRows(int rows)
 {
     m_CellInfo = (cellStruct**) realloc(m_CellInfo, sizeof(cellStruct*) * rows);

-    for (int row = m_NumRows; row < rows ; row++) 
+    for (int row = m_NumRows; row < rows ; row++)

     {
     {

-        if (m_NumCols == 0) 
+        if (m_NumCols == 0)

             m_CellInfo[row] = NULL;
             m_CellInfo[row] = NULL;

-        else 
+        else

         {
             m_CellInfo[row] = (cellStruct*) malloc(sizeof(cellStruct) * m_NumCols);
             for (int col = 0; col < m_NumCols; col++)
         {
             m_CellInfo[row] = (cellStruct*) malloc(sizeof(cellStruct) * m_NumCols);
             for (int col = 0; col < m_NumCols; col++)


@@ -201,11 +207,11 @@ void wxHtmlTableCell::AddRow(const wxHtmlTag& tag)
 
     // scan params:
     m_rBkg = m_tBkg;
 
     // scan params:
     m_rBkg = m_tBkg;

-    if (tag.HasParam(wxT("BGCOLOR"))) 
-        tag.ScanParam(wxT("BGCOLOR"), wxT("#%lX"), &m_rBkg);
-    if (tag.HasParam(wxT("VALIGN"))) 
-        m_rValign = tag.GetParam(wxT("VALIGN")); 
-    else 
+    if (tag.HasParam(wxT("BGCOLOR")))
+        tag.GetParamAsColour(wxT("BGCOLOR"), &m_rBkg);
+    if (tag.HasParam(wxT("VALIGN")))
+        m_rValign = tag.GetParam(wxT("VALIGN"));
+    else

         m_rValign = m_tValign;
 }
 
         m_rValign = m_tValign;
 }
 


@@ -223,11 +229,12 @@ void wxHtmlTableCell::AddCell(wxHtmlContainerCell *cell, const wxHtmlTag& tag)
     }
 
     // cells & columns:
     }
 
     // cells & columns:

-    do 
+    do

     {
         m_ActualCol++;
     {
         m_ActualCol++;

-    } while ((m_ActualCol < m_NumCols) && (m_CellInfo[m_ActualRow][m_ActualCol].flag != cellFree));
-    
+    } while ((m_ActualCol < m_NumCols) &&
+             (m_CellInfo[m_ActualRow][m_ActualCol].flag != cellFree));
+

     if (m_ActualCol > m_NumCols - 1)
         ReallocCols(m_ActualCol + 1);
 
     if (m_ActualCol > m_NumCols - 1)
         ReallocCols(m_ActualCol + 1);
 


@@ -244,16 +251,16 @@ void wxHtmlTableCell::AddCell(wxHtmlContainerCell *cell, const wxHtmlTag& tag)
 
     // width:
     {
 
     // width:
     {

-        if (tag.HasParam("WIDTH")) 
+        if (tag.HasParam(wxT("WIDTH")))

         {
         {

-            wxString wd = tag.GetParam("WIDTH");
+            wxString wd = tag.GetParam(wxT("WIDTH"));

 
 

-            if (wd[wd.Length()-1] == '%') 
+            if (wd[wd.Length()-1] == wxT('%'))

             {
                 wxSscanf(wd.c_str(), wxT("%i%%"), &m_ColsInfo[c].width);
                 m_ColsInfo[c].units = wxHTML_UNITS_PERCENT;
             }
             {
                 wxSscanf(wd.c_str(), wxT("%i%%"), &m_ColsInfo[c].width);
                 m_ColsInfo[c].units = wxHTML_UNITS_PERCENT;
             }

-            else 
+            else

             {
                 wxSscanf(wd.c_str(), wxT("%i"), &m_ColsInfo[c].width);
                 m_ColsInfo[c].width = (int)(m_PixelScale * (double)m_ColsInfo[c].width);
             {
                 wxSscanf(wd.c_str(), wxT("%i"), &m_ColsInfo[c].width);
                 m_ColsInfo[c].width = (int)(m_PixelScale * (double)m_ColsInfo[c].width);


@@ -265,14 +272,16 @@ void wxHtmlTableCell::AddCell(wxHtmlContainerCell *cell, const wxHtmlTag& tag)
 
     // spanning:
     {
 
     // spanning:
     {

-        if (tag.HasParam(wxT("COLSPAN"))) tag.ScanParam(wxT("COLSPAN"), wxT("%i"), &m_CellInfo[r][c].colspan);
-        if (tag.HasParam(wxT("ROWSPAN"))) tag.ScanParam(wxT("ROWSPAN"), wxT("%i"), &m_CellInfo[r][c].rowspan);
-        if ((m_CellInfo[r][c].colspan != 1) || (m_CellInfo[r][c].rowspan != 1)) 
+        tag.GetParamAsInt(wxT("COLSPAN"), &m_CellInfo[r][c].colspan);
+        tag.GetParamAsInt(wxT("ROWSPAN"), &m_CellInfo[r][c].rowspan);
+        if ((m_CellInfo[r][c].colspan != 1) || (m_CellInfo[r][c].rowspan != 1))

         {
             int i, j;
 
         {
             int i, j;
 

-            if (r + m_CellInfo[r][c].rowspan > m_NumRows) ReallocRows(r + m_CellInfo[r][c].rowspan);
-            if (c + m_CellInfo[r][c].colspan > m_NumCols) ReallocCols(c + m_CellInfo[r][c].colspan);
+            if (r + m_CellInfo[r][c].rowspan > m_NumRows)
+                ReallocRows(r + m_CellInfo[r][c].rowspan);
+            if (c + m_CellInfo[r][c].colspan > m_NumCols)
+                ReallocCols(c + m_CellInfo[r][c].colspan);

             for (i = r; i < r + m_CellInfo[r][c].rowspan; i++)
                 for (j = c; j < c + m_CellInfo[r][c].colspan; j++)
                     m_CellInfo[i][j].flag = cellSpan;
             for (i = r; i < r + m_CellInfo[r][c].rowspan; i++)
                 for (j = c; j < c + m_CellInfo[r][c].colspan; j++)
                     m_CellInfo[i][j].flag = cellSpan;


@@ -282,13 +291,11 @@ void wxHtmlTableCell::AddCell(wxHtmlContainerCell *cell, const wxHtmlTag& tag)
 
     //background color:
     {
 
     //background color:
     {

-        int bk = m_rBkg;
-        if (tag.HasParam(wxT("BGCOLOR"))) tag.ScanParam(wxT("BGCOLOR"), wxT("#%lX"), &bk);
-        if (bk != -1) 
-        {
-            wxColour clr = wxColour((bk & 0xFF0000) >> 16 , (bk & 0x00FF00) >> 8, (bk & 0x0000FF));
-            cell->SetBackgroundColour(clr);
-        }
+        wxColour bk = m_rBkg;
+        if (tag.HasParam(wxT("BGCOLOR")))
+            tag.GetParamAsColour(wxT("BGCOLOR"), &bk);
+        if (bk.Ok())
+            cell->SetBackgroundColour(bk);

     }
     if (m_HasBorders)
         cell->SetBorder(TABLE_BORDER_CLR_2, TABLE_BORDER_CLR_1);
     }
     if (m_HasBorders)
         cell->SetBorder(TABLE_BORDER_CLR_2, TABLE_BORDER_CLR_1);


@@ -296,10 +303,15 @@ void wxHtmlTableCell::AddCell(wxHtmlContainerCell *cell, const wxHtmlTag& tag)
     // vertical alignment:
     {
         wxString valign;
     // vertical alignment:
     {
         wxString valign;

-        if (tag.HasParam(wxT("VALIGN"))) valign = tag.GetParam(wxT("VALIGN")); else valign = m_tValign;
+        if (tag.HasParam(wxT("VALIGN")))
+            valign = tag.GetParam(wxT("VALIGN"));
+        else
+            valign = m_tValign;

         valign.MakeUpper();
         valign.MakeUpper();

-        if (valign == wxT("TOP")) m_CellInfo[r][c].valign = wxHTML_ALIGN_TOP;
-        else if (valign == wxT("BOTTOM")) m_CellInfo[r][c].valign = wxHTML_ALIGN_BOTTOM;
+        if (valign == wxT("TOP"))
+            m_CellInfo[r][c].valign = wxHTML_ALIGN_TOP;
+        else if (valign == wxT("BOTTOM"))
+            m_CellInfo[r][c].valign = wxHTML_ALIGN_BOTTOM;

         else m_CellInfo[r][c].valign = wxHTML_ALIGN_CENTER;
     }
 
         else m_CellInfo[r][c].valign = wxHTML_ALIGN_CENTER;
     }
 


@@ -318,12 +330,12 @@ void wxHtmlTableCell::Layout(int w)
 
     */
 
 
     */
 

-    if (m_WidthFloatUnits == wxHTML_UNITS_PERCENT) 
+    if (m_WidthFloatUnits == wxHTML_UNITS_PERCENT)

     {
         if (m_WidthFloat < 0) m_Width = (100 + m_WidthFloat) * w / 100;
         else m_Width = m_WidthFloat * w / 100;
     }
     {
         if (m_WidthFloat < 0) m_Width = (100 + m_WidthFloat) * w / 100;
         else m_Width = m_WidthFloat * w / 100;
     }

-    else 
+    else

     {
         if (m_WidthFloat < 0) m_Width = w + m_WidthFloat;
         else m_Width = m_WidthFloat;
     {
         if (m_WidthFloat < 0) m_Width = w + m_WidthFloat;
         else m_Width = m_WidthFloat;


@@ -366,7 +378,7 @@ void wxHtmlTableCell::Layout(int w)
     /* 2.  compute positions of columns: */
     {
         int wpos = m_Spacing;
     /* 2.  compute positions of columns: */
     {
         int wpos = m_Spacing;

-        for (int i = 0; i < m_NumCols; i++) 
+        for (int i = 0; i < m_NumCols; i++)

         {
             m_ColsInfo[i].leftpos = wpos;
             wpos += m_ColsInfo[i].pixwidth + m_Spacing;
         {
             m_ColsInfo[i].leftpos = wpos;
             wpos += m_ColsInfo[i].pixwidth + m_Spacing;


@@ -383,7 +395,7 @@ void wxHtmlTableCell::Layout(int w)
 
         ypos[0] = m_Spacing;
         for (actrow = 1; actrow <= m_NumRows; actrow++) ypos[actrow] = -1;
 
         ypos[0] = m_Spacing;
         for (actrow = 1; actrow <= m_NumRows; actrow++) ypos[actrow] = -1;

-        for (actrow = 0; actrow < m_NumRows; actrow++) 
+        for (actrow = 0; actrow < m_NumRows; actrow++)

         {
             if (ypos[actrow] == -1) ypos[actrow] = ypos[actrow-1];
             // 3a. sub-layout and detect max height:
         {
             if (ypos[actrow] == -1) ypos[actrow] = ypos[actrow-1];
             // 3a. sub-layout and detect max height:


@@ -404,11 +416,11 @@ void wxHtmlTableCell::Layout(int w)
             }
         }
 
             }
         }
 

-        for (actrow = 0; actrow < m_NumRows; actrow++) 
+        for (actrow = 0; actrow < m_NumRows; actrow++)

         {
             // 3b. place cells in row & let'em all have same height:
 
         {
             // 3b. place cells in row & let'em all have same height:
 

-            for (actcol = 0; actcol < m_NumCols; actcol++) 
+            for (actcol = 0; actcol < m_NumCols; actcol++)

             {
                 if (m_CellInfo[actrow][actcol].flag != cellUsed) continue;
                 actcell = m_CellInfo[actrow][actcol].cont;
             {
                 if (m_CellInfo[actrow][actcol].flag != cellUsed) continue;
                 actcell = m_CellInfo[actrow][actcol].cont;


@@ -458,7 +470,7 @@ TAG_HANDLER_BEGIN(TABLE, "TABLE,TR,TD,TH")
         wxHtmlContainerCell *c;
 
         // new table started, backup upper-level table (if any) and create new:
         wxHtmlContainerCell *c;
 
         // new table started, backup upper-level table (if any) and create new:

-        if (tag.GetName() == wxT("TABLE")) 
+        if (tag.GetName() == wxT("TABLE"))

         {
             wxHtmlTableCell *oldt = m_Table;
             wxHtmlContainerCell *oldcont;
         {
             wxHtmlTableCell *oldt = m_Table;
             wxHtmlContainerCell *oldcont;


@@ -470,7 +482,8 @@ TAG_HANDLER_BEGIN(TABLE, "TABLE,TR,TD,TH")
             m_Table = new wxHtmlTableCell(c, tag, m_WParser->GetPixelScale());
             m_OldAlign = m_WParser->GetAlign();
             m_tAlign = wxEmptyString;
             m_Table = new wxHtmlTableCell(c, tag, m_WParser->GetPixelScale());
             m_OldAlign = m_WParser->GetAlign();
             m_tAlign = wxEmptyString;

-            if (tag.HasParam(wxT("ALIGN"))) m_tAlign = tag.GetParam(wxT("ALIGN"));
+            if (tag.HasParam(wxT("ALIGN")))
+                m_tAlign = tag.GetParam(wxT("ALIGN"));

 
             ParseInner(tag);
 
 
             ParseInner(tag);
 


@@ -482,18 +495,19 @@ TAG_HANDLER_BEGIN(TABLE, "TABLE,TR,TD,TH")
         }
 
 
         }
 
 

-        else if (m_Table && !tag.IsEnding()) 
+        else if (m_Table && !tag.IsEnding())

         {
             // new row in table
         {
             // new row in table

-            if (tag.GetName() == wxT("TR")) 
+            if (tag.GetName() == wxT("TR"))

             {
                 m_Table->AddRow(tag);
                 m_rAlign = m_tAlign;
             {
                 m_Table->AddRow(tag);
                 m_rAlign = m_tAlign;

-                if (tag.HasParam(wxT("ALIGN"))) m_rAlign = tag.GetParam(wxT("ALIGN"));
+                if (tag.HasParam(wxT("ALIGN")))
+                    m_rAlign = tag.GetParam(wxT("ALIGN"));

             }
 
             // new cell
             }
 
             // new cell

-            else 
+            else

             {
                 m_WParser->SetAlign(m_OldAlign);
                 c = m_WParser->SetContainer(new wxHtmlContainerCell(m_Table));
             {
                 m_WParser->SetAlign(m_OldAlign);
                 c = m_WParser->SetContainer(new wxHtmlContainerCell(m_Table));


@@ -501,7 +515,7 @@ TAG_HANDLER_BEGIN(TABLE, "TABLE,TR,TD,TH")
 
                 m_WParser->OpenContainer();
 
 
                 m_WParser->OpenContainer();
 

-                if (tag.GetName() == wxT("TH")) /*header style*/ 
+                if (tag.GetName() == wxT("TH")) /*header style*/

                 {
                     m_WParser->SetAlign(wxHTML_ALIGN_CENTER);
                 }
                 {
                     m_WParser->SetAlign(wxHTML_ALIGN_CENTER);
                 }


@@ -510,10 +524,13 @@ TAG_HANDLER_BEGIN(TABLE, "TABLE,TR,TD,TH")
                     wxString als;
 
                     als = m_rAlign;
                     wxString als;
 
                     als = m_rAlign;

-                    if (tag.HasParam(wxT("ALIGN"))) als = tag.GetParam(wxT("ALIGN"));
+                    if (tag.HasParam(wxT("ALIGN")))
+                        als = tag.GetParam(wxT("ALIGN"));

                     als.MakeUpper();
                     als.MakeUpper();

-                    if (als == wxT("RIGHT")) m_WParser->SetAlign(wxHTML_ALIGN_RIGHT);
-                    else if (als == wxT("CENTER")) m_WParser->SetAlign(wxHTML_ALIGN_CENTER);
+                    if (als == wxT("RIGHT"))
+                        m_WParser->SetAlign(wxHTML_ALIGN_RIGHT);
+                    else if (als == wxT("CENTER"))
+                        m_WParser->SetAlign(wxHTML_ALIGN_CENTER);

                 }
                 m_WParser->OpenContainer();
             }
                 }
                 m_WParser->OpenContainer();
             }