wx-config symlink creation fix

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

diff --git a/src/html/htmlwin.cpp b/src/html/htmlwin.cpp
index 261bb4b8d682ef2325bb38655e4001be15792bca..eb97f6d3d986e666f75b983b281d05888b150fac 100644 (file)
--- a/src/html/htmlwin.cpp
+++ b/src/html/htmlwin.cpp
@@ -4,11 +4,11 @@
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vaclav Slavik
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vaclav Slavik

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

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

-#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


@@ -158,7 +158,9 @@ void wxHtmlWindow::Init()
     m_tmpLastCell = NULL;
     m_tmpCanDrawLocks = 0;
     m_FS = new wxFileSystem();
     m_tmpLastCell = NULL;
     m_tmpCanDrawLocks = 0;
     m_FS = new wxFileSystem();

+#if wxUSE_STATUSBAR

     m_RelatedStatusBar = -1;
     m_RelatedStatusBar = -1;

+#endif // wxUSE_STATUSBAR

     m_RelatedFrame = NULL;
     m_TitleFormat = wxT("%s");
     m_OpenedPage = m_OpenedAnchor = m_OpenedPageTitle = wxEmptyString;
     m_RelatedFrame = NULL;
     m_TitleFormat = wxT("%s");
     m_OpenedPage = m_OpenedAnchor = m_OpenedPageTitle = wxEmptyString;


@@ -185,7 +187,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,9 +204,14 @@ wxHtmlWindow::~wxHtmlWindow()
 #endif // wxUSE_CLIPBOARD
     HistoryClear();
 
 #endif // wxUSE_CLIPBOARD
     HistoryClear();
 

-    if (m_Cell) delete m_Cell;
+    delete m_selection;

 
 

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

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


@@ -222,10 +230,12 @@ void wxHtmlWindow::SetRelatedFrame(wxFrame* frame, const wxString& format)
 
 
 
 
 
 

+#if wxUSE_STATUSBAR

 void wxHtmlWindow::SetRelatedStatusBar(int bar)
 {
     m_RelatedStatusBar = bar;
 }
 void wxHtmlWindow::SetRelatedStatusBar(int bar)
 {
     m_RelatedStatusBar = bar;
 }

+#endif // wxUSE_STATUSBAR

 
 
 
 
 
 


@@ -349,13 +359,15 @@ bool wxHtmlWindow::LoadPage(const wxString& location)
 
     else
     {
 
     else
     {

-        needs_refresh = TRUE;
+        needs_refresh = true;
+#if wxUSE_STATUSBAR

         // load&display it:
         if (m_RelatedStatusBar != -1)
         {
             m_RelatedFrame->SetStatusText(_("Connecting..."), m_RelatedStatusBar);
         // load&display it:
         if (m_RelatedStatusBar != -1)
         {
             m_RelatedFrame->SetStatusText(_("Connecting..."), m_RelatedStatusBar);

-            Refresh(FALSE);
+            Refresh(false);

         }
         }

+#endif // wxUSE_STATUSBAR

 
         f = m_Parser->OpenURL(wxHTML_URL_PAGE, location);
 
 
         f = m_Parser->OpenURL(wxHTML_URL_PAGE, location);
 


@@ -371,7 +383,7 @@ bool wxHtmlWindow::LoadPage(const wxString& location)
         {
             wxLogError(_("Unable to open requested HTML document: %s"), location.c_str());
             m_tmpCanDrawLocks--;
         {
             wxLogError(_("Unable to open requested HTML document: %s"), location.c_str());
             m_tmpCanDrawLocks--;

-            return FALSE;
+            return false;

         }
 
         else
         }
 
         else


@@ -379,12 +391,14 @@ bool wxHtmlWindow::LoadPage(const wxString& location)
             wxList::compatibility_iterator node;
             wxString src = wxEmptyString;
 
             wxList::compatibility_iterator node;
             wxString src = wxEmptyString;
 

+#if wxUSE_STATUSBAR

             if (m_RelatedStatusBar != -1)
             {
                 wxString msg = _("Loading : ") + location;
                 m_RelatedFrame->SetStatusText(msg, m_RelatedStatusBar);
             if (m_RelatedStatusBar != -1)
             {
                 wxString msg = _("Loading : ") + location;
                 m_RelatedFrame->SetStatusText(msg, m_RelatedStatusBar);

-                Refresh(FALSE);
+                Refresh(false);

             }
             }

+#endif // wxUSE_STATUSBAR

 
             node = m_Filters.GetFirst();
             while (node)
 
             node = m_Filters.GetFirst();
             while (node)


@@ -413,7 +427,10 @@ bool wxHtmlWindow::LoadPage(const wxString& location)
 
             delete f;
 
 
             delete f;
 

-            if (m_RelatedStatusBar != -1) m_RelatedFrame->SetStatusText(_("Done"), m_RelatedStatusBar);
+#if wxUSE_STATUSBAR
+            if (m_RelatedStatusBar != -1) 
+                m_RelatedFrame->SetStatusText(_("Done"), m_RelatedStatusBar);
+#endif // wxUSE_STATUSBAR

         }
     }
 
         }
     }
 


