]
# Message function values that should have a CMD_ constant as well
-cmdValues = [ (2300, 2350), 2011, 2013, (2176, 2180) ]
+cmdValues = [ (2300, 2349),
+ 2011,
+ 2013,
+ (2176, 2180),
+ (2390, 2393),
+ (2395, 2396),
+ ]
# Map some generic typenames to wx types, using return value syntax
'void %s(const wxString& text);',
'''void %s(const wxString& text) {
- SendMsg(%s, text.Len(), (long)text.c_str());''',
+ wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(text);
+ SendMsg(%s, strlen(buf), (long)(const char*)buf);''',
0),
'AddStyledText' : (0,
- 'void %s(const wxString& text);',
+ 'void %s(const wxMemoryBuffer& data);',
- '''void %s(const wxString& text) {
- SendMsg(%s, text.Len(), (long)text.c_str());''',
+ '''void %s(const wxMemoryBuffer& data) {
+ SendMsg(%s, data.GetDataLen(), (long)data.GetData());''',
0),
'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,
- 'wxString %s(int startPos, int endPos);',
+ 'wxMemoryBuffer %s(int startPos, int endPos);',
- '''wxString %s(int startPos, int endPos) {
- wxString text;
+ '''wxMemoryBuffer %s(int startPos, int endPos) {
+ wxMemoryBuffer buf;
if (endPos < startPos) {
int temp = startPos;
startPos = endPos;
endPos = temp;
}
int len = endPos - startPos;
- if (!len) return "";
+ if (!len) return buf;
TextRange tr;
- tr.lpstrText = text.GetWriteBuf(len*2);
+ tr.lpstrText = (char*)buf.GetWriteBuf(len*2+1);
tr.chrg.cpMin = startPos;
tr.chrg.cpMax = endPos;
- SendMsg(%s, 0, (long)&tr);
- text.UngetWriteBuf(len*2);
- return text;''',
+ len = SendMsg(%s, 0, (long)&tr);
+ buf.UngetWriteBuf(len);
+ return buf;''',
('Retrieve a buffer of cells.',)),
'#ifdef SWIG\n wxString %s(int* OUTPUT);\n#else\n wxString GetCurLine(int* linePos=NULL);\n#endif',
'''wxString %s(int* linePos) {
- wxString text;
int len = LineLength(GetCurrentLine());
if (!len) {
if (linePos) *linePos = 0;
- return "";
+ return wxEmptyString;
}
- // Need an extra byte because SCI_GETCURLINE writes a null to the string
- char* buf = text.GetWriteBuf(len+1);
+
+ wxMemoryBuffer mbuf(len+1);
+ char* buf = (char*)mbuf.GetWriteBuf(len+1);
int pos = SendMsg(%s, len+1, (long)buf);
- text.UngetWriteBuf(len);
+ mbuf.UngetWriteBuf(len);
+ mbuf.AppendByte(0);
if (linePos) *linePos = pos;
-
- return text;''',
+ return stc2wx(buf);''',
0),
'SetCaretFore' : ('SetCaretForeground', 0, 0, 0),
'StyleSetFont' : ('StyleSetFaceName', 0, 0, 0),
- # need to fix this to map between wx and scintilla encoding flags, leave it out for now...
- 'StyleSetCharacterSet' : (None, 0, 0, 0),
-
'AssignCmdKey' : ('CmdKeyAssign',
'void %s(int key, int modifiers, int cmd);',
'IndicSetFore' : ('IndicatorSetForeground', 0, 0, 0),
'IndicGetFore' : ('IndicatorGetForeground', 0, 0, 0),
+ 'SetWhitespaceFore' : ('SetWhitespaceForeground', 0, 0, 0),
+ 'SetWhitespaceBack' : ('SetWhitespaceBackground', 0, 0, 0),
+
'AutoCShow' : ('AutoCompShow', 0, 0, 0),
'AutoCCancel' : ('AutoCompCancel', 0, 0, 0),
'AutoCActive' : ('AutoCompActive', 0, 0, 0),
'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*)text.c_str();
+ wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(text);
+ ft.lpstrText = (char*)(const char*)buf;
return SendMsg(%s, flags, (long)&ft);''',
0),
'wxString %s(int line);',
'''wxString %s(int line) {
- wxString text;
int len = LineLength(line);
- if (!len) return "";
- char* buf = text.GetWriteBuf(len);
+ if (!len) return wxEmptyString;
- int pos = SendMsg(%s, line, (long)buf);
- text.UngetWriteBuf(len);
-
- return text;''',
+ wxMemoryBuffer mbuf(len+1);
+ char* buf = (char*)mbuf.GetWriteBuf(len+1);
+ SendMsg(%s, line, (long)buf);
+ mbuf.UngetWriteBuf(len);
+ mbuf.AppendByte(0);
+ return stc2wx(buf);''',
('Retrieve the contents of a line.',)),
'wxString %s();',
'''wxString %s() {
- wxString text;
int start;
int end;
GetSelection(&start, &end);
int len = end - start;
- if (!len) return "";
- char* buff = text.GetWriteBuf(len);
+ if (!len) return wxEmptyString;
- SendMsg(%s, 0, (long)buff);
- text.UngetWriteBuf(len);
- return text;''',
+ wxMemoryBuffer mbuf(len+1);
+ char* buf = (char*)mbuf.GetWriteBuf(len+1);
+ SendMsg(%s, 0, (long)buf);
+ mbuf.UngetWriteBuf(len);
+ mbuf.AppendByte(0);
+ return stc2wx(buf);''',
('Retrieve the selected text.',)),
'wxString %s(int startPos, int endPos);',
'''wxString %s(int startPos, int endPos) {
- wxString text;
if (endPos < startPos) {
int temp = startPos;
startPos = endPos;
endPos = temp;
}
int len = endPos - startPos;
- if (!len) return "";
- char* buff = text.GetWriteBuf(len);
+ if (!len) return wxEmptyString;
+ wxMemoryBuffer mbuf(len+1);
+ char* buf = (char*)mbuf.GetWriteBuf(len);
TextRange tr;
- tr.lpstrText = buff;
+ tr.lpstrText = buf;
tr.chrg.cpMin = startPos;
tr.chrg.cpMax = endPos;
-
SendMsg(%s, 0, (long)&tr);
- text.UngetWriteBuf(len);
- return text;''',
+ mbuf.UngetWriteBuf(len);
+ mbuf.AppendByte(0);
+ return stc2wx(buf);''',
('Retrieve a range of text.',)),
'wxString %s();',
'''wxString %s() {
- wxString text;
- int len = GetTextLength();
- char* buff = text.GetWriteBuf(len+1); // leave room for the null...
-
- SendMsg(%s, len+1, (long)buff);
- text.UngetWriteBuf(len);
- return text;''',
+ 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);
+ mbuf.UngetWriteBuf(len);
+ mbuf.AppendByte(0);
+ return stc2wx(buf);''',
('Retrieve all the text in the document.', )),
'''
int %s(const wxString& text) {
- return SendMsg(%s, text.Len(), (long)text.c_str());
- ''',
-
+ wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(text);
+ return SendMsg(%s, strlen(buf), (long)(const char*)buf);''',
0),
'ReplaceTargetRE' : (0,
'''
int %s(const wxString& text) {
- return SendMsg(%s, text.Len(), (long)text.c_str());
- ''',
-
+ wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(text);
+ return SendMsg(%s, strlen(buf), (long)(const char*)buf);''',
0),
'SearchInTarget' : (0,
'''
int %s(const wxString& text) {
- return SendMsg(%s, text.Len(), (long)text.c_str());
- ''',
+ wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(text);
+ return SendMsg(%s, strlen(buf), (long)(const char*)buf);''',
+ 0),
+
+ 'GetDocPointer' : (0,
+ 'void* %s();',
+ '''void* %s() {
+ return (void*)SendMsg(%s);''',
0),
+ 'SetDocPointer' : (0,
+ 'void %s(void* docPointer);',
+ '''void %s(void* docPointer) {
+ SendMsg(%s, 0, (long)docPointer);''',
+ 0),
+
+ 'CreateDocument' : (0,
+ 'void* %s();',
+ '''void* %s() {
+ return (void*)SendMsg(%s);''',
+ 0),
+
+ 'AddRefDocument' : (0,
+ 'void %s(void* docPointer);',
+ '''void %s(void* docPointer) {
+ SendMsg(%s, 0, (long)docPointer);''',
+ 0),
+
+ 'ReleaseDocument' : (0,
+ 'void %s(void* docPointer);',
+ '''void %s(void* docPointer) {
+ SendMsg(%s, 0, (long)docPointer);''',
+ 0),
+ 'SetCodePage' : (0,
+ 0,
+ '''void %s(int codePage) {
+#if wxUSE_UNICODE
+ wxASSERT_MSG(codePage == wxSTC_CP_UTF8,
+ wxT("Only wxSTC_CP_UTF8 may be used when wxUSE_UNICODE is on."));
+#else
+ wxASSERT_MSG(codePage != wxSTC_CP_UTF8,
+ wxT("wxSTC_CP_UTF8 may not be used when wxUSE_UNICODE is off."));
+#endif
+ SendMsg(%s, codePage);''',
+ ("Set the code page used to interpret the bytes of the document as characters.",) ),
+
+
+ 'GrabFocus' : (None, 0, 0, 0),
+ 'SetFocus' : ('SetSTCFocus', 0, 0, 0),
+ 'GetFocus' : ('GetSTCFocus', 0, 0, 0),
+
# Remove all methods that are key commands since they can be
'UpperCase' : (None, 0, 0, 0),
'LineScrollDown' : (None, 0, 0, 0),
'LineScrollUp' : (None, 0, 0, 0),
+ 'DeleteBackNotLine' : (None, 0, 0, 0),
- 'GetDocPointer' : (0,
- 'void* %s();',
- '''void* %s() {
- return (void*)SendMsg(%s);''',
- 0),
-
- 'SetDocPointer' : (0,
- 'void %s(void* docPointer);',
- '''void %s(void* docPointer) {
- SendMsg(%s, 0, (long)docPointer);''',
- 0),
-
- 'CreateDocument' : (0,
- 'void* %s();',
- '''void* %s() {
- return (void*)SendMsg(%s);''',
- 0),
-
- 'AddRefDocument' : (0,
- 'void %s(void* docPointer);',
- '''void %s(void* docPointer) {
- SendMsg(%s, (long)docPointer);''',
- 0),
-
- 'ReleaseDocument' : (0,
- 'void %s(void* docPointer);',
- '''void %s(void* docPointer) {
- SendMsg(%s, (long)docPointer);''',
- 0),
-
- 'GrabFocus' : (None, 0, 0, 0),
- 'SetFocus' : ('SetSTCFocus', 0, 0, 0),
- 'GetFocus' : ('GetSTCFocus', 0, 0, 0),
'' : ('', 0, 0, 0),
curDocStrings = []
values = []
methods = []
+ cmds = []
# parse iface file
fi = FileInput(iface)
curDocStrings = []
elif op == 'fun ' or op == 'set ' or op == 'get ':
- parseFun(line[4:], methods, curDocStrings, values)
+ parseFun(line[4:], methods, curDocStrings, cmds)
curDocStrings = []
elif op == 'cat ':
elif op == 'evt ':
pass
+ elif op == 'enu ':
+ pass
+
+ elif op == 'lex ':
+ pass
+
else:
print '***** Unknown line type: ', line
# process templates
data = {}
data['VALUES'] = processVals(values)
+ data['CMDS'] = processVals(cmds)
defs, imps = processMethods(methods)
data['METHOD_DEFS'] = defs
data['METHOD_IMPS'] = imps
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
typ, name = param
if typ == 'string':
- return '(long)%s.c_str()' % name
+ return '(long)(const char*)wx2stc(%s)' % name
if typ == 'colour':
return 'wxColourAsLong(%s)' % name
param1 = parseParam(param1)
param2 = parseParam(param2)
- # Special case. For the key command functionss we want a value defined too
+ # Special case. For the key command functions we want a value defined too
num = string.atoi(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, ())
+ 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:
projects / wxWidgets.git / blobdiff