Also account for EOL chars correctly in wxStyledTextCtrl::GetLineLength().

Make GetLineLength() consistent with GetLineText() after the changes of
r73140.

Closes #13646.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73150 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/stc/stc.h b/include/wx/stc/stc.h
index f71fe5f77282604ff97863738aae0b7cb34a221d..1edf28158efae43e5eadce80305d0586b8ac9d33 100644 (file)
--- a/include/wx/stc/stc.h
+++ b/include/wx/stc/stc.h
@@ -4628,7 +4628,7 @@ public:
     // implement wxTextAreaBase pure virtual methods
     // ---------------------------------------------
 
-    virtual int GetLineLength(long n) const { return GetLine(n).length(); }
+    virtual int GetLineLength(long lineNo) const { return static_cast<int>(GetLineText(lineNo).length()); }
     virtual wxString GetLineText(long lineNo) const
     {
         wxString text = GetLine(static_cast<int>(lineNo));

diff --git a/src/stc/stc.h.in b/src/stc/stc.h.in
index e4b3a05406dbdfecbcd798d5245325ef3fa17be4..1c980ab3cc145842b2c165caceea75f938a01495 100644 (file)
--- a/src/stc/stc.h.in
+++ b/src/stc/stc.h.in
@@ -370,7 +370,7 @@ public:
     // implement wxTextAreaBase pure virtual methods
     // ---------------------------------------------
 
-    virtual int GetLineLength(long n) const { return GetLine(n).length(); }
+    virtual int GetLineLength(long lineNo) const { return static_cast<int>(GetLineText(lineNo).length()); }
     virtual wxString GetLineText(long lineNo) const
     {
         wxString text = GetLine(static_cast<int>(lineNo));