Resolve ambiguity between GetClientXXX() methods in wxOSX wxComboBox.

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

diff --git a/interface/wx/stc/stc.h b/interface/wx/stc/stc.h
index e1b0d08617b70afe4678467fd3a0b085c3c5dedc..a9d2023bfe3b93a0d9947e77bac37a90f6285f2c 100644 (file)
--- a/interface/wx/stc/stc.h
+++ b/interface/wx/stc/stc.h
@@ -3,7 +3,7 @@
 // Purpose:     interface of wxStyledTextEvent
 // Author:      wxWidgets team
 // RCS-ID:      $Id$
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 /**
@@ -360,7 +360,7 @@ public:
     void AddText(const wxString& text);
 
     /**
-        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
@@ -1383,17 +1383,17 @@ public:
     int GetWrapMode() const;
 
     /**
-        Retrive the start indent for wrapped lines.
+        Retrieve the start indent for wrapped lines.
     */
     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;
 
     /**
-        Retrive the location of visual flags for wrapped lines.
+        Retrieve the location of visual flags for wrapped lines.
     */
     int GetWrapVisualFlagsLocation() const;
 
@@ -2449,7 +2449,7 @@ public:
     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);
 
@@ -2800,18 +2800,6 @@ public:
     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.
     */
@@ -3165,5 +3153,12 @@ public:
     */
     void SwapMainAnchorCaret();
     
+    /**
+       Get Scintilla library version information.
+
+       @since 2.9.2
+       @see wxVersionInfo
+    */
+    static wxVersionInfo GetLibraryVersionInfo();
 };