allow changing the page from keyboard in property sheet like controls even when the...

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

diff --git a/src/html/m_tables.cpp b/src/html/m_tables.cpp
index 36f364e1af6fda37fe6c6c8aaf5cc819622b5b56..22aa730ef0adb9ab485e477d59c23921a73fd47e 100644 (file)
--- a/src/html/m_tables.cpp
+++ b/src/html/m_tables.cpp
@@ -1,24 +1,20 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        m_tables.cpp
+// Name:        src/html/m_tables.cpp

 // Purpose:     wxHtml module for tables
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vaclav Slavik
 // Purpose:     wxHtml module for tables
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vaclav Slavik

-// Licence:     wxWindows Licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation
-#endif
-

 #include "wx/wxprec.h"
 
 #include "wx/wxprec.h"
 

-#include "wx/defs.h"
-#if wxUSE_HTML && wxUSE_STREAMS

 #ifdef __BORLANDC__
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #endif
 

+#if wxUSE_HTML && wxUSE_STREAMS
+

 #ifndef WXPRECOMP
 #endif
 
 #ifndef WXPRECOMP
 #endif
 


@@ -103,6 +99,9 @@ private:
 public:
     wxHtmlTableCell(wxHtmlContainerCell *parent, const wxHtmlTag& tag, double pixel_scale = 1.0);
     ~wxHtmlTableCell();
 public:
     wxHtmlTableCell(wxHtmlContainerCell *parent, const wxHtmlTag& tag, double pixel_scale = 1.0);
     ~wxHtmlTableCell();

+
+    virtual void RemoveExtraSpacing(bool top, bool bottom);
+

     virtual void Layout(int w);
 
     void AddRow(const wxHtmlTag& tag);
     virtual void Layout(int w);
 
     void AddRow(const wxHtmlTag& tag);


@@ -116,7 +115,7 @@ private:
     void ReallocRows(int rows);
 
     // Computes minimal and maximal widths of columns. Needs to be called
     void ReallocRows(int rows);
 
     // Computes minimal and maximal widths of columns. Needs to be called

-    // only once, before first Layout(). 
+    // only once, before first Layout().

     void ComputeMinMaxWidths();
 
     DECLARE_NO_COPY_CLASS(wxHtmlTableCell)
     void ComputeMinMaxWidths();
 
     DECLARE_NO_COPY_CLASS(wxHtmlTableCell)


