simplify code to return from the end of the function

[wxWidgets.git] / src / stc / gen_iface.py

diff --git a/src/stc/gen_iface.py b/src/stc/gen_iface.py
index bde1a8447d3e5971a8ac448d446f05ba4f8bbf19..9db059ea9fe5007f00049e7dd8690ff2faffe283 100755 (executable)
--- a/src/stc/gen_iface.py
+++ b/src/stc/gen_iface.py
@@ -8,7 +8,7 @@
 # Created:      5-Sept-2000
 # RCS-ID:       $Id$
 # Copyright:    (c) 2000 by Total Control Software
 # Created:      5-Sept-2000
 # RCS-ID:       $Id$
 # Copyright:    (c) 2000 by Total Control Software

-# Licence:      wxWindows license
+# Licence:      wxWindows licence

 #----------------------------------------------------------------------------
 
 
 #----------------------------------------------------------------------------
 
 


@@ -18,10 +18,15 @@ from fileinput import FileInput
 
 IFACE         = os.path.abspath('./scintilla/include/Scintilla.iface')
 H_TEMPLATE    = os.path.abspath('./stc.h.in')
 
 IFACE         = os.path.abspath('./scintilla/include/Scintilla.iface')
 H_TEMPLATE    = os.path.abspath('./stc.h.in')

+IH_TEMPLATE   = os.path.abspath('./stc.interface.h.in')

 CPP_TEMPLATE  = os.path.abspath('./stc.cpp.in')
 H_DEST        = os.path.abspath('../../include/wx/stc/stc.h')
 CPP_TEMPLATE  = os.path.abspath('./stc.cpp.in')
 H_DEST        = os.path.abspath('../../include/wx/stc/stc.h')

+IH_DEST       = os.path.abspath('../../interface/wx/stc/stc.h')

 CPP_DEST      = os.path.abspath('./stc.cpp')
 CPP_DEST      = os.path.abspath('./stc.cpp')

-DOCSTR_DEST   = os.path.abspath('../../../wxPython/contrib/stc/_stc_gendocs.i')
+if len(sys.argv) > 1 and sys.argv[1] == '--wxpython':
+    DOCSTR_DEST   = os.path.abspath('../../../wxPython/src/_stc_gendocs.i')
+else:
+    DOCSTR_DEST   = '/dev/null'

 
 
 # Value prefixes to convert
 
 
 # Value prefixes to convert


@@ -29,6 +34,7 @@ valPrefixes = [('SCI_', ''),
                ('SC_',  ''),
                ('SCN_', None),  # just toss these out...
                ('SCEN_', None),
                ('SC_',  ''),
                ('SCN_', None),  # just toss these out...
                ('SCEN_', None),

+               ('SC_EFF', None),

                ('SCE_', ''),
                ('SCLEX_', 'LEX_'),
                ('SCK_', 'KEY_'),
                ('SCE_', ''),
                ('SCLEX_', 'LEX_'),
                ('SCK_', 'KEY_'),


@@ -48,11 +54,13 @@ cmdValues = [ 2011,
               (2426, 2442),
               (2450, 2455),
               2518,
               (2426, 2442),
               (2450, 2455),
               2518,

+              (2619, 2621),
+              (2628, 2629)

             ]
 
 
 # Should a funciton be also generated for the CMDs?
             ]
 
 
 # Should a funciton be also generated for the CMDs?

-FUNC_FOR_CMD = True
+FUNC_FOR_CMD = 1

 
 
 # Map some generic typenames to wx types, using return value syntax
 
 
 # Map some generic typenames to wx types, using return value syntax


