Platform and compiler-specific checking for MSW and Mac now done

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

diff --git a/src/html/htmlcell.cpp b/src/html/htmlcell.cpp
index 7aca669ec5dbebc2b7db35b790d1ea0298dcb6ed..665db26ff2504aa094bdd955f9519e9f2fe86343 100644 (file)
--- a/src/html/htmlcell.cpp
+++ b/src/html/htmlcell.cpp
@@ -30,14 +30,24 @@
 #include "wx/html/htmlcell.h"
 #include "wx/html/htmlwin.h"
 #include "wx/settings.h"
 #include "wx/html/htmlcell.h"
 #include "wx/html/htmlwin.h"
 #include "wx/settings.h"

+#include "wx/module.h"
+

 #include <stdlib.h>
 
 #include <stdlib.h>
 

+//-----------------------------------------------------------------------------
+// Global variables
+//-----------------------------------------------------------------------------
+
+static wxCursor *gs_cursorLink = NULL;
+static wxCursor *gs_cursorText = NULL;
+
+

 //-----------------------------------------------------------------------------
 // Helper classes
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 // Helper classes
 //-----------------------------------------------------------------------------
 

-void wxHtmlSelection::Set(const wxPoint& fromPos, wxHtmlCell *fromCell,
-                          const wxPoint& toPos, wxHtmlCell *toCell)
+void wxHtmlSelection::Set(const wxPoint& fromPos, const wxHtmlCell *fromCell,
+                          const wxPoint& toPos, const wxHtmlCell *toCell)

 {
     m_fromCell = fromCell;
     m_toCell = toCell;
 {
     m_fromCell = fromCell;
     m_toCell = toCell;


@@ -45,7 +55,7 @@ void wxHtmlSelection::Set(const wxPoint& fromPos, wxHtmlCell *fromCell,
     m_toPos = toPos;
 }
 
     m_toPos = toPos;
 }
 

-void wxHtmlSelection::Set(wxHtmlCell *fromCell, wxHtmlCell *toCell)
+void wxHtmlSelection::Set(const wxHtmlCell *fromCell, const wxHtmlCell *toCell)

 {
     wxPoint p1 = fromCell ? fromCell->GetAbsPos() : wxDefaultPosition;
     wxPoint p2 = toCell ? toCell->GetAbsPos() : wxDefaultPosition;
 {
     wxPoint p1 = fromCell ? fromCell->GetAbsPos() : wxDefaultPosition;
     wxPoint p2 = toCell ? toCell->GetAbsPos() : wxDefaultPosition;


@@ -58,7 +68,7 @@ void wxHtmlSelection::Set(wxHtmlCell *fromCell, wxHtmlCell *toCell)
 }
 
 wxColour wxDefaultHtmlRenderingStyle::GetSelectedTextColour(
 }
 
 wxColour wxDefaultHtmlRenderingStyle::GetSelectedTextColour(

-                                        const wxColour& WXUNUSED(clr))
+                                        const wxColour& clr)

 {
     return wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT);
 }
 {
     return wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT);
 }


@@ -105,6 +115,18 @@ void wxHtmlCell::OnMouseClick(wxWindow *parent, int x, int y,
 }
 
 
 }
 
 

+wxCursor wxHtmlCell::GetCursor() const
+{
+    if ( GetLink() )
+    {
+        if ( !gs_cursorLink )
+            gs_cursorLink = new wxCursor(wxCURSOR_HAND);
+        return *gs_cursorLink;
+    }
+    else
+        return *wxSTANDARD_CURSOR;
+}
+

 
 bool wxHtmlCell::AdjustPagebreak(int *pagebreak, int* WXUNUSED(known_pagebreaks), int WXUNUSED(number_of_pages)) const
 {
 
 bool wxHtmlCell::AdjustPagebreak(int *pagebreak, int* WXUNUSED(known_pagebreaks), int WXUNUSED(number_of_pages)) const
 {


@@ -129,7 +151,6 @@ void wxHtmlCell::SetLink(const wxHtmlLinkInfo& link)
 }
 
 
 }
 
 