@@ -128,7 +127,7 @@ wxHtmlTableCell::wxHtmlTableCell(wxHtmlContainerCell *parent, const wxHtmlTag& t
  : wxHtmlContainerCell(parent)
 {
     m_PixelScale = pixel_scale;
  : wxHtmlContainerCell(parent)
 {
     m_PixelScale = pixel_scale;

-    m_HasBorders = 
+    m_HasBorders =

             (tag.HasParam(wxT("BORDER")) && tag.GetParam(wxT("BORDER")) != wxT("0"));
     m_ColsInfo = NULL;
     m_NumCols = m_NumRows = 0;
             (tag.HasParam(wxT("BORDER")) && tag.GetParam(wxT("BORDER")) != wxT("0"));
     m_ColsInfo = NULL;
     m_NumCols = m_NumRows = 0;


@@ -167,6 +166,15 @@ wxHtmlTableCell::~wxHtmlTableCell()
 }
 
 
 }
 
 

+void wxHtmlTableCell::RemoveExtraSpacing(bool WXUNUSED(top),
+                                         bool WXUNUSED(bottom))
+{
+    // Don't remove any spacing in the table -- it's always desirable,
+    // because it's part of table's definition.
+    // (If wxHtmlContainerCell::RemoveExtraSpacing() was applied to tables,
+    // then upper left cell of a table would be positioned above other cells
+    // if the table was the first element on the page.)
+}

 
 void wxHtmlTableCell::ReallocCols(int cols)
 {
 
 void wxHtmlTableCell::ReallocCols(int cols)
 {


@@ -267,7 +275,7 @@ void wxHtmlTableCell::AddCell(wxHtmlContainerCell *cell, const wxHtmlTag& tag)
         {
             wxString wd = tag.GetParam(wxT("WIDTH"));
 
         {
             wxString wd = tag.GetParam(wxT("WIDTH"));
 

-            if (wd[wd.Length()-1] == wxT('%'))
+            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;


@@ -288,14 +296,14 @@ void wxHtmlTableCell::AddCell(wxHtmlContainerCell *cell, const wxHtmlTag& tag)
         tag.GetParamAsInt(wxT("ROWSPAN"), &m_CellInfo[r][c].rowspan);
 
         // VS: the standard says this about col/rowspan:
         tag.GetParamAsInt(wxT("ROWSPAN"), &m_CellInfo[r][c].rowspan);
 
         // VS: the standard says this about col/rowspan:

-        //     "This attribute specifies the number of rows spanned by the 
-        //     current cell. The default value of this attribute is one ("1"). 
-        //     The value zero ("0") means that the cell spans all rows from the 
-        //     current row to the last row of the table." All mainstream 
+        //     "This attribute specifies the number of rows spanned by the
+        //     current cell. The default value of this attribute is one ("1").
+        //     The value zero ("0") means that the cell spans all rows from the
+        //     current row to the last row of the table." All mainstream

         //     browsers act as if 0==1, though, and so does wxHTML.
         //     browsers act as if 0==1, though, and so does wxHTML.

-        if (m_CellInfo[r][c].colspan < 1) 
+        if (m_CellInfo[r][c].colspan < 1)

             m_CellInfo[r][c].colspan = 1;
             m_CellInfo[r][c].colspan = 1;

-        if (m_CellInfo[r][c].rowspan < 1) 
+        if (m_CellInfo[r][c].rowspan < 1)

             m_CellInfo[r][c].rowspan = 1;
 
         if ((m_CellInfo[r][c].colspan > 1) || (m_CellInfo[r][c].rowspan > 1))
             m_CellInfo[r][c].rowspan = 1;
 
         if ((m_CellInfo[r][c].colspan > 1) || (m_CellInfo[r][c].rowspan > 1))


@@ -350,8 +358,8 @@ void wxHtmlTableCell::AddCell(wxHtmlContainerCell *cell, const wxHtmlTag& tag)
 
 void wxHtmlTableCell::ComputeMinMaxWidths()
 {
 
 void wxHtmlTableCell::ComputeMinMaxWidths()
 {

-    if (m_NumCols == 0 || m_ColsInfo[0].minWidth != -1) return;
-    
+    if (m_NumCols == 0 || m_ColsInfo[0].minWidth != wxDefaultCoord) return;
+

     m_MaxTotalWidth = 0;
     int percentage = 0;
     for (int c = 0; c < m_NumCols; c++)
     m_MaxTotalWidth = 0;
     int percentage = 0;
     for (int c = 0; c < m_NumCols; c++)


@@ -401,7 +409,7 @@ void wxHtmlTableCell::ComputeMinMaxWidths()
 void wxHtmlTableCell::Layout(int w)
 {
     ComputeMinMaxWidths();
 void wxHtmlTableCell::Layout(int w)
 {
     ComputeMinMaxWidths();

-    
+

     wxHtmlCell::Layout(w);
 
     /*
     wxHtmlCell::Layout(w);
 
     /*


@@ -418,7 +426,7 @@ void wxHtmlTableCell::Layout(int w)
                 m_WidthFloat = -100;
             m_Width = (100 + m_WidthFloat) * w / 100;
         }
                 m_WidthFloat = -100;
             m_Width = (100 + m_WidthFloat) * w / 100;
         }

-        else 
+        else

         {
             if (m_WidthFloat > 100)
                 m_WidthFloat = 100;
         {
             if (m_WidthFloat > 100)
                 m_WidthFloat = 100;


@@ -438,8 +446,8 @@ void wxHtmlTableCell::Layout(int w)
 
     */
 
 
     */
 

-    /* 1.  setup columns widths: 
-           
+    /* 1.  setup columns widths:
+

            The algorithm tries to keep the table size less than w if possible.
        */
     {
            The algorithm tries to keep the table size less than w if possible.
        */
     {


@@ -450,7 +458,7 @@ void wxHtmlTableCell::Layout(int w)
         for (i = 0; i < m_NumCols; i++)
             if (m_ColsInfo[i].units == wxHTML_UNITS_PIXELS)
             {
         for (i = 0; i < m_NumCols; i++)
             if (m_ColsInfo[i].units == wxHTML_UNITS_PIXELS)
             {

-                m_ColsInfo[i].pixwidth = wxMax(m_ColsInfo[i].width, 
+                m_ColsInfo[i].pixwidth = wxMax(m_ColsInfo[i].width,

                                                m_ColsInfo[i].minWidth);
                 wpix -= m_ColsInfo[i].pixwidth;
             }
                                                m_ColsInfo[i].minWidth);
                 wpix -= m_ColsInfo[i].pixwidth;
             }


@@ -481,12 +489,12 @@ void wxHtmlTableCell::Layout(int w)
                 newWidth = w;
             else
                 newWidth = newWidth * 100 / (100 - percentage);
                 newWidth = w;
             else
                 newWidth = newWidth * 100 / (100 - percentage);

-                
+

             newWidth = wxMin(newWidth, w - (m_NumCols + 1) * m_Spacing);
             wpix -= m_Width - newWidth;
             m_Width = newWidth;
         }
             newWidth = wxMin(newWidth, w - (m_NumCols + 1) * m_Spacing);
             wpix -= m_Width - newWidth;
             m_Width = newWidth;
         }

-        
+

 
         // 1c. setup floating-width columns:
         int wtemp = wpix;
 
         // 1c. setup floating-width columns:
         int wtemp = wpix;


@@ -527,10 +535,10 @@ void wxHtmlTableCell::Layout(int w)
             {
                 // Assign with, make sure not to drop below minWidth
                 if (maxWidth)
             {
                 // Assign with, make sure not to drop below minWidth
                 if (maxWidth)

-                    m_ColsInfo[i].pixwidth = wpix * (m_ColsInfo[i].maxWidth / (float)maxWidth) + 0.5;
+                    m_ColsInfo[i].pixwidth = (int)(wpix * (m_ColsInfo[i].maxWidth / (float)maxWidth) + 0.5);

                 else
                     m_ColsInfo[i].pixwidth = wpix / j;
                 else
                     m_ColsInfo[i].pixwidth = wpix / j;

-                
+

                 // Make sure to leave enough space for the other columns
                 int minRequired = 0;
                 int r;
                 // Make sure to leave enough space for the other columns
                 int minRequired = 0;
                 int r;


@@ -545,7 +553,7 @@ void wxHtmlTableCell::Layout(int w)
                 {
                     if (m_ColsInfo[i].pixwidth > (wpix * (m_ColsInfo[i].maxWidth / (float)maxWidth) + 0.5))
                     {
                 {
                     if (m_ColsInfo[i].pixwidth > (wpix * (m_ColsInfo[i].maxWidth / (float)maxWidth) + 0.5))
                     {

-                        int diff = m_ColsInfo[i].pixwidth - (wpix * m_ColsInfo[i].maxWidth / (float)maxWidth + 0.5);
+                        int diff = (int)(m_ColsInfo[i].pixwidth - (wpix * m_ColsInfo[i].maxWidth / (float)maxWidth + 0.5));

                         maxWidth += diff - m_ColsInfo[i].maxWidth;
                     }
                     else
                         maxWidth += diff - m_ColsInfo[i].maxWidth;
                     }
                     else


@@ -622,7 +630,7 @@ void wxHtmlTableCell::Layout(int w)
     /* 4. adjust table's width if it was too small: */
     if (m_NumCols > 0)
     {
     /* 4. adjust table's width if it was too small: */
     if (m_NumCols > 0)
     {

-        int twidth = m_ColsInfo[m_NumCols-1].leftpos + 
+        int twidth = m_ColsInfo[m_NumCols-1].leftpos +

                      m_ColsInfo[m_NumCols-1].pixwidth + m_Spacing;
         if (twidth > m_Width)
             m_Width = twidth;
                      m_ColsInfo[m_NumCols-1].pixwidth + m_Spacing;
         if (twidth > m_Width)
             m_Width = twidth;


@@ -672,7 +680,7 @@ TAG_HANDLER_BEGIN(TABLE, "TABLE,TR,TD,TH")
                 {
                     wxString wd = tag.GetParam(wxT("WIDTH"));
 
                 {
                     wxString wd = tag.GetParam(wxT("WIDTH"));
 

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

                     {
                         int width = 0;
                         wxSscanf(wd.c_str(), wxT("%i%%"), &width);
                     {
                         int width = 0;
                         wxSscanf(wd.c_str(), wxT("%i%%"), &width);


@@ -682,7 +690,7 @@ TAG_HANDLER_BEGIN(TABLE, "TABLE,TR,TD,TH")
                     {
                         int width = 0;
                         wxSscanf(wd.c_str(), wxT("%i"), &width);
                     {
                         int width = 0;
                         wxSscanf(wd.c_str(), wxT("%i"), &width);

-                        m_Table->SetWidthFloat(m_WParser->GetPixelScale() * width, wxHTML_UNITS_PIXELS);
+                        m_Table->SetWidthFloat((int)(m_WParser->GetPixelScale() * width), wxHTML_UNITS_PIXELS);

                     }
                 }
                 else
                     }
                 }
                 else


@@ -698,9 +706,9 @@ TAG_HANDLER_BEGIN(TABLE, "TABLE,TR,TD,TH")
             m_WParser->SetAlign(oldAlign);
             m_WParser->SetContainer(oldcont);
             m_WParser->CloseContainer();
             m_WParser->SetAlign(oldAlign);
             m_WParser->SetContainer(oldcont);
             m_WParser->CloseContainer();

-            
+

             m_Table = oldt;
             m_Table = oldt;

-            return TRUE;
+            return true;

         }
 
 
         }
 
 


@@ -744,7 +752,7 @@ TAG_HANDLER_BEGIN(TABLE, "TABLE,TR,TD,TH")
                 m_WParser->OpenContainer();
             }
         }
                 m_WParser->OpenContainer();
             }
         }

-        return FALSE;
+        return false;

     }
 
 TAG_HANDLER_END(TABLE)
     }
 
 TAG_HANDLER_END(TABLE)