@@ -84,23 +92,23 @@ methodOverrideMap = {
                  'void %s(const wxString& text);',
 
                  '''void %s(const wxString& text) {
                  'void %s(const wxString& text);',
 
                  '''void %s(const wxString& text) {

-                    wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(text);
-                    SendMsg(%s, strlen(buf), (long)(const char*)buf);''',
+                    const wxWX2MBbuf buf = wx2stc(text);
+                    SendMsg(%s, wx2stclen(text, buf), (sptr_t)(const char*)buf);''',

                  0),
 
     'AddStyledText' : (0,
                        'void %s(const wxMemoryBuffer& data);',
 
                        '''void %s(const wxMemoryBuffer& data) {
                  0),
 
     'AddStyledText' : (0,
                        'void %s(const wxMemoryBuffer& data);',
 
                        '''void %s(const wxMemoryBuffer& data) {

-                          SendMsg(%s, data.GetDataLen(), (long)data.GetData());''',
+                          SendMsg(%s, data.GetDataLen(), (sptr_t)data.GetData());''',

                        0),
 
     'AppendText' : (0,
                  'void %s(const wxString& text);',
 
                  '''void %s(const wxString& text) {
                        0),
 
     'AppendText' : (0,
                  'void %s(const wxString& text);',
 
                  '''void %s(const wxString& text) {

-                    wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(text);
-                    SendMsg(%s, strlen(buf), (long)(const char*)buf);''',
+                    const wxWX2MBbuf buf = wx2stc(text);
+                    SendMsg(%s, wx2stclen(text, buf), (sptr_t)(const char*)buf);''',

                  0),
 
     'GetViewWS' : ( 'GetViewWhiteSpace', 0, 0, 0),
                  0),
 
     'GetViewWS' : ( 'GetViewWhiteSpace', 0, 0, 0),


@@ -135,7 +143,7 @@ methodOverrideMap = {
         tr.lpstrText = (char*)buf.GetWriteBuf(len*2+1);
         tr.chrg.cpMin = startPos;
         tr.chrg.cpMax = endPos;
         tr.lpstrText = (char*)buf.GetWriteBuf(len*2+1);
         tr.chrg.cpMin = startPos;
         tr.chrg.cpMax = endPos;

-        len = SendMsg(%s, 0, (long)&tr);
+        len = SendMsg(%s, 0, (sptr_t)&tr);

         buf.UngetWriteBuf(len);
         return buf;''',
 
         buf.UngetWriteBuf(len);
         return buf;''',
 


@@ -144,9 +152,9 @@ methodOverrideMap = {
 
     'PositionFromPoint' :
     (0,
 
     'PositionFromPoint' :
     (0,

-     'int %s(wxPoint pt);',
+     'int %s(wxPoint pt) const;',

 
 

-     '''int %s(wxPoint pt) {
+     '''int %s(wxPoint pt) const {

         return SendMsg(%s, pt.x, pt.y);''',
      0),
 
         return SendMsg(%s, pt.x, pt.y);''',
      0),
 


@@ -164,7 +172,7 @@ methodOverrideMap = {
         wxMemoryBuffer mbuf(len+1);
         char* buf = (char*)mbuf.GetWriteBuf(len+1);
 
         wxMemoryBuffer mbuf(len+1);
         char* buf = (char*)mbuf.GetWriteBuf(len+1);
 

-        int pos = SendMsg(%s, len+1, (long)buf);
+        int pos = SendMsg(%s, len+1, (sptr_t)buf);

         mbuf.UngetWriteBuf(len);
         mbuf.AppendByte(0);
         if (linePos)  *linePos = pos;
         mbuf.UngetWriteBuf(len);
         mbuf.AppendByte(0);
         if (linePos)  *linePos = pos;


@@ -176,6 +184,9 @@ methodOverrideMap = {
 
     'MarkerSetFore' : ('MarkerSetForeground', 0, 0, 0),
     'MarkerSetBack' : ('MarkerSetBackground', 0, 0, 0),
 
     'MarkerSetFore' : ('MarkerSetForeground', 0, 0, 0),
     'MarkerSetBack' : ('MarkerSetBackground', 0, 0, 0),

+    'MarkerSetBackSelected' : ('MarkerSetBackgroundSelected', 0,0,0),
+
+    'MarkerSymbolDefined' : ('GetMarkerSymbolDefined', 0, 0, 0),

 
     'MarkerDefine' :
     (0,
 
     'MarkerDefine' :
     (0,


@@ -188,9 +199,9 @@ methodOverrideMap = {
                 const wxColour& background) {
 
                 SendMsg(%s, markerNumber, markerSymbol);
                 const wxColour& background) {
 
                 SendMsg(%s, markerNumber, markerSymbol);

-                if (foreground.Ok())
+                if (foreground.IsOk())

                     MarkerSetForeground(markerNumber, foreground);
                     MarkerSetForeground(markerNumber, foreground);

-                if (background.Ok())
+                if (background.IsOk())

                     MarkerSetBackground(markerNumber, background);''',
 
      ('Set the symbol used for a particular marker number,',
                     MarkerSetBackground(markerNumber, background);''',
 
      ('Set the symbol used for a particular marker number,',


@@ -211,7 +222,7 @@ methodOverrideMap = {
         char* buff = new char[len+1];
         strm.CopyTo(buff, len);
         buff[len] = 0;
         char* buff = new char[len+1];
         strm.CopyTo(buff, len);
         buff[len] = 0;

-        SendMsg(%s, markerNumber, (long)buff);
+        SendMsg(%s, markerNumber, (sptr_t)buff);

         delete [] buff;
         ''',
      ('Define a marker from a bitmap',)),
         delete [] buff;
         ''',
      ('Define a marker from a bitmap',)),


@@ -225,7 +236,77 @@ methodOverrideMap = {
     'GetMarginMaskN' : ('GetMarginMask', 0, 0, 0),
     'SetMarginSensitiveN' : ('SetMarginSensitive', 0, 0, 0),
     'GetMarginSensitiveN' : ('GetMarginSensitive', 0, 0, 0),
     'GetMarginMaskN' : ('GetMarginMask', 0, 0, 0),
     'SetMarginSensitiveN' : ('SetMarginSensitive', 0, 0, 0),
     'GetMarginSensitiveN' : ('GetMarginSensitive', 0, 0, 0),

+    'SetMarginCursorN' : ('SetMarginCursor', 0, 0, 0),
+    'GetMarginCursorN' : ('GetMarginCursor', 0, 0, 0),
+    
+    'MarginGetText' :
+    (0,
+    'wxString %s(int line) const;',
+
+     '''wxString %s(int line) const {
+         long msg = %s;
+         long len = SendMsg(msg, line, 0);
+
+         wxMemoryBuffer mbuf(len+1);
+         char* buf = (char*)mbuf.GetWriteBuf(len+1);
+         SendMsg(msg, line, (sptr_t)buf);
+         mbuf.UngetWriteBuf(len);
+         mbuf.AppendByte(0);
+         return stc2wx(buf);''',
+     0),
+     
+     'MarginGetStyles' :
+     (0,
+    'wxString %s(int line) const;',
+
+     '''wxString %s(int line) const {
+         long msg = %s;
+         long len = SendMsg(msg, line, 0);
+
+         wxMemoryBuffer mbuf(len+1);
+         char* buf = (char*)mbuf.GetWriteBuf(len+1);
+         SendMsg(msg, line, (sptr_t)buf);
+         mbuf.UngetWriteBuf(len);
+         mbuf.AppendByte(0);
+         return stc2wx(buf);''',
+     0),
+
+    'SetAdditionalSelFore' : ('SetAdditionalSelForeground', 0, 0, 0),
+    'SetAdditionalSelBack' : ('SetAdditionalSelBackground', 0, 0, 0),
+    'SetAdditionalCaretFore' : ('SetAdditionalCaretForeground', 0, 0, 0),
+    'GetAdditionalCaretFore' : ('GetAdditionalCaretForeground', 0, 0, 0),
+
+    'AnnotationGetText' :
+    (0,
+    'wxString %s(int line) const;',
+
+     '''wxString %s(int line) const {
+         long msg = %s;
+         long len = SendMsg(msg, line, 0);
+
+         wxMemoryBuffer mbuf(len+1);
+         char* buf = (char*)mbuf.GetWriteBuf(len+1);
+         SendMsg(msg, line, (sptr_t)buf);
+         mbuf.UngetWriteBuf(len);
+         mbuf.AppendByte(0);
+         return stc2wx(buf);''',
+     0),

 
 

+    'AnnotationGetStyles' :
+    (0,
+    'wxString %s(int line) const;',
+
+     '''wxString %s(int line) const {
+         long msg = %s;
+         long len = SendMsg(msg, line, 0);
+
+         wxMemoryBuffer mbuf(len+1);
+         char* buf = (char*)mbuf.GetWriteBuf(len+1);
+         SendMsg(msg, line, (sptr_t)buf);
+         mbuf.UngetWriteBuf(len);
+         mbuf.AppendByte(0);
+         return stc2wx(buf);''',
+     0),

 
     'StyleGetFore' : ('StyleGetForeground', 0, 0, 0),
     'StyleGetBack' : ('StyleGetBackground', 0, 0, 0),
 
     'StyleGetFore' : ('StyleGetForeground', 0, 0, 0),
     'StyleGetBack' : ('StyleGetBackground', 0, 0, 0),


@@ -242,7 +323,7 @@ methodOverrideMap = {
          long len = SendMsg(msg, style, 0);
          wxMemoryBuffer mbuf(len+1);
          char* buf = (char*)mbuf.GetWriteBuf(len+1);
          long len = SendMsg(msg, style, 0);
          wxMemoryBuffer mbuf(len+1);
          char* buf = (char*)mbuf.GetWriteBuf(len+1);

-         SendMsg(msg, style, (long)buf);
+         SendMsg(msg, style, (sptr_t)buf);

          mbuf.UngetWriteBuf(len);
          mbuf.AppendByte(0);
          return stc2wx(buf);''',
          mbuf.UngetWriteBuf(len);
          mbuf.AppendByte(0);
          return stc2wx(buf);''',


@@ -275,10 +356,14 @@ methodOverrideMap = {
      'void %s(int length, char* styleBytes);',
 
      '''void %s(int length, char* styleBytes) {
      'void %s(int length, char* styleBytes);',
 
      '''void %s(int length, char* styleBytes) {

-        SendMsg(%s, length, (long)styleBytes);''',
+        SendMsg(%s, length, (sptr_t)styleBytes);''',

      0),
 
 
      0),
 
 

+    'IndicSetAlpha' : ('IndicatorSetAlpha', 0, 0, 0),
+    'IndicGetAlpha' : ('IndicatorGetAlpha', 0, 0, 0),
+    'IndicSetOutlineAlpha' : ('IndicatorSetOutlineAlpha', 0, 0, 0),
+    'IndicGetOutlineAlpha' : ('IndicatorGetOutlineAlpha', 0, 0, 0),

     'IndicSetStyle' : ('IndicatorSetStyle', 0, 0, 0),
     'IndicGetStyle' : ('IndicatorGetStyle', 0, 0, 0),
     'IndicSetFore' : ('IndicatorSetForeground', 0, 0, 0),
     'IndicSetStyle' : ('IndicatorSetStyle', 0, 0, 0),
     'IndicGetStyle' : ('IndicatorGetStyle', 0, 0, 0),
     'IndicSetFore' : ('IndicatorSetForeground', 0, 0, 0),


@@ -312,11 +397,14 @@ methodOverrideMap = {
     'AutoCGetTypeSeparator' : ('AutoCompGetTypeSeparator', 0, 0, 0),
     'AutoCSetTypeSeparator' : ('AutoCompSetTypeSeparator', 0, 0, 0),
     'AutoCGetCurrent'       : ('AutoCompGetCurrent', 0, 0, 0),
     'AutoCGetTypeSeparator' : ('AutoCompGetTypeSeparator', 0, 0, 0),
     'AutoCSetTypeSeparator' : ('AutoCompSetTypeSeparator', 0, 0, 0),
     'AutoCGetCurrent'       : ('AutoCompGetCurrent', 0, 0, 0),

+    'AutoCGetCurrentText'   : (None, 0, 0, 0),

     'AutoCSetMaxWidth'      : ('AutoCompSetMaxWidth', 0, 0, 0),
     'AutoCGetMaxWidth'      : ('AutoCompGetMaxWidth', 0, 0, 0),
     'AutoCSetMaxHeight'     : ('AutoCompSetMaxHeight', 0, 0, 0),
     'AutoCGetMaxHeight'     : ('AutoCompGetMaxHeight', 0, 0, 0),
     'AutoCGetMaxHeight'     : ('AutoCompGetMaxHeight', 0, 0, 0),
     'AutoCSetMaxWidth'      : ('AutoCompSetMaxWidth', 0, 0, 0),
     'AutoCGetMaxWidth'      : ('AutoCompGetMaxWidth', 0, 0, 0),
     'AutoCSetMaxHeight'     : ('AutoCompSetMaxHeight', 0, 0, 0),
     'AutoCGetMaxHeight'     : ('AutoCompGetMaxHeight', 0, 0, 0),
     'AutoCGetMaxHeight'     : ('AutoCompGetMaxHeight', 0, 0, 0),

+    'AutoCSetCaseInsensitiveBehaviour'     : ('AutoCompSetCaseInsensitiveBehaviour', 0, 0, 0),
+    'AutoCGetCaseInsensitiveBehaviour'     : ('AutoCompGetCaseInsensitiveBehaviour', 0, 0, 0),

 
     'RegisterImage' :
     (0,
 
     'RegisterImage' :
     (0,


@@ -332,7 +420,7 @@ methodOverrideMap = {
         char* buff = new char[len+1];
         strm.CopyTo(buff, len);
         buff[len] = 0;
         char* buff = new char[len+1];
         strm.CopyTo(buff, len);
         buff[len] = 0;

-        SendMsg(%s, type, (long)buff);
+        SendMsg(%s, type, (sptr_t)buff);

         delete [] buff;
      ''',
      ('Register an image for use in autocompletion lists.',)),
         delete [] buff;
      ''',
      ('Register an image for use in autocompletion lists.',)),


@@ -362,10 +450,10 @@ methodOverrideMap = {
             TextToFind  ft;
             ft.chrg.cpMin = minPos;
             ft.chrg.cpMax = maxPos;
             TextToFind  ft;
             ft.chrg.cpMin = minPos;
             ft.chrg.cpMax = maxPos;

-            wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(text);
+            const wxWX2MBbuf buf = wx2stc(text);

             ft.lpstrText = (char*)(const char*)buf;
 
             ft.lpstrText = (char*)(const char*)buf;
 

-            return SendMsg(%s, flags, (long)&ft);''',
+            return SendMsg(%s, flags, (sptr_t)&ft);''',

      0),
 
     'FormatRange' :
      0),
 
     'FormatRange' :


@@ -404,44 +492,40 @@ methodOverrideMap = {
              fr.chrg.cpMin = startPos;
              fr.chrg.cpMax = endPos;
 
              fr.chrg.cpMin = startPos;
              fr.chrg.cpMax = endPos;
 

-             return SendMsg(%s, doDraw, (long)&fr);''',
+             return SendMsg(%s, doDraw, (sptr_t)&fr);''',

      0),
 
 
     'GetLine' :
     (0,
      0),
 
 
     'GetLine' :
     (0,

-     'wxString %s(int line);',
+     'wxString %s(int line) const;',

 
 

-     '''wxString %s(int line) {
+     '''wxString %s(int line) const {

          int len = LineLength(line);
          if (!len) return wxEmptyString;
 
          wxMemoryBuffer mbuf(len+1);
          char* buf = (char*)mbuf.GetWriteBuf(len+1);
          int len = LineLength(line);
          if (!len) return wxEmptyString;
 
          wxMemoryBuffer mbuf(len+1);
          char* buf = (char*)mbuf.GetWriteBuf(len+1);

-         SendMsg(%s, line, (long)buf);
+         SendMsg(%s, line, (sptr_t)buf);

          mbuf.UngetWriteBuf(len);
          mbuf.AppendByte(0);
          return stc2wx(buf);''',
 
      ('Retrieve the contents of a line.',)),
 
          mbuf.UngetWriteBuf(len);
          mbuf.AppendByte(0);
          return stc2wx(buf);''',
 
      ('Retrieve the contents of a line.',)),
 

-    'SetSel' : ('SetSelection', 0, 0, 0),
+    'SetSel' : (None, 0,0,0), #'SetSelection', 0, 0, 0),

 
     'GetSelText' :
     ('GetSelectedText',
      'wxString %s();',
 
      '''wxString %s() {
 
     'GetSelText' :
     ('GetSelectedText',
      'wxString %s();',
 
      '''wxString %s() {

-         int   start;
-         int   end;
-
-         GetSelection(&start, &end);
-         int   len  = end - start;
+         const int len = SendMsg(SCI_GETSELTEXT, 0, (sptr_t)0);

          if (!len) return wxEmptyString;
 
          wxMemoryBuffer mbuf(len+2);
          char* buf = (char*)mbuf.GetWriteBuf(len+1);
          if (!len) return wxEmptyString;
 
          wxMemoryBuffer mbuf(len+2);
          char* buf = (char*)mbuf.GetWriteBuf(len+1);

-         SendMsg(%s, 0, (long)buf);
+         SendMsg(%s, 0, (sptr_t)buf);

          mbuf.UngetWriteBuf(len);
          mbuf.AppendByte(0);
          return stc2wx(buf);''',
          mbuf.UngetWriteBuf(len);
          mbuf.AppendByte(0);
          return stc2wx(buf);''',


@@ -467,7 +551,7 @@ methodOverrideMap = {
          tr.lpstrText = buf;
          tr.chrg.cpMin = startPos;
          tr.chrg.cpMax = endPos;
          tr.lpstrText = buf;
          tr.chrg.cpMin = startPos;
          tr.chrg.cpMax = endPos;

-         SendMsg(%s, 0, (long)&tr);
+         SendMsg(%s, 0, (sptr_t)&tr);

          mbuf.UngetWriteBuf(len);
          mbuf.AppendByte(0);
          return stc2wx(buf);''',
          mbuf.UngetWriteBuf(len);
          mbuf.AppendByte(0);
          return stc2wx(buf);''',


@@ -483,13 +567,13 @@ methodOverrideMap = {
 
     'GetText' :
     (0,
 
     'GetText' :
     (0,

-     'wxString %s();',
+     'wxString %s() const;',

 
 

-     '''wxString %s() {
+     '''wxString %s() const {

          int len  = GetTextLength();
          wxMemoryBuffer mbuf(len+1);   // leave room for the null...
          char* buf = (char*)mbuf.GetWriteBuf(len+1);
          int len  = GetTextLength();
          wxMemoryBuffer mbuf(len+1);   // leave room for the null...
          char* buf = (char*)mbuf.GetWriteBuf(len+1);

-         SendMsg(%s, len+1, (long)buf);
+         SendMsg(%s, len+1, (sptr_t)buf);

          mbuf.UngetWriteBuf(len);
          mbuf.AppendByte(0);
          return stc2wx(buf);''',
          mbuf.UngetWriteBuf(len);
          mbuf.AppendByte(0);
          return stc2wx(buf);''',


@@ -519,8 +603,8 @@ methodOverrideMap = {
 
      '''
      int %s(const wxString& text) {
 
      '''
      int %s(const wxString& text) {

-         wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(text);
-         return SendMsg(%s, strlen(buf), (long)(const char*)buf);''',
+         const wxWX2MBbuf buf = wx2stc(text);
+         return SendMsg(%s, wx2stclen(text, buf), (sptr_t)(const char*)buf);''',

      0),
 
     'ReplaceTargetRE' :
      0),
 
     'ReplaceTargetRE' :


@@ -529,8 +613,8 @@ methodOverrideMap = {
 
      '''
      int %s(const wxString& text) {
 
      '''
      int %s(const wxString& text) {

-         wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(text);
-         return SendMsg(%s, strlen(buf), (long)(const char*)buf);''',
+         const wxWX2MBbuf buf = wx2stc(text);
+         return SendMsg(%s, wx2stclen(text, buf), (sptr_t)(const char*)buf);''',

      0),
 
     'SearchInTarget' :
      0),
 
     'SearchInTarget' :


@@ -539,8 +623,8 @@ methodOverrideMap = {
 
      '''
      int %s(const wxString& text) {
 
      '''
      int %s(const wxString& text) {

-         wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(text);
-         return SendMsg(%s, strlen(buf), (long)(const char*)buf);''',
+         const wxWX2MBbuf buf = wx2stc(text);
+         return SendMsg(%s, wx2stclen(text, buf), (sptr_t)(const char*)buf);''',

      0),
 
     # not sure what to do about these yet
      0),
 
     # not sure what to do about these yet


@@ -554,12 +638,12 @@ methodOverrideMap = {
      'wxString %s(const wxString& key);',
 
      '''wxString %s(const wxString& key) {
      'wxString %s(const wxString& key);',
 
      '''wxString %s(const wxString& key) {

-         int len = SendMsg(SCI_GETPROPERTY, (long)(const char*)wx2stc(key), 0);
+         int len = SendMsg(SCI_GETPROPERTY, (sptr_t)(const char*)wx2stc(key), 0);

          if (!len) return wxEmptyString;
 
          wxMemoryBuffer mbuf(len+1);
          char* buf = (char*)mbuf.GetWriteBuf(len+1);
          if (!len) return wxEmptyString;
 
          wxMemoryBuffer mbuf(len+1);
          char* buf = (char*)mbuf.GetWriteBuf(len+1);

-         SendMsg(%s, (long)(const char*)wx2stc(key), (long)buf);
+         SendMsg(%s, (uptr_t)(const char*)wx2stc(key), (sptr_t)buf);

          mbuf.UngetWriteBuf(len);
          mbuf.AppendByte(0);
          return stc2wx(buf);''',
          mbuf.UngetWriteBuf(len);
          mbuf.AppendByte(0);
          return stc2wx(buf);''',


@@ -570,12 +654,12 @@ methodOverrideMap = {
      'wxString %s(const wxString& key);',
 
      '''wxString %s(const wxString& key) {
      'wxString %s(const wxString& key);',
 
      '''wxString %s(const wxString& key) {

-         int len = SendMsg(SCI_GETPROPERTYEXPANDED, (long)(const char*)wx2stc(key), 0);
+         int len = SendMsg(SCI_GETPROPERTYEXPANDED, (uptr_t)(const char*)wx2stc(key), 0);

          if (!len) return wxEmptyString;
 
          wxMemoryBuffer mbuf(len+1);
          char* buf = (char*)mbuf.GetWriteBuf(len+1);
          if (!len) return wxEmptyString;
 
          wxMemoryBuffer mbuf(len+1);
          char* buf = (char*)mbuf.GetWriteBuf(len+1);

-         SendMsg(%s, (long)(const char*)wx2stc(key), (long)buf);
+         SendMsg(%s, (uptr_t)(const char*)wx2stc(key), (sptr_t)buf);

          mbuf.UngetWriteBuf(len);
          mbuf.AppendByte(0);
          return stc2wx(buf);''',
          mbuf.UngetWriteBuf(len);
          mbuf.AppendByte(0);
          return stc2wx(buf);''',


@@ -598,7 +682,7 @@ methodOverrideMap = {
     (0,
      'void %s(void* docPointer);',
      '''void %s(void* docPointer) {
     (0,
      'void %s(void* docPointer);',
      '''void %s(void* docPointer) {

-         SendMsg(%s, 0, (long)docPointer);''',
+         SendMsg(%s, 0, (sptr_t)docPointer);''',

      0),
 
     'CreateDocument' :
      0),
 
     'CreateDocument' :


@@ -612,14 +696,14 @@ methodOverrideMap = {
     (0,
      'void %s(void* docPointer);',
      '''void %s(void* docPointer) {
     (0,
      'void %s(void* docPointer);',
      '''void %s(void* docPointer) {

-         SendMsg(%s, 0, (long)docPointer);''',
+         SendMsg(%s, 0, (sptr_t)docPointer);''',

      0),
 
     'ReleaseDocument' :
     (0,
      'void %s(void* docPointer);',
      '''void %s(void* docPointer) {
      0),
 
     'ReleaseDocument' :
     (0,
      'void %s(void* docPointer);',
      '''void %s(void* docPointer) {

-         SendMsg(%s, 0, (long)docPointer);''',
+         SendMsg(%s, 0, (sptr_t)docPointer);''',

      0),
 
     'SetCodePage' :
      0),
 
     'SetCodePage' :


@@ -650,14 +734,207 @@ methodOverrideMap = {
     'SetPositionCache' : ('SetPositionCacheSize', 0, 0, 0),
     'GetPositionCache' : ('GetPositionCacheSize', 0, 0, 0),
 
     'SetPositionCache' : ('SetPositionCacheSize', 0, 0, 0),
     'GetPositionCache' : ('GetPositionCacheSize', 0, 0, 0),
 

+    'GetLexerLanguage' : (None, 0, 0, 0),
+    'SetFontQuality' : (None, 0, 0, 0),
+    'GetFontQuality' : (None, 0, 0, 0),
+    'SetSelection' : (None, 0, 0, 0),
+
+    'GetCharacterPointer' : (0,
+                             'const char* %s() const;',
+                             'const char* %s() const {\n'
+                             '    return (const char*)SendMsg(%s, 0, 0);',
+                             0),
+    
+    'GetRangePointer' : (0,
+                             'const char* %s(int position, int rangeLength) const;',
+                             'const char* %s(int position, int rangeLength) const {\n'
+                             '    return (const char*)SendMsg(%s, position, rangeLength);',
+                             0),
+    
+
+    'GetWordChars' :
+    (0,
+     'wxString %s() const;',
+
+     '''wxString %s() const {
+         int msg = %s;
+         int len = SendMsg(msg, 0, (sptr_t)NULL);
+         if (!len) return wxEmptyString;
+
+         wxMemoryBuffer mbuf(len+1);
+         char* buf = (char*)mbuf.GetWriteBuf(len+1);
+         SendMsg(msg, 0, (sptr_t)buf);
+         mbuf.UngetWriteBuf(len);
+         mbuf.AppendByte(0);
+         return stc2wx(buf);''',
+
+     ('Get the set of characters making up words for when moving or selecting by word.',)),
+
+    'GetTag' :
+    (0,
+     'wxString %s(int tagNumber) const;',
+
+     '''wxString %s(int tagNumber) const {
+         int msg = %s;
+         int len = SendMsg(msg, tagNumber, (sptr_t)NULL);
+         if (!len) return wxEmptyString;
+
+         wxMemoryBuffer mbuf(len+1);
+         char* buf = (char*)mbuf.GetWriteBuf(len+1);
+         SendMsg(msg, tagNumber, (sptr_t)buf);
+         mbuf.UngetWriteBuf(len);
+         mbuf.AppendByte(0);
+         return stc2wx(buf);''',
+     0),
+
+    'GetWhitespaceChars' :
+    (0,
+     'wxString %s() const;',
+
+     '''wxString %s() const {
+         int msg = %s;
+         int len = SendMsg(msg, 0, (sptr_t)NULL);
+         if (!len) return wxEmptyString;
+
+         wxMemoryBuffer mbuf(len+1);
+         char* buf = (char*)mbuf.GetWriteBuf(len+1);
+         SendMsg(msg, 0, (sptr_t)buf);
+         mbuf.UngetWriteBuf(len);
+         mbuf.AppendByte(0);
+         return stc2wx(buf);''',
+     0),
+
+
+    'GetPunctuationChars' :
+    (0,
+     'wxString %s() const;',
+
+     '''wxString %s() const {
+         int msg = %s;
+         int len = SendMsg(msg, 0, (sptr_t)NULL);
+         if (!len) return wxEmptyString;
+
+         wxMemoryBuffer mbuf(len+1);
+         char* buf = (char*)mbuf.GetWriteBuf(len+1);
+         SendMsg(msg, 0, (sptr_t)buf);
+         mbuf.UngetWriteBuf(len);
+         mbuf.AppendByte(0);
+         return stc2wx(buf);''',
+     0),
+
+
+    'PropertyNames' :
+    (0,
+     'wxString %s() const;',
+
+     '''wxString %s() const {
+         int msg = %s;
+         int len = SendMsg(msg, 0, (sptr_t)NULL);
+         if (!len) return wxEmptyString;
+
+         wxMemoryBuffer mbuf(len+1);
+         char* buf = (char*)mbuf.GetWriteBuf(len+1);
+         SendMsg(msg, 0, (sptr_t)buf);
+         mbuf.UngetWriteBuf(len);
+         mbuf.AppendByte(0);
+         return stc2wx(buf);''',
+     0),
+
+
+
+    'DescribeProperty' :
+    (0,
+     'wxString %s(const wxString& name) const;',
+
+     '''wxString %s(const wxString& name) const {
+         int msg = %s;
+         int len = SendMsg(msg, (sptr_t)(const char*)wx2stc(name), (sptr_t)NULL);
+         if (!len) return wxEmptyString;

 
 

+         wxMemoryBuffer mbuf(len+1);
+         char* buf = (char*)mbuf.GetWriteBuf(len+1);
+         SendMsg(msg, (sptr_t)(const char*)wx2stc(name), (sptr_t)buf);
+         mbuf.UngetWriteBuf(len);
+         mbuf.AppendByte(0);
+         return stc2wx(buf);''',
+     0),
+
+
+
+    'DescribeKeyWordSets' :
+    (0,
+     'wxString %s() const;',
+
+     '''wxString %s() const {
+         int msg = %s;
+         int len = SendMsg(msg, 0, (sptr_t)NULL);
+         if (!len) return wxEmptyString;
+
+         wxMemoryBuffer mbuf(len+1);
+         char* buf = (char*)mbuf.GetWriteBuf(len+1);
+         SendMsg(msg, 0, (sptr_t)buf);
+         mbuf.UngetWriteBuf(len);
+         mbuf.AppendByte(0);
+         return stc2wx(buf);''',
+     0),
+     
+
+    'MarkerDefineRGBAImage' :
+    (0,
+    'void %s(int markerNumber, const unsigned char* pixels);',
+    '''void %s(int markerNumber, const unsigned char* pixels) {
+           SendMsg(%s, markerNumber, (sptr_t)pixels);''',
+    0),
+
+
+    'RegisterRGBAImage' :
+    (0,
+    'void %s(int type, const unsigned char* pixels);',
+    '''void %s(int type, const unsigned char* pixels) {
+           SendMsg(%s, type, (sptr_t)pixels);''',
+    0),
+
+
+    # I think these are only available on the native OSX backend, so
+    # don't add them to the wx API...
+    'FindIndicatorShow' : (None, 0,0,0),
+    'FindIndicatorFlash' : (None, 0,0,0),
+    'FindIndicatorHide' : (None, 0,0,0),
+
+    'CreateLoader' :
+    (0,
+     'void* %s(int bytes) const;',
+     """void* %s(int bytes) const {
+         return (void*)(sptr_t)SendMsg(%s, bytes); """,
+     0),
+
+     'PrivateLexerCall' :
+     (0,
+      'void* %s(int operation, void* pointer);',
+      """void* %s(int operation, void* pointer) {
+           return (void*)(sptr_t)SendMsg(%s, operation, (sptr_t)pointer); """,
+      0),
+    

     '' : ('', 0, 0, 0),
 
     }
 
     '' : ('', 0, 0, 0),
 
     }
 

+# all Scintilla getters are transformed into const member of wxSTC class but
+# some non-getter methods are also logically const and this set contains their
+# names (notice that it's useless to include here methods manually overridden
+# above)
+constNonGetterMethods = (
+    'LineFromPosition',
+    'PositionFromLine',
+    'LineLength',
+    'CanPaste',
+    'CanRedo',
+    'CanUndo',
+)
+

 #----------------------------------------------------------------------------
 
 #----------------------------------------------------------------------------
 

-def processIface(iface, h_tmplt, cpp_tmplt, h_dest, cpp_dest, docstr_dest):
+def processIface(iface, h_tmplt, cpp_tmplt, ih_tmplt, h_dest, cpp_dest, docstr_dest, ih_dest):

     curDocStrings = []
     values = []
     methods = []
     curDocStrings = []
     values = []
     methods = []


@@ -684,7 +961,7 @@ def processIface(iface, h_tmplt, cpp_tmplt, h_dest, cpp_dest, docstr_dest):
             curDocStrings = []
 
         elif op == 'cat ':
             curDocStrings = []
 
         elif op == 'cat ':

-            if string.strip(line[4:]) == 'Deprecated':
+            if line[4:].strip() == 'Deprecated':

                 break    # skip the rest of the file
 
         elif op == 'evt ':
                 break    # skip the rest of the file
 
         elif op == 'evt ':


@@ -697,31 +974,37 @@ def processIface(iface, h_tmplt, cpp_tmplt, h_dest, cpp_dest, docstr_dest):
             pass
 
         else:
             pass
 
         else:

-            print '***** Unknown line type: ', line
+            print('***** Unknown line type: %s' % line)

 
 
     # process templates
     data = {}
     data['VALUES'] = processVals(values)
     data['CMDS']   = processVals(cmds)
 
 
     # process templates
     data = {}
     data['VALUES'] = processVals(values)
     data['CMDS']   = processVals(cmds)

-    defs, imps, docstrings = processMethods(methods)
+    defs, imps, docstrings, idefs = processMethods(methods)

     data['METHOD_DEFS'] = defs
     data['METHOD_DEFS'] = defs

+    data['METHOD_IDEFS'] = idefs

     data['METHOD_IMPS'] = imps
 
     # get template text
     h_text = open(h_tmplt).read()
     data['METHOD_IMPS'] = imps
 
     # get template text
     h_text = open(h_tmplt).read()

+    ih_text = open(ih_tmplt).read()

     cpp_text = open(cpp_tmplt).read()
 
     # do the substitutions
     h_text = h_text % data
     cpp_text = cpp_text % data
     cpp_text = open(cpp_tmplt).read()
 
     # do the substitutions
     h_text = h_text % data
     cpp_text = cpp_text % data

+    ih_text = ih_text % data

 
     # write out destination files
     open(h_dest, 'w').write(h_text)
     open(cpp_dest, 'w').write(cpp_text)
     open(docstr_dest, 'w').write(docstrings)
 
     # write out destination files
     open(h_dest, 'w').write(h_text)
     open(cpp_dest, 'w').write(cpp_text)
     open(docstr_dest, 'w').write(docstrings)

+    open(ih_dest, 'w').write(ih_text)

 
 
 
 

+def joinWithNewLines(values):
+    return '\n'.join(values)

 
 #----------------------------------------------------------------------------
 
 
 #----------------------------------------------------------------------------
 


@@ -731,14 +1014,15 @@ def processVals(values):
         if docs:
             text.append('')
             for x in docs:
         if docs:
             text.append('')
             for x in docs:

-                text.append('// ' + x)
+                text.append('/// ' + x)

         text.append('#define %s %s' % (name, value))
         text.append('#define %s %s' % (name, value))

-    return string.join(text, '\n')
+    return joinWithNewLines(text)

 
 #----------------------------------------------------------------------------
 
 def processMethods(methods):
     defs = []
 
 #----------------------------------------------------------------------------
 
 def processMethods(methods):
     defs = []

+    idefs = []

     imps = []
     dstr = []
 
     imps = []
     dstr = []
 


@@ -753,7 +1037,7 @@ def processMethods(methods):
 
         # Build docstrings
         st = 'DocStr(wxStyledTextCtrl::%s,\n' \
 
         # Build docstrings
         st = 'DocStr(wxStyledTextCtrl::%s,\n' \

-             '"%s", "");\n' % (name, '\n'.join(docs))
+             '"%s", "");\n' % (name, joinWithNewLines(docs))

         dstr.append(st)
 
         # Build the method definition for the .h file
         dstr.append(st)
 
         # Build the method definition for the .h file


@@ -768,6 +1052,18 @@ def processMethods(methods):
             theDef = theDef + ';'
         defs.append(theDef)
 
             theDef = theDef + ';'
         defs.append(theDef)
 

+        # Build the method definition for the interface .h file
+        if docs:
+            idefs.append('')
+            idefs.append('    /**')
+            for x in docs:
+                idefs.append('        ' + x)
+            idefs.append('    */')
+        if name == 'GetCurLine':
+            idefs.append('    wxString GetCurLine(int* linePos=NULL);')
+        else:
+            idefs.append(theDef)
+                     

         # Build the method implementation string
         if docs:
             imps.append('')
         # Build the method implementation string
         if docs:
             imps.append('')


@@ -794,14 +1090,14 @@ def processMethods(methods):
         imps.append(theImp)
 
 
         imps.append(theImp)
 
 

-    return '\n'.join(defs), '\n'.join(imps), '\n'.join(dstr)
+    return joinWithNewLines(defs), joinWithNewLines(imps), joinWithNewLines(dstr), joinWithNewLines(idefs)

 
 
 #----------------------------------------------------------------------------
 
 def checkMethodOverride(name, number, docs):
     theDef = theImp = None
 
 
 #----------------------------------------------------------------------------
 
 def checkMethodOverride(name, number, docs):
     theDef = theImp = None

-    if methodOverrideMap.has_key(name):
+    if name in methodOverrideMap:

         item = methodOverrideMap[name]
 
         try:
         item = methodOverrideMap[name]
 
         try:


@@ -814,7 +1110,7 @@ def checkMethodOverride(name, number, docs):
             if item[3] != 0:
                 docs = item[3]
         except:
             if item[3] != 0:
                 docs = item[3]
         except:

-            print "*************", name
+            print("************* " + name)

             raise
 
     return name, theDef, theImp, docs
             raise
 
     return name, theDef, theImp, docs


@@ -828,7 +1124,7 @@ def makeArgString(param):
     typ, name = param
 
     if typ == 'string':
     typ, name = param
 
     if typ == 'string':

-        return '(long)(const char*)wx2stc(%s)' % name
+        return '(sptr_t)(const char*)wx2stc(%s)' % name

     if typ == 'colour':
         return 'wxColourAsLong(%s)' % name
 
     if typ == 'colour':
         return 'wxColourAsLong(%s)' % name
 


@@ -854,7 +1150,7 @@ def makeParamString(param1, param2):
 #----------------------------------------------------------------------------
 
 def parseVal(line, values, docs):
 #----------------------------------------------------------------------------
 
 def parseVal(line, values, docs):

-    name, val = string.split(line, '=')
+    name, val = line.split('=')

 
     # remove prefixes such as SCI, etc.
     for old, new in valPrefixes:
 
     # remove prefixes such as SCI, etc.
     for old, new in valPrefixes:


@@ -873,20 +1169,20 @@ funregex = re.compile(r'\s*([a-zA-Z0-9_]+)'  # <ws>return type
                       '\s+([a-zA-Z0-9_]+)='  # <ws>name=
                       '([0-9]+)'             # number
                       '\(([ a-zA-Z0-9_]*),'  # (param,
                       '\s+([a-zA-Z0-9_]+)='  # <ws>name=
                       '([0-9]+)'             # number
                       '\(([ a-zA-Z0-9_]*),'  # (param,

-                      '([ a-zA-Z0-9_]*)\)')  # param)
+                      '([ a-zA-Z0-9_]*),*\)')  # param)

 
 def parseFun(line, methods, docs, values, is_const):
     def parseParam(param):
 
 def parseFun(line, methods, docs, values, is_const):
     def parseParam(param):

-        param = string.strip(param)
+        param = param.strip()

         if param == '':
             param = None
         else:
         if param == '':
             param = None
         else:

-            param = tuple(string.split(param))
+            param = tuple(param.split())

         return param
 
     mo = funregex.match(line)
     if mo is None:
         return param
 
     mo = funregex.match(line)
     if mo is None:

-        print "***** Line doesn't match! : " + line
+        print("***** Line doesn't match! : %s" % line)

 
     retType, name, number, param1, param2 = mo.groups()
 
 
     retType, name, number, param1, param2 = mo.groups()
 


@@ -894,17 +1190,18 @@ def parseFun(line, methods, docs, values, is_const):
     param2 = parseParam(param2)
 
     # Special case.  For the key command functions we want a value defined too
     param2 = parseParam(param2)
 
     # Special case.  For the key command functions we want a value defined too

-    num = string.atoi(number)
+    num = int(number)

     for v in cmdValues:
         if (type(v) == type(()) and v[0] <= num <= v[1]) or v == num:
     for v in cmdValues:
         if (type(v) == type(()) and v[0] <= num <= v[1]) or v == num:

-            parseVal('CMD_%s=%s' % (string.upper(name), number), values, docs)
+            parseVal('CMD_%s=%s' % (name.upper(), number), values, docs)

 
             # if we are not also doing a function for CMD values, then
             # just return, otherwise fall through to the append blow.
             if not FUNC_FOR_CMD:
                 return
 
 
             # if we are not also doing a function for CMD values, then
             # just return, otherwise fall through to the append blow.
             if not FUNC_FOR_CMD:
                 return
 

-    methods.append( (retType, name, number, param1, param2, tuple(docs), is_const) )
+    methods.append( (retType, name, number, param1, param2, tuple(docs),
+                     is_const or name in constNonGetterMethods) )

 
 
 #----------------------------------------------------------------------------
 
 
 #----------------------------------------------------------------------------


@@ -914,11 +1211,11 @@ def main(args):
     # TODO: parse command line args to replace default input/output files???
 
     if not os.path.exists(IFACE):
     # TODO: parse command line args to replace default input/output files???
 
     if not os.path.exists(IFACE):

-        print 'Please run this script from src/stc subdirectory.'
+        print('Please run this script from src/stc subdirectory.')

         sys.exit(1)
 
     # Now just do it
         sys.exit(1)
 
     # Now just do it

-    processIface(IFACE, H_TEMPLATE, CPP_TEMPLATE, H_DEST, CPP_DEST, DOCSTR_DEST)
+    processIface(IFACE, H_TEMPLATE, CPP_TEMPLATE, IH_TEMPLATE, H_DEST, CPP_DEST, DOCSTR_DEST, IH_DEST)