Changed WidthDefault() and HeightDefault() to use 400,250. If there

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

diff --git a/src/html/htmlwin.cpp b/src/html/htmlwin.cpp
index 6120a8b7bac54d8eaa509f8184e69f6e2e327ec5..b7744b5cdcc110325531ad4e2c752c836242db28 100644 (file)
--- a/src/html/htmlwin.cpp
+++ b/src/html/htmlwin.cpp
@@ -8,7 +8,7 @@
 /////////////////////////////////////////////////////////////////////////////
 
 
 /////////////////////////////////////////////////////////////////////////////
 
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "htmlwin.h"
 #pragma implementation "htmlproc.h"
 #endif
 #pragma implementation "htmlwin.h"
 #pragma implementation "htmlproc.h"
 #endif


@@ -185,7 +185,8 @@ bool wxHtmlWindow::Create(wxWindow *parent, wxWindowID id,
                           long style, const wxString& name)
 {
     if (!wxScrolledWindow::Create(parent, id, pos, size,
                           long style, const wxString& name)
 {
     if (!wxScrolledWindow::Create(parent, id, pos, size,

-                                  style | wxVSCROLL | wxHSCROLL, name))
+                                  style | wxVSCROLL | wxHSCROLL,
+                                  name))

         return FALSE;
 
     m_Style = style;
         return FALSE;
 
     m_Style = style;


@@ -201,7 +202,14 @@ wxHtmlWindow::~wxHtmlWindow()
 #endif // wxUSE_CLIPBOARD
     HistoryClear();
 
 #endif // wxUSE_CLIPBOARD
     HistoryClear();
 

-    if (m_Cell) delete m_Cell;
+    delete m_selection;
+
+    delete m_Cell;
+
+    if ( m_Processors )
+    {
+        WX_CLEAR_LIST(wxHtmlProcessorList, *m_Processors);
+    }

 
     delete m_Parser;
     delete m_FS;
 
     delete m_Parser;
     delete m_FS;


@@ -248,11 +256,11 @@ bool wxHtmlWindow::SetPage(const wxString& source)
     // pass HTML through registered processors:
     if (m_Processors || m_GlobalProcessors)
     {
     // pass HTML through registered processors:
     if (m_Processors || m_GlobalProcessors)
     {

-        wxHtmlProcessorList::Node *nodeL, *nodeG;
+        wxHtmlProcessorList::compatibility_iterator nodeL, nodeG;

         int prL, prG;
 
         int prL, prG;
 

-        nodeL = (m_Processors) ? m_Processors->GetFirst() : NULL;
-        nodeG = (m_GlobalProcessors) ? m_GlobalProcessors->GetFirst() : NULL;
+        nodeL = (m_Processors) ? m_Processors->GetFirst() : wxHtmlProcessorList::compatibility_iterator();
+        nodeG = (m_GlobalProcessors) ? m_GlobalProcessors->GetFirst() : wxHtmlProcessorList::compatibility_iterator();

 
         // VS: there are two lists, global and local, both of them sorted by
         //     priority. Since we have to go through _both_ lists with
 
         // VS: there are two lists, global and local, both of them sorted by
         //     priority. Since we have to go through _both_ lists with


@@ -374,7 +382,7 @@ bool wxHtmlWindow::LoadPage(const wxString& location)
 
         else
         {
 
         else
         {

-            wxNode *node;
+            wxList::compatibility_iterator node;

             wxString src = wxEmptyString;
 
             if (m_RelatedStatusBar != -1)
             wxString src = wxEmptyString;
 
             if (m_RelatedStatusBar != -1)


@@ -653,9 +661,8 @@ void wxHtmlWindow::AddProcessor(wxHtmlProcessor *processor)
     if (!m_Processors)
     {
         m_Processors = new wxHtmlProcessorList;
     if (!m_Processors)
     {
         m_Processors = new wxHtmlProcessorList;

-        m_Processors->DeleteContents(TRUE);

     }
     }

-    wxHtmlProcessorList::Node *node;
+    wxHtmlProcessorList::compatibility_iterator node;

 
     for (node = m_Processors->GetFirst(); node; node = node->GetNext())
     {
 
     for (node = m_Processors->GetFirst(); node; node = node->GetNext())
     {


@@ -673,9 +680,8 @@ void wxHtmlWindow::AddProcessor(wxHtmlProcessor *processor)
     if (!m_GlobalProcessors)
     {
         m_GlobalProcessors = new wxHtmlProcessorList;
     if (!m_GlobalProcessors)
     {
         m_GlobalProcessors = new wxHtmlProcessorList;

-        m_GlobalProcessors->DeleteContents(TRUE);

     }
     }

-    wxHtmlProcessorList::Node *node;
+    wxHtmlProcessorList::compatibility_iterator node;

 
     for (node = m_GlobalProcessors->GetFirst(); node; node = node->GetNext())
     {
 
     for (node = m_GlobalProcessors->GetFirst(); node; node = node->GetNext())
     {


@@ -697,8 +703,9 @@ wxHtmlProcessorList *wxHtmlWindow::m_GlobalProcessors = NULL;
 void wxHtmlWindow::CleanUpStatics()
 {
     wxDELETE(m_DefaultFilter);
 void wxHtmlWindow::CleanUpStatics()
 {
     wxDELETE(m_DefaultFilter);

-    m_Filters.DeleteContents(TRUE);
-    m_Filters.Clear();
+    WX_CLEAR_LIST(wxList, m_Filters);
+    if (m_GlobalProcessors)
+        WX_CLEAR_LIST(wxHtmlProcessorList, *m_GlobalProcessors);

     wxDELETE(m_GlobalProcessors);
 }
 
     wxDELETE(m_GlobalProcessors);
 }
 


@@ -750,7 +757,7 @@ wxString wxHtmlWindow::SelectionToText()
 
 #endif // wxUSE_CLIPBOARD
 
 
 #endif // wxUSE_CLIPBOARD
 

-void wxHtmlWindow::CopySelection(ClipboardType t)
+bool wxHtmlWindow::CopySelection(ClipboardType t)

 {
 #if wxUSE_CLIPBOARD
     if ( m_selection )
 {
 #if wxUSE_CLIPBOARD
     if ( m_selection )


@@ -763,7 +770,7 @@ void wxHtmlWindow::CopySelection(ClipboardType t)
         //
         // TODO: this should be abstracted at wxClipboard level!
         if ( t == Primary )
         //
         // TODO: this should be abstracted at wxClipboard level!
         if ( t == Primary )

-            return;
+            return false;

 #endif // __UNIX__/!__UNIX__
 
         if ( wxTheClipboard->Open() )
 #endif // __UNIX__/!__UNIX__
 
         if ( wxTheClipboard->Open() )


@@ -773,9 +780,13 @@ void wxHtmlWindow::CopySelection(ClipboardType t)
             wxTheClipboard->Close();
             wxLogTrace(_T("wxhtmlselection"),
                        _("Copied to clipboard:\"%s\""), txt.c_str());
             wxTheClipboard->Close();
             wxLogTrace(_T("wxhtmlselection"),
                        _("Copied to clipboard:\"%s\""), txt.c_str());

+
+            return true;

         }
     }
 #endif // wxUSE_CLIPBOARD
         }
     }
 #endif // wxUSE_CLIPBOARD

+
+    return false;

 }
 
 
 }
 
 


@@ -801,7 +812,7 @@ void wxHtmlWindow::OnCellMouseHover(wxHtmlCell * WXUNUSED(cell),
     // do nothing here
 }
 
     // do nothing here
 }
 

-void wxHtmlWindow::OnEraseBackground(wxEraseEvent& event)
+void wxHtmlWindow::OnEraseBackground(wxEraseEvent& WXUNUSED(event))

 {
 }
 
 {
 }
 


@@ -834,6 +845,35 @@ void wxHtmlWindow::OnPaint(wxPaintEvent& WXUNUSED(event))
                  y * wxHTML_SCROLL_STEP + rect.GetTop(),
                  y * wxHTML_SCROLL_STEP + rect.GetBottom(),
                  rinfo);
                  y * wxHTML_SCROLL_STEP + rect.GetTop(),
                  y * wxHTML_SCROLL_STEP + rect.GetBottom(),
                  rinfo);

+             
+//#define DEBUG_HTML_SELECTION 
+#ifdef DEBUG_HTML_SELECTION
+    {
+    int xc, yc, x, y;
+    wxGetMousePosition(&xc, &yc);
+    ScreenToClient(&xc, &yc);
+    CalcUnscrolledPosition(xc, yc, &x, &y);
+    wxHtmlCell *at = m_Cell->FindCellByPos(x, y);
+    wxHtmlCell *before = 
+        m_Cell->FindCellByPos(x, y, wxHTML_FIND_NEAREST_BEFORE);
+    wxHtmlCell *after = 
+        m_Cell->FindCellByPos(x, y, wxHTML_FIND_NEAREST_AFTER);
+    
+    dcm.SetBrush(*wxTRANSPARENT_BRUSH);
+    dcm.SetPen(*wxBLACK_PEN);
+    if (at)
+        dcm.DrawRectangle(at->GetAbsPos(),
+                          wxSize(at->GetWidth(),at->GetHeight()));
+    dcm.SetPen(*wxGREEN_PEN);
+    if (before)
+        dcm.DrawRectangle(before->GetAbsPos().x+1, before->GetAbsPos().y+1,
+                          before->GetWidth()-2,before->GetHeight()-2);
+    dcm.SetPen(*wxRED_PEN);
+    if (after)
+        dcm.DrawRectangle(after->GetAbsPos().x+2, after->GetAbsPos().y+2,
+                          after->GetWidth()-4,after->GetHeight()-4);
+    }
+#endif

  
     dcm.SetDeviceOrigin(0,0);
     dc.Blit(0, rect.GetTop(),
  
     dcm.SetDeviceOrigin(0,0);
     dc.Blit(0, rect.GetTop(),


@@ -864,7 +904,7 @@ void wxHtmlWindow::OnSize(wxSizeEvent& event)
 }
 
 
 }
 
 

-void wxHtmlWindow::OnMouseMove(wxMouseEvent& event)
+void wxHtmlWindow::OnMouseMove(wxMouseEvent& WXUNUSED(event))

 {
     m_tmpMouseMoved = true;
 }
 {
     m_tmpMouseMoved = true;
 }


@@ -879,7 +919,7 @@ void wxHtmlWindow::OnMouseDown(wxMouseEvent& event)
         {
             SelectLine(CalcUnscrolledPosition(event.GetPosition()));
 
         {
             SelectLine(CalcUnscrolledPosition(event.GetPosition()));
 

-            CopySelection();
+            (void) CopySelection();

         }
         else
         {
         }
         else
         {


@@ -908,10 +948,8 @@ void wxHtmlWindow::OnMouseUp(wxMouseEvent& event)
         m_makingSelection = false;
 
         // did the user move the mouse far enough from starting point?
         m_makingSelection = false;
 
         // did the user move the mouse far enough from starting point?

-        if ( m_selection )
+        if ( CopySelection(Primary) )

         {
         {

-            CopySelection(Primary);
-

             // we don't want mouse up event that ended selecting to be
             // handled as mouse click and e.g. follow hyperlink:
             return;
             // we don't want mouse up event that ended selecting to be
             // handled as mouse click and e.g. follow hyperlink:
             return;


@@ -935,10 +973,15 @@ void wxHtmlWindow::OnMouseUp(wxMouseEvent& event)
 
 
 
 
 
 

-void wxHtmlWindow::OnIdle(wxIdleEvent& WXUNUSED(event))
-{    
+void wxHtmlWindow::OnInternalIdle()
+{
+    wxWindow::OnInternalIdle();
+    

     if (m_tmpMouseMoved && (m_Cell != NULL))
     {
     if (m_tmpMouseMoved && (m_Cell != NULL))
     {

+#ifdef DEBUG_HTML_SELECTION
+        Refresh();
+#endif

         int xc, yc, x, y;
         wxGetMousePosition(&xc, &yc);
         ScreenToClient(&xc, &yc);
         int xc, yc, x, y;
         wxGetMousePosition(&xc, &yc);
         ScreenToClient(&xc, &yc);


@@ -949,12 +992,35 @@ void wxHtmlWindow::OnIdle(wxIdleEvent& WXUNUSED(event))
         // handle selection update:
         if ( m_makingSelection )
         {
         // handle selection update:
         if ( m_makingSelection )
         {

-            bool goingDown = m_tmpSelFromPos.y < y ||
-                             m_tmpSelFromPos.y == y && m_tmpSelFromPos.x < x;
-

             if ( !m_tmpSelFromCell )
                 m_tmpSelFromCell = m_Cell->FindCellByPos(
                                          m_tmpSelFromPos.x,m_tmpSelFromPos.y);
             if ( !m_tmpSelFromCell )
                 m_tmpSelFromCell = m_Cell->FindCellByPos(
                                          m_tmpSelFromPos.x,m_tmpSelFromPos.y);

+            
+            // NB: a trick - we adjust selFromPos to be upper left or bottom
+            //     right corner of the first cell of the selection depending
+            //     on whether the mouse is moving to the right or to the left.
+            //     This gives us more "natural" behaviour when selecting
+            //     a line (specifically, first cell of the next line is not
+            //     included if you drag selection from left to right over
+            //     entire line):
+            wxPoint dirFromPos;
+            if ( !m_tmpSelFromCell )
+            {
+                dirFromPos = m_tmpSelFromPos;
+            }
+            else
+            {
+                dirFromPos = m_tmpSelFromCell->GetAbsPos();
+                if ( x < m_tmpSelFromPos.x )
+                {
+                    dirFromPos.x += m_tmpSelFromCell->GetWidth();
+                    dirFromPos.y += m_tmpSelFromCell->GetHeight();
+                }
+            }
+            bool goingDown = dirFromPos.y < y || 
+                             (dirFromPos.y == y && dirFromPos.x < x);
+
+            // determine selection span:

             if ( /*still*/ !m_tmpSelFromCell )
             {
                 if (goingDown)
             if ( /*still*/ !m_tmpSelFromCell )
             {
                 if (goingDown)


@@ -981,14 +1047,14 @@ void wxHtmlWindow::OnIdle(wxIdleEvent& WXUNUSED(event))
                 if (goingDown)
                 {
                     selcell = m_Cell->FindCellByPos(x, y,
                 if (goingDown)
                 {
                     selcell = m_Cell->FindCellByPos(x, y,

-                                                 wxHTML_FIND_NEAREST_AFTER);
+                                                 wxHTML_FIND_NEAREST_BEFORE);

                     if (!selcell)
                         selcell = m_Cell->GetLastTerminal();
                 }
                 else
                 {
                     selcell = m_Cell->FindCellByPos(x, y,
                     if (!selcell)
                         selcell = m_Cell->GetLastTerminal();
                 }
                 else
                 {
                     selcell = m_Cell->FindCellByPos(x, y,

-                                                 wxHTML_FIND_NEAREST_BEFORE);
+                                                 wxHTML_FIND_NEAREST_AFTER);

                     if (!selcell)
                         selcell = m_Cell->GetFirstTerminal();
                 }
                     if (!selcell)
                         selcell = m_Cell->GetFirstTerminal();
                 }


@@ -1152,15 +1218,13 @@ void wxHtmlWindow::OnKeyUp(wxKeyEvent& event)
     if ( IsSelectionEnabled() &&
          event.GetKeyCode() == 'C' && event.ControlDown() )
     {
     if ( IsSelectionEnabled() &&
          event.GetKeyCode() == 'C' && event.ControlDown() )
     {

-        if ( m_selection )
-            CopySelection();
+        (void) CopySelection();

     }
 }
 
     }
 }
 

-void wxHtmlWindow::OnCopy(wxCommandEvent& event)
+void wxHtmlWindow::OnCopy(wxCommandEvent& WXUNUSED(event))

 {
 {

-    if ( m_selection )
-        CopySelection();
+    (void) CopySelection();

 }
 
 void wxHtmlWindow::OnDoubleClick(wxMouseEvent& event)
 }
 
 void wxHtmlWindow::OnDoubleClick(wxMouseEvent& event)


@@ -1170,7 +1234,7 @@ void wxHtmlWindow::OnDoubleClick(wxMouseEvent& event)
     {
         SelectWord(CalcUnscrolledPosition(event.GetPosition()));
 
     {
         SelectWord(CalcUnscrolledPosition(event.GetPosition()));
 

-        CopySelection(Primary);
+        (void) CopySelection(Primary);

 
         m_lastDoubleClick = wxGetLocalTimeMillis();
     }
 
         m_lastDoubleClick = wxGetLocalTimeMillis();
     }


@@ -1180,76 +1244,113 @@ void wxHtmlWindow::OnDoubleClick(wxMouseEvent& event)
 
 void wxHtmlWindow::SelectWord(const wxPoint& pos)
 {
 
 void wxHtmlWindow::SelectWord(const wxPoint& pos)
 {

-    wxHtmlCell *cell = m_Cell->FindCellByPos(pos.x, pos.y);
-    if ( cell )
+    if ( m_Cell )

     {
     {

-        delete m_selection;
-        m_selection = new wxHtmlSelection();
-        m_selection->Set(cell, cell);
-        RefreshRect(wxRect(CalcScrolledPosition(cell->GetAbsPos()),
-                           wxSize(cell->GetWidth(), cell->GetHeight())));
+        wxHtmlCell *cell = m_Cell->FindCellByPos(pos.x, pos.y);
+        if ( cell )
+        {
+            delete m_selection;
+            m_selection = new wxHtmlSelection();
+            m_selection->Set(cell, cell);
+            RefreshRect(wxRect(CalcScrolledPosition(cell->GetAbsPos()),
+                               wxSize(cell->GetWidth(), cell->GetHeight())));
+        }

     }
 }
 
 void wxHtmlWindow::SelectLine(const wxPoint& pos)
 {
     }
 }
 
 void wxHtmlWindow::SelectLine(const wxPoint& pos)
 {

-    wxHtmlCell *cell = m_Cell->FindCellByPos(pos.x, pos.y);
-    if ( cell )
+    if ( m_Cell )

     {
     {

-        // We use following heuristic to find a "line": let the line be all
-        // cells in same container as the cell under mouse cursor that are
-        // neither completely above nor completely bellow the clicked cell
-        // (i.e. are likely to be words positioned on same line of text).
-
-        int y1 = cell->GetAbsPos().y;
-        int y2 = y1 + cell->GetHeight();
-        int y;
-        const wxHtmlCell *c;
-        const wxHtmlCell *before = NULL;
-        const wxHtmlCell *after = NULL;
-
-        // find last cell of line:
-        for ( c = cell->GetNext(); c; c = c->GetNext())
+        wxHtmlCell *cell = m_Cell->FindCellByPos(pos.x, pos.y);
+        if ( cell )

         {
         {

-            y = c->GetAbsPos().y;
-            if ( y + c->GetHeight() > y1 && y < y2 )
-                after = c;
-            else
-                break;
-        }
-        if ( !after )
-            after = cell;
+            // We use following heuristic to find a "line": let the line be all
+            // cells in same container as the cell under mouse cursor that are
+            // neither completely above nor completely bellow the clicked cell
+            // (i.e. are likely to be words positioned on same line of text).
+
+            int y1 = cell->GetAbsPos().y;
+            int y2 = y1 + cell->GetHeight();
+            int y;
+            const wxHtmlCell *c;
+            const wxHtmlCell *before = NULL;
+            const wxHtmlCell *after = NULL;
+
+            // find last cell of line:
+            for ( c = cell->GetNext(); c; c = c->GetNext())
+            {
+                y = c->GetAbsPos().y;
+                if ( y + c->GetHeight() > y1 && y < y2 )
+                    after = c;
+                else
+                    break;
+            }
+            if ( !after )
+                after = cell;

 
 

-        // find first cell of line:
-        for ( c = cell->GetParent()->GetFirstChild();
-                c && c != cell; c = c->GetNext())
-        {
-            y = c->GetAbsPos().y;
-            if ( y + c->GetHeight() > y1 && y < y2 )
+            // find first cell of line:
+            for ( c = cell->GetParent()->GetFirstChild();
+                    c && c != cell; c = c->GetNext())

             {
             {

-                if ( ! before )
-                    before = c;
+                y = c->GetAbsPos().y;
+                if ( y + c->GetHeight() > y1 && y < y2 )
+                {
+                    if ( ! before )
+                        before = c;
+                }
+                else
+                    before = NULL;

             }
             }

-            else
-                before = NULL;
+            if ( !before )
+                before = cell;
+
+            delete m_selection;
+            m_selection = new wxHtmlSelection();
+            m_selection->Set(before, after);
+
+            Refresh();

         }
         }

-        if ( !before )
-            before = cell;
+    }
+}

 
 

+void wxHtmlWindow::SelectAll()
+{
+    if ( m_Cell )
+    {

         delete m_selection;
         m_selection = new wxHtmlSelection();
         delete m_selection;
         m_selection = new wxHtmlSelection();

-        m_selection->Set(before, after);
-
+        m_selection->Set(m_Cell->GetFirstTerminal(), m_Cell->GetLastTerminal());

         Refresh();
     }
 }
         Refresh();
     }
 }

+

 #endif // wxUSE_CLIPBOARD
 
 
 
 IMPLEMENT_ABSTRACT_CLASS(wxHtmlProcessor,wxObject)
 
 #endif // wxUSE_CLIPBOARD
 
 
 
 IMPLEMENT_ABSTRACT_CLASS(wxHtmlProcessor,wxObject)
 

+#if wxUSE_EXTENDED_RTTI
+IMPLEMENT_DYNAMIC_CLASS_XTI(wxHtmlWindow, wxScrolledWindow,"wx/html/htmlwin.h")
+
+wxBEGIN_PROPERTIES_TABLE(wxHtmlWindow)
+/*
+       TODO PROPERTIES
+               style , wxHW_SCROLLBAR_AUTO
+               borders , (dimension)
+               url , string
+               htmlcode , string
+*/
+wxEND_PROPERTIES_TABLE()
+
+wxBEGIN_HANDLERS_TABLE(wxHtmlWindow)
+wxEND_HANDLERS_TABLE()
+
+wxCONSTRUCTOR_5( wxHtmlWindow , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size , long , WindowStyle ) 
+#else

 IMPLEMENT_DYNAMIC_CLASS(wxHtmlWindow,wxScrolledWindow)
 IMPLEMENT_DYNAMIC_CLASS(wxHtmlWindow,wxScrolledWindow)

+#endif

 
 BEGIN_EVENT_TABLE(wxHtmlWindow, wxScrolledWindow)
     EVT_SIZE(wxHtmlWindow::OnSize)
 
 BEGIN_EVENT_TABLE(wxHtmlWindow, wxScrolledWindow)
     EVT_SIZE(wxHtmlWindow::OnSize)


@@ -1257,7 +1358,6 @@ BEGIN_EVENT_TABLE(wxHtmlWindow, wxScrolledWindow)
     EVT_LEFT_UP(wxHtmlWindow::OnMouseUp)
     EVT_RIGHT_UP(wxHtmlWindow::OnMouseUp)
     EVT_MOTION(wxHtmlWindow::OnMouseMove)
     EVT_LEFT_UP(wxHtmlWindow::OnMouseUp)
     EVT_RIGHT_UP(wxHtmlWindow::OnMouseUp)
     EVT_MOTION(wxHtmlWindow::OnMouseMove)

-    EVT_IDLE(wxHtmlWindow::OnIdle)

     EVT_ERASE_BACKGROUND(wxHtmlWindow::OnEraseBackground)
     EVT_PAINT(wxHtmlWindow::OnPaint)
 #if wxUSE_CLIPBOARD
     EVT_ERASE_BACKGROUND(wxHtmlWindow::OnEraseBackground)
     EVT_PAINT(wxHtmlWindow::OnPaint)
 #if wxUSE_CLIPBOARD