typos fixed

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

diff --git a/src/html/htmlwin.cpp b/src/html/htmlwin.cpp
index 5f249c18889e0fc525828e6abb0a3a581922cbbc..b7744b5cdcc110325531ad4e2c752c836242db28 100644 (file)
--- a/src/html/htmlwin.cpp
+++ b/src/html/htmlwin.cpp
@@ -185,7 +185,8 @@ bool wxHtmlWindow::Create(wxWindow *parent, wxWindowID id,
                           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;
@@ -756,7 +757,7 @@ wxString wxHtmlWindow::SelectionToText()
 
 #endif // wxUSE_CLIPBOARD
 
-void wxHtmlWindow::CopySelection(ClipboardType t)
+bool wxHtmlWindow::CopySelection(ClipboardType t)
 {
 #if wxUSE_CLIPBOARD
     if ( m_selection )
@@ -769,7 +770,7 @@ void wxHtmlWindow::CopySelection(ClipboardType t)
         //
         // TODO: this should be abstracted at wxClipboard level!
         if ( t == Primary )
-            return;
+            return false;
 #endif // __UNIX__/!__UNIX__
 
         if ( wxTheClipboard->Open() )
@@ -779,9 +780,13 @@ void wxHtmlWindow::CopySelection(ClipboardType t)
             wxTheClipboard->Close();
             wxLogTrace(_T("wxhtmlselection"),
                        _("Copied to clipboard:\"%s\""), txt.c_str());
+
+            return true;
         }
     }
 #endif // wxUSE_CLIPBOARD
+
+    return false;
 }
 
 
@@ -914,7 +919,7 @@ void wxHtmlWindow::OnMouseDown(wxMouseEvent& event)
         {
             SelectLine(CalcUnscrolledPosition(event.GetPosition()));
 
-            CopySelection();
+            (void) CopySelection();
         }
         else
         {
@@ -943,10 +948,8 @@ void wxHtmlWindow::OnMouseUp(wxMouseEvent& event)
         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;
@@ -1215,15 +1218,13 @@ void wxHtmlWindow::OnKeyUp(wxKeyEvent& event)
     if ( IsSelectionEnabled() &&
          event.GetKeyCode() == 'C' && event.ControlDown() )
     {
-        if ( m_selection )
-            CopySelection();
+        (void) CopySelection();
     }
 }
 
 void wxHtmlWindow::OnCopy(wxCommandEvent& WXUNUSED(event))
 {
-    if ( m_selection )
-        CopySelection();
+    (void) CopySelection();
 }
 
 void wxHtmlWindow::OnDoubleClick(wxMouseEvent& event)
@@ -1233,7 +1234,7 @@ void wxHtmlWindow::OnDoubleClick(wxMouseEvent& event)
     {
         SelectWord(CalcUnscrolledPosition(event.GetPosition()));
 
-        CopySelection(Primary);
+        (void) CopySelection(Primary);
 
         m_lastDoubleClick = wxGetLocalTimeMillis();
     }
@@ -1243,69 +1244,87 @@ void wxHtmlWindow::OnDoubleClick(wxMouseEvent& event)
 
 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)
 {
-    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();
-        m_selection->Set(before, after);
-
+        m_selection->Set(m_Cell->GetFirstTerminal(), m_Cell->GetLastTerminal());
         Refresh();
     }
 }
+
 #endif // wxUSE_CLIPBOARD