X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/017ddee0cbf48438fefc0e3d698400eef863b865..dea54670b3589e472f8fbeb7dfcad382469f23c5:/src/stc/gen_iface.py diff --git a/src/stc/gen_iface.py b/src/stc/gen_iface.py index 37fc6911cc..805514e134 100755 --- a/src/stc/gen_iface.py +++ b/src/stc/gen_iface.py @@ -52,6 +52,8 @@ cmdValues = [ 2011, (2426, 2442), (2450, 2455), 2518, + (2619, 2621), + (2628, 2629) ] @@ -88,8 +90,8 @@ methodOverrideMap = { 'void %s(const wxString& text);', '''void %s(const wxString& text) { - wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(text); - SendMsg(%s, buf.length(), (sptr_t)(const char*)buf);''', + const wxWX2MBbuf buf = wx2stc(text); + SendMsg(%s, wx2stclen(text, buf), (sptr_t)(const char*)buf);''', 0), 'AddStyledText' : (0, @@ -103,8 +105,8 @@ methodOverrideMap = { 'void %s(const wxString& text);', '''void %s(const wxString& text) { - wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(text); - SendMsg(%s, buf.length(), (sptr_t)(const char*)buf);''', + const wxWX2MBbuf buf = wx2stc(text); + SendMsg(%s, wx2stclen(text, buf), (sptr_t)(const char*)buf);''', 0), 'GetViewWS' : ( 'GetViewWhiteSpace', 0, 0, 0), @@ -180,6 +182,7 @@ methodOverrideMap = { 'MarkerSetFore' : ('MarkerSetForeground', 0, 0, 0), 'MarkerSetBack' : ('MarkerSetBackground', 0, 0, 0), + 'MarkerSetBackSelected' : ('MarkerSetBackgroundSelected', 0,0,0), 'MarkerSymbolDefined' : ('GetMarkerSymbolDefined', 0, 0, 0), @@ -231,7 +234,9 @@ methodOverrideMap = { '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;', @@ -355,6 +360,8 @@ methodOverrideMap = { '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), @@ -394,6 +401,8 @@ methodOverrideMap = { '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, @@ -439,7 +448,7 @@ methodOverrideMap = { 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; return SendMsg(%s, flags, (sptr_t)&ft);''', @@ -509,11 +518,7 @@ methodOverrideMap = { 'wxString %s();', '''wxString %s() { - long start; - long 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); @@ -596,8 +601,8 @@ methodOverrideMap = { ''' int %s(const wxString& text) { - wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(text); - return SendMsg(%s, buf.length(), (sptr_t)(const char*)buf);''', + const wxWX2MBbuf buf = wx2stc(text); + return SendMsg(%s, wx2stclen(text, buf), (sptr_t)(const char*)buf);''', 0), 'ReplaceTargetRE' : @@ -606,8 +611,8 @@ methodOverrideMap = { ''' int %s(const wxString& text) { - wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(text); - return SendMsg(%s, buf.length(), (sptr_t)(const char*)buf);''', + const wxWX2MBbuf buf = wx2stc(text); + return SendMsg(%s, wx2stclen(text, buf), (sptr_t)(const char*)buf);''', 0), 'SearchInTarget' : @@ -616,8 +621,8 @@ methodOverrideMap = { ''' int %s(const wxString& text) { - wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(text); - return SendMsg(%s, buf.length(), (sptr_t)(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 @@ -733,12 +738,181 @@ methodOverrideMap = { 'SetSelection' : (None, 0, 0, 0), 'GetCharacterPointer' : (0, - 'const char* %s();', - 'const char* %s() {\n' + '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), } @@ -785,7 +959,7 @@ def processIface(iface, h_tmplt, cpp_tmplt, h_dest, cpp_dest, docstr_dest): 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 ': @@ -798,7 +972,7 @@ def processIface(iface, h_tmplt, cpp_tmplt, h_dest, cpp_dest, docstr_dest): pass else: - print '***** Unknown line type: ', line + print('***** Unknown line type: %s' % line) # process templates @@ -825,7 +999,7 @@ def processIface(iface, h_tmplt, cpp_tmplt, h_dest, cpp_dest, docstr_dest): def joinWithNewLines(values): - return string.join(values, '\n') + return '\n'.join(values) #---------------------------------------------------------------------------- @@ -905,7 +1079,7 @@ def processMethods(methods): def checkMethodOverride(name, number, docs): theDef = theImp = None - if methodOverrideMap.has_key(name): + if name in methodOverrideMap: item = methodOverrideMap[name] try: @@ -918,7 +1092,7 @@ def checkMethodOverride(name, number, docs): if item[3] != 0: docs = item[3] except: - print "*************", name + print("************* " + name) raise return name, theDef, theImp, docs @@ -958,7 +1132,7 @@ def makeParamString(param1, param2): #---------------------------------------------------------------------------- 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: @@ -981,16 +1155,16 @@ funregex = re.compile(r'\s*([a-zA-Z0-9_]+)' # return type def parseFun(line, methods, docs, values, is_const): def parseParam(param): - param = string.strip(param) + param = param.strip() if param == '': param = None else: - param = tuple(string.split(param)) + param = tuple(param.split()) 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() @@ -998,10 +1172,10 @@ def parseFun(line, methods, docs, values, is_const): 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: - 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. @@ -1019,7 +1193,7 @@ 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.' + print('Please run this script from src/stc subdirectory.') sys.exit(1) # Now just do it