@@ -722,19 +739,19 @@ bool wxHtmlWindow::IsSelectionEnabled() const
 
 
 #if wxUSE_CLIPBOARD
 
 
 #if wxUSE_CLIPBOARD

-wxString wxHtmlWindow::SelectionToText()
+wxString wxHtmlWindow::DoSelectionToText(wxHtmlSelection *sel)

 {
 {

-    if ( !m_selection )
+    if ( !sel )

         return wxEmptyString;
 
     wxClientDC dc(this);
 
         return wxEmptyString;
 
     wxClientDC dc(this);
 

-    const wxHtmlCell *end = m_selection->GetToCell();
+    const wxHtmlCell *end = sel->GetToCell();

     wxString text;
     wxString text;

-    wxHtmlTerminalCellsInterator i(m_selection->GetFromCell(), end);
+    wxHtmlTerminalCellsInterator i(sel->GetFromCell(), end);

     if ( i )
     {
     if ( i )
     {

-        text << i->ConvertToText(m_selection);
+        text << i->ConvertToText(sel);

         ++i;
     }
     const wxHtmlCell *prev = *i;
         ++i;
     }
     const wxHtmlCell *prev = *i;


@@ -742,16 +759,28 @@ wxString wxHtmlWindow::SelectionToText()
     {
         if ( prev->GetParent() != i->GetParent() )
             text << _T('\n');
     {
         if ( prev->GetParent() != i->GetParent() )
             text << _T('\n');

-        text << i->ConvertToText(*i == end ? m_selection : NULL);
+        text << i->ConvertToText(*i == end ? sel : NULL);

         prev = *i;
         ++i;
     }
     return text;
 }
 
         prev = *i;
         ++i;
     }
     return text;
 }
 

+wxString wxHtmlWindow::ToText()
+{
+    if (m_Cell)
+    {
+        wxHtmlSelection sel;
+        sel.Set(m_Cell->GetFirstTerminal(), m_Cell->GetLastTerminal());
+        return DoSelectionToText(&sel);
+    }
+    else
+        return wxEmptyString;
+}
+

 #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 )


@@ -764,7 +793,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() )


@@ -774,9 +803,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;

 }
 
 
 }
 
 


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

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

 {
 }
 
 {
 }
 


@@ -894,7 +927,7 @@ void wxHtmlWindow::OnSize(wxSizeEvent& event)
 }
 
 
 }
 
 

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

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


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

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

         }
         else
         {
         }
         else
         {


@@ -938,10 +971,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;


@@ -1098,6 +1129,7 @@ void wxHtmlWindow::OnInternalIdle()
 
             if (lnk != m_tmpLastLink)
             {
 
             if (lnk != m_tmpLastLink)
             {

+#if wxUSE_STATUSBAR

                 if (lnk == NULL)
                 {
                     if (m_RelatedStatusBar != -1)
                 if (lnk == NULL)
                 {
                     if (m_RelatedStatusBar != -1)


@@ -1110,6 +1142,7 @@ void wxHtmlWindow::OnInternalIdle()
                         m_RelatedFrame->SetStatusText(lnk->GetHref(),
                                                       m_RelatedStatusBar);
                 }
                         m_RelatedFrame->SetStatusText(lnk->GetHref(),
                                                       m_RelatedStatusBar);
                 }

+#endif // wxUSE_STATUSBAR

                 m_tmpLastLink = lnk;
             }
 
                 m_tmpLastLink = lnk;
             }
 


@@ -1210,15 +1243,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)


@@ -1228,7 +1259,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();
     }


@@ -1238,76 +1269,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)