-

 void wxHtmlCell::Layout(int WXUNUSED(w))
 {
     SetPos(0, 0);
 void wxHtmlCell::Layout(int WXUNUSED(w))
 {
     SetPos(0, 0);


@@ -184,7 +205,7 @@ wxPoint wxHtmlCell::GetAbsPos() const
     }
     return p;
 }
     }
     return p;
 }

-    
+

 unsigned wxHtmlCell::GetDepth() const
 {
     unsigned d = 0;
 unsigned wxHtmlCell::GetDepth() const
 {
     unsigned d = 0;


@@ -192,7 +213,7 @@ unsigned wxHtmlCell::GetDepth() const
         d++;
     return d;
 }
         d++;
     return d;
 }

-    
+

 bool wxHtmlCell::IsBefore(wxHtmlCell *cell) const
 {
     const wxHtmlCell *c1 = this;
 bool wxHtmlCell::IsBefore(wxHtmlCell *cell) const
 {
     const wxHtmlCell *c1 = this;


@@ -219,7 +240,7 @@ bool wxHtmlCell::IsBefore(wxHtmlCell *cell) const
                 if ( c1 == c2 )
                     return true;
                 c1 = c1->GetNext();
                 if ( c1 == c2 )
                     return true;
                 c1 = c1->GetNext();

-            }            
+            }

             return false;
         }
         else
             return false;
         }
         else


@@ -249,7 +270,7 @@ wxHtmlWordCell::wxHtmlWordCell(const wxString& word, wxDC& dc) : wxHtmlCell()
 // Splits m_Word into up to three parts according to selection, returns
 // substring before, in and after selection and the points (in relative coords)
 // where s2 and s3 start:
 // Splits m_Word into up to three parts according to selection, returns
 // substring before, in and after selection and the points (in relative coords)
 // where s2 and s3 start:

