X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a2fd8a45eca03f90371a1c41b2f7450df088b07c..6362d82b3ed82aa6795e4ad03160820f94c9e4d4:/src/stc/stc.h.in

diff --git a/src/stc/stc.h.in b/src/stc/stc.h.in
index 2cdc27b3d9..d15a2c0822 100644
--- a/src/stc/stc.h.in
+++ b/src/stc/stc.h.in
@@ -77,7 +77,7 @@ class  WordList;
 struct SCNotification;
 
 #ifndef SWIG
-extern WXDLLIMPEXP_STC const wxChar* wxSTCNameStr;
+extern WXDLLIMPEXP_DATA_STC(const char) wxSTCNameStr[];
 class  WXDLLIMPEXP_FWD_STC wxStyledTextCtrl;
 class  WXDLLIMPEXP_FWD_STC wxStyledTextEvent;
 #endif
@@ -180,13 +180,6 @@ public:
     void SetMargins(int left, int right);
 
 
-    // Retrieve the start and end positions of the current selection.
-#ifdef SWIG
-    void GetSelection(int* OUTPUT, int* OUTPUT);
-#else
-    void GetSelection(int* startPos, int* endPos);
-#endif
-
     // Retrieve the point in the window where a position is displayed.
     wxPoint PointFromPosition(int pos);
 
@@ -336,6 +329,9 @@ public:
         }
     }
 
+#ifdef SWIG
+    void GetSelection(long* OUTPUT, long* OUTPUT) const;
+#else
     virtual void GetSelection(long *from, long *to) const
     {
         if ( from )
@@ -344,6 +340,18 @@ public:
             *to = GetSelectionEnd();
     }
 
+    // kept for compatibility only
+    void GetSelection(int *from, int *to)
+    {
+        long f, t;
+        GetSelection(&f, &t);
+        if ( from )
+            *from = f;
+        if ( to )
+            *to = t;
+    }
+#endif
+
     virtual bool IsEditable() const { return !GetReadOnly(); }
     virtual void SetEditable(bool editable) { SetReadOnly(!editable); }