Fix item selection/focus drawing in generic wxListCtrl.

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

diff --git a/src/stc/gen_iface.py b/src/stc/gen_iface.py
old mode 100644 (file)
new mode 100755 (executable)
index 885357f..8fddb97
--- a/src/stc/gen_iface.py
+++ b/src/stc/gen_iface.py
@@ -1,4 +1,4 @@
-#!/bin/env python
+#!/usr/bin/env python

 #----------------------------------------------------------------------------
 # Name:         gen_iface.py
 # Purpose:      Generate stc.h and stc.cpp from the info in Scintilla.iface
 #----------------------------------------------------------------------------
 # Name:         gen_iface.py
 # Purpose:      Generate stc.h and stc.cpp from the info in Scintilla.iface


@@ -21,6 +21,10 @@ H_TEMPLATE    = os.path.abspath('./stc.h.in')
 CPP_TEMPLATE  = os.path.abspath('./stc.cpp.in')
 H_DEST        = os.path.abspath('../../include/wx/stc/stc.h')
 CPP_DEST      = os.path.abspath('./stc.cpp')
 CPP_TEMPLATE  = os.path.abspath('./stc.cpp.in')
 H_DEST        = os.path.abspath('../../include/wx/stc/stc.h')
 CPP_DEST      = os.path.abspath('./stc.cpp')

+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


@@ -28,6 +32,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_'),


@@ -35,19 +40,25 @@ valPrefixes = [('SCI_', ''),
                ('SCWS_', 'WS_'),
 ]
 
                ('SCWS_', 'WS_'),
 ]
 

-# Message function values that should have a CMD_ constant as well
-cmdValues = [ (2300, 2349),
-              2011,
+# Message function values that should have a CMD_ constant generated
+cmdValues = [ 2011,

               2013,
               (2176, 2180),
               2013,
               (2176, 2180),

+              (2300, 2349),

               (2390, 2393),
               (2395, 2396),
               2404,
               (2413, 2416),
               (2390, 2393),
               (2395, 2396),
               2404,
               (2413, 2416),

-              (2450, 2454),
+              (2426, 2442),
+              (2450, 2455),
+              2518,

             ]
 
 
             ]
 
 