-void wxHtmlWordCell::Split(wxDC& dc, 
+void wxHtmlWordCell::Split(wxDC& dc,

                            const wxPoint& selFrom, const wxPoint& selTo,
                            unsigned& pos1, unsigned& pos2) const
 {
                            const wxPoint& selFrom, const wxPoint& selTo,
                            unsigned& pos1, unsigned& pos2) const
 {


@@ -297,19 +318,19 @@ void wxHtmlWordCell::Split(wxDC& dc,
 void wxHtmlWordCell::SetSelectionPrivPos(wxDC& dc, wxHtmlSelection *s) const
 {
     unsigned p1, p2;
 void wxHtmlWordCell::SetSelectionPrivPos(wxDC& dc, wxHtmlSelection *s) const
 {
     unsigned p1, p2;

-        
-    Split(dc, 
+
+    Split(dc,

           this == s->GetFromCell() ? s->GetFromPos() : wxDefaultPosition,
           this == s->GetToCell() ? s->GetToPos() : wxDefaultPosition,
           p1, p2);
 
     wxPoint p(0, m_Word.length());
           this == s->GetFromCell() ? s->GetFromPos() : wxDefaultPosition,
           this == s->GetToCell() ? s->GetToPos() : wxDefaultPosition,
           p1, p2);
 
     wxPoint p(0, m_Word.length());

-    
+

     if ( this == s->GetFromCell() )
         p.x = p1; // selection starts here
     if ( this == s->GetToCell() )
         p.y = p2; // selection ends here
     if ( this == s->GetFromCell() )
         p.x = p1; // selection starts here
     if ( this == s->GetToCell() )
         p.y = p2; // selection ends here

-    
+

     if ( this == s->GetFromCell() )
         s->SetFromPrivPos(p);
     if ( this == s->GetToCell() )
     if ( this == s->GetFromCell() )
         s->SetFromPrivPos(p);
     if ( this == s->GetToCell() )


@@ -322,7 +343,7 @@ static void SwitchSelState(wxDC& dc, wxHtmlRenderingInfo& info,
 {
     wxColour fg = info.GetState().GetFgColour();
     wxColour bg = info.GetState().GetBgColour();
 {
     wxColour fg = info.GetState().GetFgColour();
     wxColour bg = info.GetState().GetBgColour();

-    
+

     if ( toSelection )
     {
         dc.SetBackgroundMode(wxSOLID);
     if ( toSelection )
     {
         dc.SetBackgroundMode(wxSOLID);


@@ -353,9 +374,22 @@ void wxHtmlWordCell::Draw(wxDC& dc, int x, int y,
         wxString txt;
         int w, h;
         int ofs = 0;
         wxString txt;
         int w, h;
         int ofs = 0;

-        
-        wxPoint priv = (this == s->GetFromCell()) ? 
+
+        wxPoint priv = (this == s->GetFromCell()) ?

                            s->GetFromPrivPos() : s->GetToPrivPos();
                            s->GetFromPrivPos() : s->GetToPrivPos();

+
+        // NB: this is quite a hack: in order to compute selection boundaries
+        //     (in word's characters) we must know current font, which is only
+        //     possible inside rendering code. Therefore we update the
+        //     information here and store it in wxHtmlSelection so that
+        //     ConvertToText can use it later:
+        if ( priv == wxDefaultPosition )
+        {
+            SetSelectionPrivPos(dc, s);
+            priv = (this == s->GetFromCell()) ?
+                    s->GetFromPrivPos() : s->GetToPrivPos();
+        }
+

         int part1 = priv.x;
         int part2 = priv.y;
 
         int part1 = priv.x;
         int part2 = priv.y;
 


@@ -366,9 +400,9 @@ void wxHtmlWordCell::Draw(wxDC& dc, int x, int y,
             dc.GetTextExtent(txt, &w, &h);
             ofs += w;
         }
             dc.GetTextExtent(txt, &w, &h);
             ofs += w;
         }

-        
+

         SwitchSelState(dc, info, true);
         SwitchSelState(dc, info, true);

-        
+

         txt = m_Word.Mid(part1, part2-part1);
         dc.DrawText(txt, ofs + x + m_PosX, y + m_PosY);
 
         txt = m_Word.Mid(part1, part2-part1);
         dc.DrawText(txt, ofs + x + m_PosX, y + m_PosY);
 


@@ -398,22 +432,45 @@ void wxHtmlWordCell::Draw(wxDC& dc, int x, int y,
         dc.DrawText(m_Word, x + m_PosX, y + m_PosY);
     }
 }
         dc.DrawText(m_Word, x + m_PosX, y + m_PosY);
     }
 }

-    
+

 
 wxString wxHtmlWordCell::ConvertToText(wxHtmlSelection *s) const
 {
     if ( s && (this == s->GetFromCell() || this == s->GetToCell()) )
     {
 
 wxString wxHtmlWordCell::ConvertToText(wxHtmlSelection *s) const
 {
     if ( s && (this == s->GetFromCell() || this == s->GetToCell()) )
     {

-        wxPoint priv = (this == s->GetFromCell()) ? 
-                           s->GetFromPrivPos() : s->GetToPrivPos();
-        int part1 = priv.x;
-        int part2 = priv.y;
-        return m_Word.Mid(part1, part2-part1);
+        wxPoint priv = this == s->GetFromCell() ? s->GetFromPrivPos()
+                                                : s->GetToPrivPos();
+
+        // VZ: we may be called before we had a chance to re-render ourselves
+        //     and in this case GetFrom/ToPrivPos() is not set yet -- assume
+        //     that this only happens in case of a double/triple click (which
+        //     seems to be the case now) and so it makes sense to select the
+        //     entire contents of the cell in this case
+        //
+        // TODO: but this really needs to be fixed in some better way later...
+        if ( priv != wxDefaultPosition )
+        {
+            int part1 = priv.x;
+            int part2 = priv.y;
+            return m_Word.Mid(part1, part2-part1);
+        }
+        //else: return the whole word below

     }
     }

-    else
-        return m_Word;
+
+    return m_Word;

 }
 
 }
 

+wxCursor wxHtmlWordCell::GetCursor() const
+{
+    if ( !GetLink() )
+    {
+        if ( !gs_cursorText )
+            gs_cursorText = new wxCursor(wxCURSOR_IBEAM);
+        return *gs_cursorText;
+    }
+    else
+        return wxHtmlCell::GetCursor();
+}

 
 
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------


@@ -898,7 +955,7 @@ wxHtmlCell *wxHtmlContainerCell::FindCellByPos(wxCoord x, wxCoord y,
         wxHtmlCell *c2, *c = NULL;
         for ( const wxHtmlCell *cell = m_Cells; cell; cell = cell->GetNext() )
         {
         wxHtmlCell *c2, *c = NULL;
         for ( const wxHtmlCell *cell = m_Cells; cell; cell = cell->GetNext() )
         {

-            if (cell->GetPosY() > y || 
+            if (cell->GetPosY() > y ||

                     (cell->GetPosY() == y && cell->GetPosX() > x))
                 break;
             c2 = cell->FindCellByPos(x - cell->GetPosX(), y - cell->GetPosY(),
                     (cell->GetPosY() == y && cell->GetPosX() > x))
                 break;
             c2 = cell->FindCellByPos(x - cell->GetPosX(), y - cell->GetPosY(),


@@ -945,7 +1002,7 @@ void wxHtmlContainerCell::GetHorizontalConstraints(int *left, int *right) const
         *right = cright;
 }
 
         *right = cright;
 }
 

-    
+

 wxHtmlCell *wxHtmlContainerCell::GetFirstTerminal() const
 {
     if ( m_Cells )
 wxHtmlCell *wxHtmlContainerCell::GetFirstTerminal() const
 {
     if ( m_Cells )


@@ -1003,13 +1060,19 @@ void wxHtmlColourCell::DrawInvisible(wxDC& dc,
     {
         state.SetFgColour(m_Colour);
         if (state.GetSelectionState() != wxHTML_SEL_IN)
     {
         state.SetFgColour(m_Colour);
         if (state.GetSelectionState() != wxHTML_SEL_IN)

-            dc.SetTextForeground(m_Colour);        
+            dc.SetTextForeground(m_Colour);
+        else
+            dc.SetTextForeground(
+                    info.GetStyle().GetSelectedTextColour(m_Colour));

     }
     if (m_Flags & wxHTML_CLR_BACKGROUND)
     {
         state.SetBgColour(m_Colour);
         if (state.GetSelectionState() != wxHTML_SEL_IN)
             dc.SetTextBackground(m_Colour);
     }
     if (m_Flags & wxHTML_CLR_BACKGROUND)
     {
         state.SetBgColour(m_Colour);
         if (state.GetSelectionState() != wxHTML_SEL_IN)
             dc.SetTextBackground(m_Colour);

+        else
+            dc.SetTextBackground(
+                    info.GetStyle().GetSelectedTextBgColour(m_Colour));

         dc.SetBackground(wxBrush(m_Colour, wxSOLID));
     }
 }
         dc.SetBackground(wxBrush(m_Colour, wxSOLID));
     }
 }


@@ -1144,8 +1207,33 @@ const wxHtmlCell* wxHtmlTerminalCellsInterator::operator++()
         while ( m_pos->GetFirstChild() != NULL )
             m_pos = m_pos->GetFirstChild();
     } while ( !m_pos->IsTerminalCell() );
         while ( m_pos->GetFirstChild() != NULL )
             m_pos = m_pos->GetFirstChild();
     } while ( !m_pos->IsTerminalCell() );

-    
+

     return m_pos;
 }
 
     return m_pos;
 }
 

+
+
+
+
+
+
+//-----------------------------------------------------------------------------
+// Cleanup
+//-----------------------------------------------------------------------------
+
+class wxHtmlCellModule: public wxModule
+{
+DECLARE_DYNAMIC_CLASS(wxHtmlCellModule)
+public:
+    wxHtmlCellModule() : wxModule() {}
+    bool OnInit() { return true; }
+    void OnExit()
+    {
+        wxDELETE(gs_cursorLink);
+        wxDELETE(gs_cursorText);
+    }
+};
+
+IMPLEMENT_DYNAMIC_CLASS(wxHtmlCellModule, wxModule)
+

 #endif
 #endif