X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/64dcc269136ad1ad47c6df4d707c9a42961c5694..c7382f913cc2d3ddcc782b876574c58865e7d842:/src/common/textcmn.cpp?ds=sidebyside

diff --git a/src/common/textcmn.cpp b/src/common/textcmn.cpp
index cf77965c5b..1b2b1f1532 100644
--- a/src/common/textcmn.cpp
+++ b/src/common/textcmn.cpp
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     13.07.99
 // RCS-ID:      $Id$
-// Copyright:   (c) wxWindows team
+// Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -77,6 +77,7 @@ wxTextAttr::wxTextAttr(const wxColour& colText,
 {
     m_flags = 0;
     m_leftIndent = 0;
+    m_leftSubIndent = 0;
     m_rightIndent = 0;
     if (m_colText.Ok()) m_flags |= wxTEXT_ATTR_TEXT_COLOUR;
     if (m_colBack.Ok()) m_flags |= wxTEXT_ATTR_BACKGROUND_COLOUR;
@@ -90,6 +91,7 @@ void wxTextAttr::Init()
     m_textAlignment = wxTEXT_ALIGNMENT_DEFAULT;
     m_flags = 0;
     m_leftIndent = 0;
+    m_leftSubIndent = 0;
     m_rightIndent = 0;
 }
 
@@ -138,9 +140,9 @@ wxTextAttr wxTextAttr::Combine(const wxTextAttr& attr,
         newAttr.SetTabs(attrDef.GetTabs());
     
     if (attr.HasLeftIndent())
-        newAttr.SetLeftIndent(attr.GetLeftIndent());
+        newAttr.SetLeftIndent(attr.GetLeftIndent(), attr.GetLeftSubIndent());
     else if (attrDef.HasLeftIndent())
-        newAttr.SetLeftIndent(attrDef.GetLeftIndent());
+        newAttr.SetLeftIndent(attrDef.GetLeftIndent(), attr.GetLeftSubIndent());
     
     if (attr.HasRightIndent())
         newAttr.SetRightIndent(attr.GetRightIndent());
@@ -157,6 +159,7 @@ void wxTextAttr::operator= (const wxTextAttr& attr)
     m_colBack = attr.m_colBack;
     m_textAlignment = attr.m_textAlignment;
     m_leftIndent = attr.m_leftIndent;
+    m_leftSubIndent = attr.m_leftSubIndent;
     m_rightIndent = attr.m_rightIndent;
     m_tabs = attr.m_tabs;
     m_flags = attr.m_flags;
@@ -488,6 +491,34 @@ void wxTextCtrlBase::DoUpdateWindowUI(wxUpdateUIEvent& event)
     }    
 }
 
+// ----------------------------------------------------------------------------
+// hit testing
+// ----------------------------------------------------------------------------
+
+wxTextCtrlHitTestResult
+wxTextCtrlBase::HitTest(const wxPoint& pt, wxTextCoord *x, wxTextCoord *y) const
+{
+    // implement in terms of the other overload as the native ports typically
+    // can get the position and not (x, y) pair directly (although wxUniv
+    // directly gets x and y -- and so overrides this method as well)
+    long pos;
+    wxTextCtrlHitTestResult rc = HitTest(pt, &pos);
+
+    if ( rc != wxTE_HT_UNKNOWN )
+    {
+        PositionToXY(pos, x, y);
+    }
+
+    return rc;
+}
+
+wxTextCtrlHitTestResult
+wxTextCtrlBase::HitTest(const wxPoint& WXUNUSED(pt),
+                        long * WXUNUSED(pos)) const
+{
+    // not implemented
+    return wxTE_HT_UNKNOWN;
+}
 
 #else // !wxUSE_TEXTCTRL