Fully implement wxStyledTextCtrl::PositionToXY().

Fill in the column parameter too now.

Closes #14332.

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

diff --git a/docs/changes.txt b/docs/changes.txt
index 2fb3acad3bd9d9f7ba60ed853c6d4c40b8887eea..b4bf4a9290ac7f1ba6c0d308bbc7dc9777402ba5 100644 (file)
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -550,6 +550,7 @@ All (GUI):
 - Added support for fields and virtual attributes to wxRichTextCtrl.
 - Added custom text and dimension scaling to wxRichTextCtrl.
 - Added pixel font size capability to wxTextAttr and wxRichTextCtrl.
 - Added support for fields and virtual attributes to wxRichTextCtrl.
 - Added custom text and dimension scaling to wxRichTextCtrl.
 - Added pixel font size capability to wxTextAttr and wxRichTextCtrl.

+- Fully implement wxStyledTextCtrl::PositionToXY() (troelsk).

 
 GTK:
 
 
 GTK:
 

diff --git a/include/wx/stc/stc.h b/include/wx/stc/stc.h
index 0ac137cae1f90d58a0a3a0a6d971c1208a5dbb5b..7956d13f8e886806e0230bd0571ee948371187d9 100644 (file)
--- a/include/wx/stc/stc.h
+++ b/include/wx/stc/stc.h
@@ -4200,16 +4200,15 @@ public:
 
     virtual bool PositionToXY(long pos, long *x, long *y) const
     {
 
     virtual bool PositionToXY(long pos, long *x, long *y) const
     {

+        long l = LineFromPosition(pos);
+        if ( l == -1 )
+            return false;
+

         if ( x )
         if ( x )

-            *x = -1; // TODO
+            *x = pos - PositionFromLine(l);

 
         if ( y )
 
         if ( y )

-        {
-            long l = LineFromPosition(pos);
-            if ( l == -1 )
-                return false;

             *y = l;
             *y = l;

-        }

 
         return true;
     }
 
         return true;
     }

diff --git a/src/stc/stc.h.in b/src/stc/stc.h.in
index ff6a136ab9a543603733a5d382598fbbcc2f7336..ab4ddab4ba900b56e58fe752ac2b41050cf1f2f2 100644 (file)
--- a/src/stc/stc.h.in
+++ b/src/stc/stc.h.in
@@ -398,16 +398,15 @@ public:
 
     virtual bool PositionToXY(long pos, long *x, long *y) const
     {
 
     virtual bool PositionToXY(long pos, long *x, long *y) const
     {

+        long l = LineFromPosition(pos);
+        if ( l == -1 )
+            return false;
+

         if ( x )
         if ( x )

-            *x = -1; // TODO
+            *x = pos - PositionFromLine(l);

 
         if ( y )
 
         if ( y )

-        {
-            long l = LineFromPosition(pos);
-            if ( l == -1 )
-                return false;

             *y = l;
             *y = l;

-        }

 
         return true;
     }
 
         return true;
     }