X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/35f8d83dbb985f81b7b7b63f113b05e7ca243489..c564ca3c975aba89f8b911ace0f240c0aaf4cf73:/include/wx/stc/stc.h diff --git a/include/wx/stc/stc.h b/include/wx/stc/stc.h index a8210a812f..0ac137cae1 100644 --- a/include/wx/stc/stc.h +++ b/include/wx/stc/stc.h @@ -38,6 +38,7 @@ #include "wx/control.h" #include "wx/dnd.h" #include "wx/stopwatch.h" +#include "wx/versioninfo.h" #include "wx/textentry.h" #if wxUSE_TEXTCTRL @@ -4041,14 +4042,14 @@ public: - // The following methods are nearly equivallent to their similarly named + // The following methods are nearly equivalent to their similarly named // cousins above. The difference is that these methods bypass wxString // and always use a char* even if used in a unicode build of wxWidgets. // In that case the character data will be utf-8 encoded since that is // 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); @@ -4077,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" @@ -4240,6 +4241,8 @@ public: return wxTextAreaBase::HitTest(pt, col, row); } + static wxVersionInfo GetLibraryVersionInfo(); + protected: virtual wxString DoGetValue() const { return GetText(); } virtual wxWindow *GetEditableWindow() { return this; } @@ -4289,9 +4292,8 @@ 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; + // Time until when we should ignore any new mouse wheel events. + wxLongLong m_timeToBlockWheelEventsUntil; friend class ScintillaWX; friend class Platform;