X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4ce59b1f90f5bd5efb9cb869f95dd9f218f816d3..ef40bc3dae5b9bce810fa6d44b5f43071109a2d9:/include/wx/stc/stc.h?ds=sidebyside diff --git a/include/wx/stc/stc.h b/include/wx/stc/stc.h index 559f8823d4..0bddcfd8bd 100644 --- a/include/wx/stc/stc.h +++ b/include/wx/stc/stc.h @@ -4049,7 +4049,7 @@ public: // what is used internally by Scintilla in unicode builds. // Add text to the document at current position. - void AddTextRaw(const char* text); + void AddTextRaw(const char* text, int length=-1); // Insert string at a position. void InsertTextRaw(int pos, const char* text); @@ -4078,7 +4078,7 @@ public: wxCharBuffer GetTextRaw(); // Append a string to the end of the document without changing the selection. - void AppendTextRaw(const char* text); + void AppendTextRaw(const char* text, int length=-1); #ifdef SWIG %pythoncode "_stc_utf8_methods.py" @@ -4200,16 +4200,15 @@ public: virtual bool PositionToXY(long pos, long *x, long *y) const { + long l = LineFromPosition(pos); + if ( l == -1 ) + return false; + if ( x ) - *x = -1; // TODO + *x = pos - PositionFromLine(l); if ( y ) - { - long l = LineFromPosition(pos); - if ( l == -1 ) - return false; *y = l; - } return true; } @@ -4292,10 +4291,6 @@ protected: bool m_lastKeyDownConsumed; - // the timestamp that consists of the last wheel event - // added to the time taken to process that event. - long m_lastWheelTimestamp; - friend class ScintillaWX; friend class Platform; #endif // !SWIG