synchronize GTK2 minimum version in docs

[wxWidgets.git] / include / wx / stc / stc.h

diff --git a/include/wx/stc/stc.h b/include/wx/stc/stc.h
index 7e314a10f90b2f3f5b536d9f78f671027fd9894f..7956d13f8e886806e0230bd0571ee948371187d9 100644 (file)
--- a/include/wx/stc/stc.h
+++ b/include/wx/stc/stc.h
@@ -4042,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.
     // 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);
 
     // 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.
     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"
 
 #ifdef SWIG
     %pythoncode "_stc_utf8_methods.py"


@@ -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;
     }


@@ -4292,9 +4291,8 @@ protected:
 
     bool                m_lastKeyDownConsumed;
 
 
     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;
 
     friend class ScintillaWX;
     friend class Platform;