+# Should a funciton be also generated for the CMDs?
+FUNC_FOR_CMD = 1
+
+

 # Map some generic typenames to wx types, using return value syntax
 retTypeMap = {
     'position': 'int',
 # Map some generic typenames to wx types, using return value syntax
 retTypeMap = {
     'position': 'int',


@@ -78,28 +89,36 @@ methodOverrideMap = {
 
                  '''void %s(const wxString& text) {
                     wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(text);
 
                  '''void %s(const wxString& text) {
                     wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(text);

-                    SendMsg(%s, strlen(buf), (long)(const char*)buf);''',
+                    SendMsg(%s, strlen(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),
 
                        0),
 

+    'AppendText' : (0,
+                 'void %s(const wxString& text);',
+
+                 '''void %s(const wxString& text) {
+                    wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(text);
+                    SendMsg(%s, strlen(buf), (sptr_t)(const char*)buf);''',
+                 0),
+

     'GetViewWS' : ( 'GetViewWhiteSpace', 0, 0, 0),
     'SetViewWS' : ( 'SetViewWhiteSpace', 0, 0, 0),
 
     'GetCharAt' :
     ( 0, 0,
     'GetViewWS' : ( 'GetViewWhiteSpace', 0, 0, 0),
     'SetViewWS' : ( 'SetViewWhiteSpace', 0, 0, 0),
 
     'GetCharAt' :
     ( 0, 0,

-      '''int %s(int pos) {
+      '''int %s(int pos) const {

          return (unsigned char)SendMsg(%s, pos, 0);''',
       0),
 
     'GetStyleAt' :
     ( 0, 0,
          return (unsigned char)SendMsg(%s, pos, 0);''',
       0),
 
     'GetStyleAt' :
     ( 0, 0,

-      '''int %s(int pos) {
+      '''int %s(int pos) const {

          return (unsigned char)SendMsg(%s, pos, 0);''',
       0),
 
          return (unsigned char)SendMsg(%s, pos, 0);''',
       0),
 


@@ -120,7 +139,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;''',
 


@@ -129,9 +148,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),
 


@@ -149,7 +168,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;


@@ -162,6 +181,8 @@ methodOverrideMap = {
     'MarkerSetFore' : ('MarkerSetForeground', 0, 0, 0),
     'MarkerSetBack' : ('MarkerSetBackground', 0, 0, 0),
 
     'MarkerSetFore' : ('MarkerSetForeground', 0, 0, 0),
     'MarkerSetBack' : ('MarkerSetBackground', 0, 0, 0),
 

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

     'MarkerDefine' :
     (0,
      '''void %s(int markerNumber, int markerSymbol,
     'MarkerDefine' :
     (0,
      '''void %s(int markerNumber, int markerSymbol,


@@ -189,12 +210,14 @@ methodOverrideMap = {
         // convert bmp to a xpm in a string
         wxMemoryOutputStream strm;
         wxImage img = bmp.ConvertToImage();
         // convert bmp to a xpm in a string
         wxMemoryOutputStream strm;
         wxImage img = bmp.ConvertToImage();

+        if (img.HasAlpha())
+            img.ConvertAlphaToMask();

         img.SaveFile(strm, wxBITMAP_TYPE_XPM);
         size_t len = strm.GetSize();
         char* buff = new char[len+1];
         strm.CopyTo(buff, len);
         buff[len] = 0;
         img.SaveFile(strm, wxBITMAP_TYPE_XPM);
         size_t len = strm.GetSize();
         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',)),


@@ -209,12 +232,97 @@ methodOverrideMap = {
     'SetMarginSensitiveN' : ('SetMarginSensitive', 0, 0, 0),
     'GetMarginSensitiveN' : ('GetMarginSensitive', 0, 0, 0),
 
     'SetMarginSensitiveN' : ('SetMarginSensitive', 0, 0, 0),
     'GetMarginSensitiveN' : ('GetMarginSensitive', 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),

     'StyleSetFore' : ('StyleSetForeground', 0, 0, 0),
     'StyleSetBack' : ('StyleSetBackground', 0, 0, 0),
     'SetSelFore' : ('SetSelForeground', 0, 0, 0),
     'SetSelBack' : ('SetSelBackground', 0, 0, 0),
     'SetCaretFore' : ('SetCaretForeground', 0, 0, 0),
     'StyleSetFore' : ('StyleSetForeground', 0, 0, 0),
     'StyleSetBack' : ('StyleSetBackground', 0, 0, 0),
     'SetSelFore' : ('SetSelForeground', 0, 0, 0),
     'SetSelBack' : ('SetSelBackground', 0, 0, 0),
     'SetCaretFore' : ('SetCaretForeground', 0, 0, 0),

+    'StyleGetFont' :
+    ('StyleGetFaceName',
+     'wxString %s(int style);',
+      '''wxString %s(int style) {
+         long msg = %s;
+         long len = SendMsg(msg, style, 0);
+         wxMemoryBuffer mbuf(len+1);
+         char* buf = (char*)mbuf.GetWriteBuf(len+1);
+         SendMsg(msg, style, (sptr_t)buf);
+         mbuf.UngetWriteBuf(len);
+         mbuf.AppendByte(0);
+         return stc2wx(buf);''',
+         ('Get the font facename of a style',)),

     'StyleSetFont' : ('StyleSetFaceName', 0, 0, 0),
     'StyleSetFont' : ('StyleSetFaceName', 0, 0, 0),

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

 
     'AssignCmdKey' :
     ('CmdKeyAssign',
 
     'AssignCmdKey' :
     ('CmdKeyAssign',


@@ -241,14 +349,18 @@ 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),

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

+    'IndicSetUnder': ('IndicatorSetUnder', 0, 0, 0),
+    'IndicGetUnder': ('IndicatorGetUnder', 0, 0, 0),

 
     'SetWhitespaceFore' : ('SetWhitespaceForeground', 0, 0, 0),
     'SetWhitespaceBack' : ('SetWhitespaceBackground', 0, 0, 0),
 
     'SetWhitespaceFore' : ('SetWhitespaceForeground', 0, 0, 0),
     'SetWhitespaceBack' : ('SetWhitespaceBackground', 0, 0, 0),


@@ -275,6 +387,13 @@ methodOverrideMap = {
     'AutoCGetDropRestOfWord' : ('AutoCompGetDropRestOfWord', 0,0,0),
     'AutoCGetTypeSeparator' : ('AutoCompGetTypeSeparator', 0, 0, 0),
     'AutoCSetTypeSeparator' : ('AutoCompSetTypeSeparator', 0, 0, 0),
     'AutoCGetDropRestOfWord' : ('AutoCompGetDropRestOfWord', 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),

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


@@ -283,12 +402,14 @@ methodOverrideMap = {
         // convert bmp to a xpm in a string
         wxMemoryOutputStream strm;
         wxImage img = bmp.ConvertToImage();
         // convert bmp to a xpm in a string
         wxMemoryOutputStream strm;
         wxImage img = bmp.ConvertToImage();

+        if (img.HasAlpha())
+            img.ConvertAlphaToMask();

         img.SaveFile(strm, wxBITMAP_TYPE_XPM);
         size_t len = strm.GetSize();
         char* buff = new char[len+1];
         strm.CopyTo(buff, len);
         buff[len] = 0;
         img.SaveFile(strm, wxBITMAP_TYPE_XPM);
         size_t len = strm.GetSize();
         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.',)),


@@ -321,7 +442,7 @@ methodOverrideMap = {
             wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(text);
             ft.lpstrText = (char*)(const char*)buf;
 
             wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(text);
             ft.lpstrText = (char*)(const char*)buf;
 

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

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


@@ -330,14 +451,14 @@ methodOverrideMap = {
                int    startPos,
                int    endPos,
                wxDC*  draw,
                int    startPos,
                int    endPos,
                wxDC*  draw,

-               wxDC*  target,  // Why does it use two? Can they be the same?
+               wxDC*  target,

                wxRect renderRect,
                wxRect pageRect);''',
      ''' int %s(bool   doDraw,
                 int    startPos,
                 int    endPos,
                 wxDC*  draw,
                wxRect renderRect,
                wxRect pageRect);''',
      ''' int %s(bool   doDraw,
                 int    startPos,
                 int    endPos,
                 wxDC*  draw,

-                wxDC*  target,  // Why does it use two? Can they be the same?
+                wxDC*  target,

                 wxRect renderRect,
                 wxRect pageRect) {
              RangeToFormat fr;
                 wxRect renderRect,
                 wxRect pageRect) {
              RangeToFormat fr;


@@ -360,44 +481,44 @@ 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;
+         long   start;
+         long   end;

 
          GetSelection(&start, &end);
          int   len  = end - start;
          if (!len) return wxEmptyString;
 
 
          GetSelection(&start, &end);
          int   len  = end - start;
          if (!len) return wxEmptyString;
 

-         wxMemoryBuffer mbuf(len+1);
+         wxMemoryBuffer mbuf(len+2);

          char* buf = (char*)mbuf.GetWriteBuf(len+1);
          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);''',


@@ -423,7 +544,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);''',


@@ -439,13 +560,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);''',


@@ -463,7 +584,11 @@ methodOverrideMap = {
 
     'SetHotspotActiveFore' : ('SetHotspotActiveForeground', 0, 0, 0),
     'SetHotspotActiveBack' : ('SetHotspotActiveBackground', 0, 0, 0),
 
     'SetHotspotActiveFore' : ('SetHotspotActiveForeground', 0, 0, 0),
     'SetHotspotActiveBack' : ('SetHotspotActiveBackground', 0, 0, 0),

+    'GetHotspotActiveFore' : ('GetHotspotActiveForeground', 0, 0, 0),
+    'GetHotspotActiveBack' : ('GetHotspotActiveBackground', 0, 0, 0),

 
 

+    'GetCaretLineBack' : ('GetCaretLineBackground', 0, 0, 0),
+    'SetCaretLineBack' : ('SetCaretLineBackground', 0, 0, 0),

 
     'ReplaceTarget' :
     (0,
 
     'ReplaceTarget' :
     (0,


@@ -472,7 +597,7 @@ methodOverrideMap = {
      '''
      int %s(const wxString& text) {
          wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(text);
      '''
      int %s(const wxString& text) {
          wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(text);

-         return SendMsg(%s, strlen(buf), (long)(const char*)buf);''',
+         return SendMsg(%s, strlen(buf), (sptr_t)(const char*)buf);''',

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


@@ -482,7 +607,7 @@ methodOverrideMap = {
      '''
      int %s(const wxString& text) {
          wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(text);
      '''
      int %s(const wxString& text) {
          wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(text);

-         return SendMsg(%s, strlen(buf), (long)(const char*)buf);''',
+         return SendMsg(%s, strlen(buf), (sptr_t)(const char*)buf);''',

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


@@ -492,9 +617,52 @@ methodOverrideMap = {
      '''
      int %s(const wxString& text) {
          wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(text);
      '''
      int %s(const wxString& text) {
          wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(text);

-         return SendMsg(%s, strlen(buf), (long)(const char*)buf);''',
+         return SendMsg(%s, strlen(buf), (sptr_t)(const char*)buf);''',

      0),
 
      0),
 

+    # not sure what to do about these yet
+    'TargetAsUTF8' :       ( None, 0, 0, 0),
+    'SetLengthForEncode' : ( None, 0, 0, 0),
+    'EncodedFromUTF8' :    ( None, 0, 0, 0),
+
+
+    'GetProperty' :
+    (0,
+     'wxString %s(const wxString& key);',
+
+     '''wxString %s(const wxString& key) {
+         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);
+         SendMsg(%s, (uptr_t)(const char*)wx2stc(key), (sptr_t)buf);
+         mbuf.UngetWriteBuf(len);
+         mbuf.AppendByte(0);
+         return stc2wx(buf);''',
+     ("Retrieve a 'property' value previously set with SetProperty.",)),
+
+    'GetPropertyExpanded' :
+    (0,
+     'wxString %s(const wxString& key);',
+
+     '''wxString %s(const wxString& key) {
+         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);
+         SendMsg(%s, (uptr_t)(const char*)wx2stc(key), (sptr_t)buf);
+         mbuf.UngetWriteBuf(len);
+         mbuf.AppendByte(0);
+         return stc2wx(buf);''',
+     ("Retrieve a 'property' value previously set with SetProperty,",
+      "with '$()' variable replacement on returned buffer.")),
+
+    'GetPropertyInt'   : (0, 0, 0,
+       ("Retrieve a 'property' value previously set with SetProperty,",
+        "interpreted as an int AFTER any '$()' variable replacement.")),
+

 
     'GetDocPointer' :
     (0,
 
     'GetDocPointer' :
     (0,


@@ -507,7 +675,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' :


@@ -521,14 +689,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' :


@@ -547,81 +715,50 @@ methodOverrideMap = {
 
 
     'GrabFocus' : (None, 0, 0, 0),
 
 
     'GrabFocus' : (None, 0, 0, 0),

+
+    # Rename some that would otherwise hide the wxWindow methods

     'SetFocus'  : ('SetSTCFocus', 0, 0, 0),
     'GetFocus'  : ('GetSTCFocus', 0, 0, 0),
     'SetFocus'  : ('SetSTCFocus', 0, 0, 0),
     'GetFocus'  : ('GetSTCFocus', 0, 0, 0),

-
+    'SetCursor' : ('SetSTCCursor', 0, 0, 0),
+    'GetCursor' : ('GetSTCCursor', 0, 0, 0),

 
     'LoadLexerLibrary' : (None, 0,0,0),
 
 
     'LoadLexerLibrary' : (None, 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),

 
 

-    # Remove all methods that are key commands since they can be
-    # executed with CmdKeyExecute
-    'LineDown' : (None, 0, 0, 0),
-    'LineDownExtend' : (None, 0, 0, 0),
-    'LineUp' : (None, 0, 0, 0),
-    'LineUpExtend' : (None, 0, 0, 0),
-    'CharLeft' : (None, 0, 0, 0),
-    'CharLeftExtend' : (None, 0, 0, 0),
-    'CharRight' : (None, 0, 0, 0),
-    'CharRightExtend' : (None, 0, 0, 0),
-    'WordLeft' : (None, 0, 0, 0),
-    'WordLeftExtend' : (None, 0, 0, 0),
-    'WordRight' : (None, 0, 0, 0),
-    'WordRightExtend' : (None, 0, 0, 0),
-    'Home' : (None, 0, 0, 0),
-    'HomeExtend' : (None, 0, 0, 0),
-    'LineEnd' : (None, 0, 0, 0),
-    'LineEndExtend' : (None, 0, 0, 0),
-    'DocumentStart' : (None, 0, 0, 0),
-    'DocumentStartExtend' : (None, 0, 0, 0),
-    'DocumentEnd' : (None, 0, 0, 0),
-    'DocumentEndExtend' : (None, 0, 0, 0),
-    'PageUp' : (None, 0, 0, 0),
-    'PageUpExtend' : (None, 0, 0, 0),
-    'PageDown' : (None, 0, 0, 0),
-    'PageDownExtend' : (None, 0, 0, 0),
-    'EditToggleOvertype' : (None, 0, 0, 0),
-    'Cancel' : (None, 0, 0, 0),
-    'DeleteBack' : (None, 0, 0, 0),
-    'Tab' : (None, 0, 0, 0),
-    'BackTab' : (None, 0, 0, 0),
-    'NewLine' : (None, 0, 0, 0),
-    'FormFeed' : (None, 0, 0, 0),
-    'VCHome' : (None, 0, 0, 0),
-    'VCHomeExtend' : (None, 0, 0, 0),
-    'ZoomIn' : (None, 0, 0, 0),
-    'ZoomOut' : (None, 0, 0, 0),
-    'DelWordLeft' : (None, 0, 0, 0),
-    'DelWordRight' : (None, 0, 0, 0),
-    'LineCut' : (None, 0, 0, 0),
-    'LineDelete' : (None, 0, 0, 0),
-    'LineTranspose' : (None, 0, 0, 0),
-    'LowerCase' : (None, 0, 0, 0),
-    'UpperCase' : (None, 0, 0, 0),
-    'LineScrollDown' : (None, 0, 0, 0),
-    'LineScrollUp' : (None, 0, 0, 0),
-    'DeleteBackNotLine' : (None, 0, 0, 0),
-    'HomeWrap' : (None, 0, 0, 0),
-    'HomeWrapExtend' : (None, 0, 0, 0),
-    'LineEndWrap' : (None, 0, 0, 0),
-    'LineEndWrapExtend' : (None, 0, 0, 0),
-    'VCHomeWrap' : (None, 0, 0, 0),
-    'VCHomeWrapExtend' : (None, 0, 0, 0),
-    'ParaDown' : (None, 0, 0, 0),
-    'ParaDownExtend' : (None, 0, 0, 0),
-    'ParaUp' : (None, 0, 0, 0),
-    'ParaUpExtend' : (None, 0, 0, 0),
-
-
+    'GetCharacterPointer' : (0,
+                             'const char* %s();',
+                             'const char* %s() {\n'
+                             '    return (const char*)SendMsg(%s, 0, 0);',
+                             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):
+def processIface(iface, h_tmplt, cpp_tmplt, h_dest, cpp_dest, docstr_dest):

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


@@ -644,7 +781,7 @@ def processIface(iface, h_tmplt, cpp_tmplt, h_dest, cpp_dest):
             curDocStrings = []
 
         elif op == 'fun ' or op == 'set ' or op == 'get ':
             curDocStrings = []
 
         elif op == 'fun ' or op == 'set ' or op == 'get ':

-            parseFun(line[4:], methods, curDocStrings, cmds)
+            parseFun(line[4:], methods, curDocStrings, cmds, op == 'get ')

             curDocStrings = []
 
         elif op == 'cat ':
             curDocStrings = []
 
         elif op == 'cat ':


@@ -668,7 +805,7 @@ def processIface(iface, h_tmplt, cpp_tmplt, h_dest, cpp_dest):
     data = {}
     data['VALUES'] = processVals(values)
     data['CMDS']   = processVals(cmds)
     data = {}
     data['VALUES'] = processVals(values)
     data['CMDS']   = processVals(cmds)

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

     data['METHOD_DEFS'] = defs
     data['METHOD_IMPS'] = imps
 
     data['METHOD_DEFS'] = defs
     data['METHOD_IMPS'] = imps
 


@@ -683,9 +820,13 @@ def processIface(iface, h_tmplt, cpp_tmplt, h_dest, cpp_dest):
     # write out destination files
     open(h_dest, 'w').write(h_text)
     open(cpp_dest, 'w').write(cpp_text)
     # write out destination files
     open(h_dest, 'w').write(h_text)
     open(cpp_dest, 'w').write(cpp_text)

+    open(docstr_dest, 'w').write(docstrings)

 
 
 
 
 
 

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

 #----------------------------------------------------------------------------
 
 def processVals(values):
 #----------------------------------------------------------------------------
 
 def processVals(values):


@@ -696,15 +837,16 @@ def processVals(values):
             for x in docs:
                 text.append('// ' + x)
         text.append('#define %s %s' % (name, value))
             for x in docs:
                 text.append('// ' + x)
         text.append('#define %s %s' % (name, value))

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

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

+    dstr = []

 
 

-    for retType, name, number, param1, param2, docs in methods:
+    for retType, name, number, param1, param2, docs, is_const in methods:

         retType = retTypeMap.get(retType, retType)
         params = makeParamString(param1, param2)
 
         retType = retTypeMap.get(retType, retType)
         params = makeParamString(param1, param2)
 


@@ -713,13 +855,21 @@ def processMethods(methods):
         if name is None:
             continue
 
         if name is None:
             continue
 

+        # Build docstrings
+        st = 'DocStr(wxStyledTextCtrl::%s,\n' \
+             '"%s", "");\n' % (name, joinWithNewLines(docs))
+        dstr.append(st)
+

         # Build the method definition for the .h file
         if docs:
             defs.append('')
             for x in docs:
                 defs.append('    // ' + x)
         if not theDef:
         # Build the method definition for the .h file
         if docs:
             defs.append('')
             for x in docs:
                 defs.append('    // ' + x)
         if not theDef:

-            theDef = '    %s %s(%s);' % (retType, name, params)
+            theDef = '    %s %s(%s)' % (retType, name, params)
+            if is_const:
+                theDef = theDef + ' const'
+            theDef = theDef + ';'

         defs.append(theDef)
 
         # Build the method implementation string
         defs.append(theDef)
 
         # Build the method implementation string


@@ -728,8 +878,10 @@ def processMethods(methods):
             for x in docs:
                 imps.append('// ' + x)
         if not theImp:
             for x in docs:
                 imps.append('// ' + x)
         if not theImp:

-            theImp = '%s wxStyledTextCtrl::%s(%s) {\n    ' % (retType, name, params)
-
+            theImp = '%s wxStyledTextCtrl::%s(%s)' % (retType, name, params)
+            if is_const:
+                theImp = theImp + ' const'
+            theImp = theImp + '\n{\n    '

             if retType == 'wxColour':
                 theImp = theImp + 'long c = '
             elif retType != 'void':
             if retType == 'wxColour':
                 theImp = theImp + 'long c = '
             elif retType != 'void':


@@ -746,7 +898,7 @@ def processMethods(methods):
         imps.append(theImp)
 
 
         imps.append(theImp)
 
 

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

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


@@ -780,7 +932,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
 


@@ -825,9 +977,9 @@ 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):
+def parseFun(line, methods, docs, values, is_const):

     def parseParam(param):
         param = string.strip(param)
         if param == '':
     def parseParam(param):
         param = string.strip(param)
         if param == '':


@@ -851,9 +1003,13 @@ def parseFun(line, methods, docs, values):
         if (type(v) == type(()) and v[0] <= num <= v[1]) or v == num:
             parseVal('CMD_%s=%s' % (string.upper(name), number), values, docs)
 
         if (type(v) == type(()) and v[0] <= num <= v[1]) or v == num:
             parseVal('CMD_%s=%s' % (string.upper(name), number), values, docs)
 

-    #if retType == 'void' and not param1 and not param2:
+            # 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)) )
+    methods.append( (retType, name, number, param1, param2, tuple(docs),
+                     is_const or name in constNonGetterMethods) )

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


@@ -862,8 +1018,12 @@ def parseFun(line, methods, docs, values):
 def main(args):
     # TODO: parse command line args to replace default input/output files???
 
 def main(args):
     # 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.'
+        sys.exit(1)
+

     # Now just do it
     # Now just do it

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