Applied #14000 (wxRichTextXMLHandler interface fixes)

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

diff --git a/interface/wx/stc/stc.h b/interface/wx/stc/stc.h
index e1b0d08617b70afe4678467fd3a0b085c3c5dedc..4856c21485919adbb0bd300f0df8423dd6ae1c1a 100644 (file)
--- a/interface/wx/stc/stc.h
+++ b/interface/wx/stc/stc.h
@@ -3,9 +3,12 @@
 // Purpose:     interface of wxStyledTextEvent
 // Author:      wxWidgets team
 // RCS-ID:      $Id$
 // Purpose:     interface of wxStyledTextEvent
 // Author:      wxWidgets team
 // RCS-ID:      $Id$

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

+/// Represents an invalid position.
+#define wxSTC_INVALID_POSITION -1
+

 /**
     @class wxStyledTextEvent
 
 /**
     @class wxStyledTextEvent
 


@@ -360,14 +363,9 @@ public:
     void AddText(const wxString& text);
 
     /**
     void AddText(const wxString& text);
 
     /**

-        The following methods are nearly equivallent 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.
+        Add raw text to the document at current position.

     */
     */

-    void AddTextRaw(const char* text);
+    void AddTextRaw(const char* text, int length=-1);

 
     /**
         Enlarge the document to a particular size of text bytes.
 
     /**
         Enlarge the document to a particular size of text bytes.


@@ -382,7 +380,7 @@ public:
     /**
         Append a string to the end of the document without changing the selection.
     */
     /**
         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);

 
     /**
         Is there an auto-completion list visible?
 
     /**
         Is there an auto-completion list visible?


@@ -553,7 +551,7 @@ public:
     void BraceHighlight(int pos1, int pos2);
 
     /**
     void BraceHighlight(int pos1, int pos2);
 
     /**

-        Find the position of a matching brace or INVALID_POSITION if no match.
+        Find the position of a matching brace or wxSTC_INVALID_POSITION if no match.

     */
     int BraceMatch(int pos);
 
     */
     int BraceMatch(int pos);
 


@@ -1089,13 +1087,13 @@ public:
 
     /**
         Retrieve the position of the end of the selection at the given line
 
     /**
         Retrieve the position of the end of the selection at the given line

-        (INVALID_POSITION if no selection on this line).
+        (wxSTC_INVALID_POSITION if no selection on this line).

     */
     int GetLineSelEndPosition(int line);
 
     /**
         Retrieve the position of the start of the selection at the given line
     */
     int GetLineSelEndPosition(int line);
 
     /**
         Retrieve the position of the start of the selection at the given line

-        (INVALID_POSITION if no selection on this line).
+        (wxSTC_INVALID_POSITION if no selection on this line).

     */
     int GetLineSelStartPosition(int line);
 
     */
     int GetLineSelStartPosition(int line);
 


@@ -1383,17 +1381,17 @@ public:
     int GetWrapMode() const;
 
     /**
     int GetWrapMode() const;
 
     /**

-        Retrive the start indent for wrapped lines.
+        Retrieve the start indent for wrapped lines.

     */
     int GetWrapStartIndent() const;
 
     /**
     */
     int GetWrapStartIndent() const;
 
     /**

-        Retrive the display mode of visual flags for wrapped lines.
+        Retrieve the display mode of visual flags for wrapped lines.

     */
     int GetWrapVisualFlags() const;
 
     /**
     */
     int GetWrapVisualFlags() const;
 
     /**

-        Retrive the location of visual flags for wrapped lines.
+        Retrieve the location of visual flags for wrapped lines.

     */
     int GetWrapVisualFlagsLocation() const;
 
     */
     int GetWrapVisualFlagsLocation() const;
 


@@ -1809,7 +1807,7 @@ public:
 
     /**
         Find the position from a point within the window but return
 
     /**
         Find the position from a point within the window but return

-        INVALID_POSITION if not close to text.
+        wxSTC_INVALID_POSITION if not close to text.

     */
     int PositionFromPointClose(int x, int y);
 
     */
     int PositionFromPointClose(int x, int y);
 


@@ -2449,7 +2447,7 @@ public:
     void SetXCaretPolicy(int caretPolicy, int caretSlop);
 
     /**
     void SetXCaretPolicy(int caretPolicy, int caretSlop);
 
     /**

-        Get and Set the xOffset (ie, horizonal scroll position).
+        Get and Set the xOffset (ie, horizontal scroll position).

     */
     void SetXOffset(int newOffset);
 
     */
     void SetXOffset(int newOffset);
 


@@ -2800,18 +2798,6 @@ public:
     void ZoomOut();
 
 
     void ZoomOut();
 
 

-
-    
-    /**
-       Set the size of the dots used to mark space characters.
-    */
-    void SetWhitespaceSize(int size);
-
-    /**
-       Get the size of the dots used to mark space characters.
-    */
-    int GetWhitespaceSize() const;
-

     /**
        Sets how wrapped sublines are placed. Default is fixed.
     */
     /**
        Sets how wrapped sublines are placed. Default is fixed.
     */


@@ -3002,7 +2988,7 @@ public:
 
     /**
        Find the position of a character from a point within the window.
 
     /**
        Find the position of a character from a point within the window.

-       Return INVALID_POSITION if not close to text.
+       Return wxSTC_INVALID_POSITION if not close to text.

     */
     int CharPositionFromPointClose(int x, int y);
 
     */
     int CharPositionFromPointClose(int x, int y);
 


@@ -3165,5 +3151,12 @@ public:
     */
     void SwapMainAnchorCaret();
     
     */
     void SwapMainAnchorCaret();
     

+    /**
+       Get Scintilla library version information.
+
+       @since 2.9.2
+       @see wxVersionInfo
+    */
+    static wxVersionInfo GetLibraryVersionInfo();

 };
 
 };