X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/10ef30eb534117ae854c9d099101c862fe96bcb0..bdf5c30deb87129df7fb8a1a782d2b20dba0a816:/src/stc/gen_iface.py?ds=sidebyside

diff --git a/src/stc/gen_iface.py b/src/stc/gen_iface.py
index 8de2af862f..3da52f8420 100644
--- a/src/stc/gen_iface.py
+++ b/src/stc/gen_iface.py
@@ -68,7 +68,7 @@ methodOverrideMap = {
                  'void %s(const wxString& text);',
 
                  '''void %s(const wxString& text) {
-                    wxWX2MBbuf buf = (wxWX2MBbuf)text.mb_str(wxConvUTF8);
+                    wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(text);
                     SendMsg(%s, strlen(buf), (long)(const char*)buf);''',
                  0),
 
@@ -82,6 +82,16 @@ methodOverrideMap = {
     'GetViewWS' : ( 'GetViewWhiteSpace', 0, 0, 0),
     'SetViewWS' : ( 'SetViewWhiteSpace', 0, 0, 0),
 
+    'GetCharAt' : ( 0, 0,
+                    '''int %s(int pos) {
+                       return (unsigned char)SendMsg(%s, pos, 0);''',
+                    0),
+
+    'GetStyleAt' : ( 0, 0,
+                    '''int %s(int pos) {
+                       return (unsigned char)SendMsg(%s, pos, 0);''',
+                    0),
+
     'GetStyledText' : (0,
                        'wxMemoryBuffer %s(int startPos, int endPos);',
 
@@ -130,7 +140,7 @@ methodOverrideMap = {
                        mbuf.UngetWriteBuf(len);
                        mbuf.AppendByte(0);
                        if (linePos)  *linePos = pos;
-                       return wxString(buf, wxConvUTF8);''',
+                       return stc2wx(buf);''',
 
                     0),
 
@@ -236,20 +246,16 @@ methodOverrideMap = {
     'GetUsePalette' : (None, 0, 0, 0),
 
     'FindText' : (0,
+                  '''int %s(int minPos, int maxPos, const wxString& text, int flags=0);''',
+
                   '''int %s(int minPos, int maxPos,
-                               const wxString& text,
-                               bool caseSensitive, bool wholeWord);''',
-                  '''int %s(int minPos, int maxPos,
-                               const wxString& text,
-                               bool caseSensitive, bool wholeWord) {
+                            const wxString& text,
+                            int flags) {
                      TextToFind  ft;
-                     int         flags = 0;
-
-                     flags |= caseSensitive ? SCFIND_MATCHCASE : 0;
-                     flags |= wholeWord     ? SCFIND_WHOLEWORD : 0;
                      ft.chrg.cpMin = minPos;
                      ft.chrg.cpMax = maxPos;
-                     ft.lpstrText = (char*)(const char*)text.mb_str(wxConvUTF8);
+                     wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(text);
+                     ft.lpstrText = (char*)(const char*)buf;
 
                      return SendMsg(%s, flags, (long)&ft);''',
                   0),
@@ -305,7 +311,7 @@ methodOverrideMap = {
                        SendMsg(%s, line, (long)buf);
                        mbuf.UngetWriteBuf(len);
                        mbuf.AppendByte(0);
-                       return wxString(buf, wxConvUTF8);''',
+                       return stc2wx(buf);''',
 
                     ('Retrieve the contents of a line.',)),
 
@@ -326,7 +332,7 @@ methodOverrideMap = {
                             SendMsg(%s, 0, (long)buf);
                             mbuf.UngetWriteBuf(len);
                             mbuf.AppendByte(0);
-                            return wxString(buf, wxConvUTF8);''',
+                            return stc2wx(buf);''',
 
                     ('Retrieve the selected text.',)),
 
@@ -350,7 +356,7 @@ methodOverrideMap = {
                             SendMsg(%s, 0, (long)&tr);
                             mbuf.UngetWriteBuf(len);
                             mbuf.AppendByte(0);
-                            return wxString(buf, wxConvUTF8);''',
+                            return stc2wx(buf);''',
 
                        ('Retrieve a range of text.',)),
 
@@ -371,7 +377,7 @@ methodOverrideMap = {
                         SendMsg(%s, len+1, (long)buf);
                         mbuf.UngetWriteBuf(len);
                         mbuf.AppendByte(0);
-                        return wxString(buf, wxConvUTF8);''',
+                        return stc2wx(buf);''',
 
                  ('Retrieve all the text in the document.', )),
 
@@ -388,7 +394,7 @@ methodOverrideMap = {
 
                        '''
                        int %s(const wxString& text) {
-                           wxWX2MBbuf buf = (wxWX2MBbuf)text.mb_str(wxConvUTF8);
+                           wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(text);
                            return SendMsg(%s, strlen(buf), (long)(const char*)buf);''',
                        0),
 
@@ -397,7 +403,7 @@ methodOverrideMap = {
 
                        '''
                        int %s(const wxString& text) {
-                           wxWX2MBbuf buf = (wxWX2MBbuf)text.mb_str(wxConvUTF8);
+                           wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(text);
                            return SendMsg(%s, strlen(buf), (long)(const char*)buf);''',
                        0),
 
@@ -406,7 +412,7 @@ methodOverrideMap = {
 
                        '''
                        int %s(const wxString& text) {
-                           wxWX2MBbuf buf = (wxWX2MBbuf)text.mb_str(wxConvUTF8);
+                           wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(text);
                            return SendMsg(%s, strlen(buf), (long)(const char*)buf);''',
                        0),
 
@@ -482,13 +488,13 @@ methodOverrideMap = {
     'AddRefDocument' : (0,
                        'void %s(void* docPointer);',
                        '''void %s(void* docPointer) {
-                           SendMsg(%s, (long)docPointer);''',
+                           SendMsg(%s, 0, (long)docPointer);''',
                         0),
 
     'ReleaseDocument' : (0,
                        'void %s(void* docPointer);',
                        '''void %s(void* docPointer) {
-                           SendMsg(%s, (long)docPointer);''',
+                           SendMsg(%s, 0, (long)docPointer);''',
                          0),
     'SetCodePage' : (0,
                      0,
@@ -642,14 +648,18 @@ def checkMethodOverride(name, number, docs):
     if methodOverrideMap.has_key(name):
         item = methodOverrideMap[name]
 
-        if item[0] != 0:
-            name = item[0]
-        if item[1] != 0:
-            theDef = '    ' + (item[1] % name)
-        if item[2] != 0:
-            theImp = item[2] % ('wxStyledTextCtrl::'+name, number) + '\n}'
-        if item[3] != 0:
-            docs = item[3]
+        try:
+            if item[0] != 0:
+                name = item[0]
+            if item[1] != 0:
+                theDef = '    ' + (item[1] % name)
+            if item[2] != 0:
+                theImp = item[2] % ('wxStyledTextCtrl::'+name, number) + '\n}'
+            if item[3] != 0:
+                docs = item[3]
+        except:
+            print "*************", name
+            raise
 
     return name, theDef, theImp, docs
 
@@ -662,7 +672,7 @@ def makeArgString(param):
     typ, name = param
 
     if typ == 'string':
-        return '(long)(const char*)%s.mb_str(wxConvUTF8)' % name
+        return '(long)(const char*)wx2stc(%s)' % name
     if typ == 'colour':
         return 'wxColourAsLong(%s)' % name