#----------------------------------------------------------------------------
-import sys, string, re
+import sys, string, re, os
from fileinput import FileInput
-IFACE = './scintilla/include/Scintilla.iface'
-H_TEMPLATE = './stc.h.in'
-CPP_TEMPLATE = './stc.cpp.in'
-H_DEST = '../../include/wx/stc/stc.h'
-CPP_DEST = './stc.cpp'
+IFACE = os.path.abspath('./scintilla/include/Scintilla.iface')
+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')
# Value prefixes to convert
]
# 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),
+ 2404,
+ (2413, 2416),
+ (2426, 2442),
+ (2450, 2454),
+ ]
# 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),
- 'GetStyledText' : (0,
- 'wxString %s(int startPos, int endPos);',
-
- '''wxString %s(int startPos, int endPos) {
- wxString text;
- int len = endPos - startPos;
- TextRange tr;
- tr.lpstrText = text.GetWriteBuf(len*2+1);
- tr.chrg.cpMin = startPos;
- tr.chrg.cpMax = endPos;
- SendMsg(%s, 0, (long)&tr);
- text.UngetWriteBuf(len*2);
- return text;''',
-
- ('Retrieve a buffer of cells.',)),
-
-
- 'PositionFromPoint' : (0,
- 'int %s(wxPoint pt);',
-
- '''int %s(wxPoint pt) {
- return SendMsg(%s, pt.x, pt.y);''',
-
- 0),
-
- 'GetCurLine' : (0,
- 'wxString %s(int* OUTPUT=NULL);',
-
- '''wxString %s(int* linePos) {
- wxString text;
- int len = LineLength(GetCurrentLine());
- char* buf = text.GetWriteBuf(len+1);
-
- int pos = SendMsg(%s, len, (long)buf);
- text.UngetWriteBuf();
- if (linePos) *linePos = pos;
-
- return text;''',
-
- 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);',
+
+ '''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 buf;
+ TextRange tr;
+ tr.lpstrText = (char*)buf.GetWriteBuf(len*2+1);
+ tr.chrg.cpMin = startPos;
+ tr.chrg.cpMax = endPos;
+ len = SendMsg(%s, 0, (long)&tr);
+ buf.UngetWriteBuf(len);
+ return buf;''',
+
+ ('Retrieve a buffer of cells.',)),
+
+
+ 'PositionFromPoint' :
+ (0,
+ 'int %s(wxPoint pt);',
+
+ '''int %s(wxPoint pt) {
+ return SendMsg(%s, pt.x, pt.y);''',
+ 0),
+
+ 'GetCurLine' :
+ (0,
+ '#ifdef SWIG\n wxString %s(int* OUTPUT);\n#else\n wxString GetCurLine(int* linePos=NULL);\n#endif',
+
+ '''wxString %s(int* linePos) {
+ int len = LineLength(GetCurrentLine());
+ if (!len) {
+ if (linePos) *linePos = 0;
+ return wxEmptyString;
+ }
+
+ wxMemoryBuffer mbuf(len+1);
+ char* buf = (char*)mbuf.GetWriteBuf(len+1);
+
+ int pos = SendMsg(%s, len+1, (long)buf);
+ mbuf.UngetWriteBuf(len);
+ mbuf.AppendByte(0);
+ if (linePos) *linePos = pos;
+ return stc2wx(buf);''',
+
+ 0),
'SetUsePalette' : (None, 0,0,0),
'MarkerSetFore' : ('MarkerSetForeground', 0, 0, 0),
'MarkerSetBack' : ('MarkerSetBackground', 0, 0, 0),
- 'MarkerDefine' : (0,
- '''void %s(int markerNumber, int markerSymbol,
- const wxColour& foreground = wxNullColour,
- const wxColour& background = wxNullColour);''',
-
- '''void %s(int markerNumber, int markerSymbol,
- const wxColour& foreground,
- const wxColour& background) {
+ 'MarkerDefine' :
+ (0,
+ '''void %s(int markerNumber, int markerSymbol,
+ const wxColour& foreground = wxNullColour,
+ const wxColour& background = wxNullColour);''',
+
+ '''void %s(int markerNumber, int markerSymbol,
+ const wxColour& foreground,
+ const wxColour& background) {
+
+ SendMsg(%s, markerNumber, markerSymbol);
+ if (foreground.Ok())
+ MarkerSetForeground(markerNumber, foreground);
+ if (background.Ok())
+ MarkerSetBackground(markerNumber, background);''',
+
+ ('Set the symbol used for a particular marker number,',
+ 'and optionally the fore and background colours.')),
+
+
+ 'MarkerDefinePixmap' :
+ ('MarkerDefineBitmap',
+ '''void %s(int markerNumber, const wxBitmap& bmp);''',
+ '''void %s(int markerNumber, const wxBitmap& bmp) {
+ // convert bmp to a xpm in a string
+ wxMemoryOutputStream strm;
+ wxImage img = bmp.ConvertToImage();
+ 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);
+ delete [] buff;
+ ''',
+ ('Define a marker from a bitmap',)),
- SendMsg(%s, markerNumber, markerSymbol);
- if (foreground.Ok())
- MarkerSetForeground(markerNumber, foreground);
- if (background.Ok())
- MarkerSetBackground(markerNumber, background);''',
-
- ('Set the symbol used for a particular marker number,',
- 'and optionally the for and background colours.')),
'SetMarginTypeN' : ('SetMarginType', 0, 0, 0),
'GetMarginTypeN' : ('GetMarginType', 0, 0, 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);',
-
- '''void %s(int key, int modifiers, int cmd) {
- SendMsg(%s, MAKELONG(key, modifiers), cmd);''',
+ 'AssignCmdKey' :
+ ('CmdKeyAssign',
+ 'void %s(int key, int modifiers, int cmd);',
- 0),
+ '''void %s(int key, int modifiers, int cmd) {
+ SendMsg(%s, MAKELONG(key, modifiers), cmd);''',
+ 0),
- 'ClearCmdKey' : ('CmdKeyClear',
- 'void %s(int key, int modifiers);',
- '''void %s(int key, int modifiers) {
- SendMsg(%s, MAKELONG(key, modifiers));''',
+ 'ClearCmdKey' :
+ ('CmdKeyClear',
+ 'void %s(int key, int modifiers);',
- 0),
+ '''void %s(int key, int modifiers) {
+ SendMsg(%s, MAKELONG(key, modifiers));''',
+ 0),
'ClearAllCmdKeys' : ('CmdKeyClearAll', 0, 0, 0),
- 'SetStylingEx' : ('SetStyleBytes',
- 'void %s(int length, char* styleBytes);',
+ 'SetStylingEx' :
+ ('SetStyleBytes',
+ 'void %s(int length, char* styleBytes);',
- '''void %s(int length, char* styleBytes) {
- SendMsg(%s, length, (long)styleBytes);''',
-
- 0),
+ '''void %s(int length, char* styleBytes) {
+ SendMsg(%s, length, (long)styleBytes);''',
+ 0),
'IndicSetStyle' : ('IndicatorSetStyle', 0, 0, 0),
'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),
'AutoCGetChooseSingle' : ('AutoCompGetChooseSingle', 0, 0, 0),
'AutoCSetIgnoreCase' : ('AutoCompSetIgnoreCase', 0, 0, 0),
'AutoCGetIgnoreCase' : ('AutoCompGetIgnoreCase', 0, 0, 0),
+ 'AutoCSetAutoHide' : ('AutoCompSetAutoHide', 0, 0, 0),
+ 'AutoCGetAutoHide' : ('AutoCompGetAutoHide', 0, 0, 0),
+ 'AutoCSetDropRestOfWord' : ('AutoCompSetDropRestOfWord', 0,0,0),
+ 'AutoCGetDropRestOfWord' : ('AutoCompGetDropRestOfWord', 0,0,0),
+ 'AutoCGetTypeSeparator' : ('AutoCompGetTypeSeparator', 0, 0, 0),
+ 'AutoCSetTypeSeparator' : ('AutoCompSetTypeSeparator', 0, 0, 0),
+ 'AutoCGetCurrent' : ('AutoCompGetCurrent', 0, 0, 0),
+
+ 'RegisterImage' :
+ (0,
+ '''void %s(int type, const wxBitmap& bmp);''',
+ '''void %s(int type, const wxBitmap& bmp) {
+ // convert bmp to a xpm in a string
+ wxMemoryOutputStream strm;
+ wxImage img = bmp.ConvertToImage();
+ 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);
+ delete [] buff;
+ ''',
+ ('Register an image for use in autocompletion lists.',)),
+
+
+ 'ClearRegisteredImages' : (0, 0, 0,
+ ('Clear all the registered images.',)),
+
'SetHScrollBar' : ('SetUseHorizontalScrollBar', 0, 0, 0),
'GetHScrollBar' : ('GetUseHorizontalScrollBar', 0, 0, 0),
+ 'SetVScrollBar' : ('SetUseVerticalScrollBar', 0, 0, 0),
+ 'GetVScrollBar' : ('GetUseVerticalScrollBar', 0, 0, 0),
+
'GetCaretFore' : ('GetCaretForeground', 0, 0, 0),
'GetUsePalette' : (None, 0, 0, 0),
- 'FindText' : (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) {
- 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();
-
- return SendMsg(%s, flags, (long)&ft);''',
- 0),
-
- 'FormatRange' : (0,
- '''int %s(bool doDraw,
- int startPos,
- int endPos,
- wxDC* draw,
- wxDC* target, // Why does it use two? Can they be the same?
- 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?
- wxRect renderRect,
- wxRect pageRect) {
- RangeToFormat fr;
-
- fr.hdc = draw;
- fr.hdcTarget = target;
- fr.rc.top = renderRect.GetTop();
- fr.rc.left = renderRect.GetLeft();
- fr.rc.right = renderRect.GetRight();
- fr.rc.bottom = renderRect.GetBottom();
- fr.rcPage.top = pageRect.GetTop();
- fr.rcPage.left = pageRect.GetLeft();
- fr.rcPage.right = pageRect.GetRight();
- fr.rcPage.bottom = pageRect.GetBottom();
- fr.chrg.cpMin = startPos;
- fr.chrg.cpMax = endPos;
-
- return SendMsg(%s, doDraw, (long)&fr);''',
- 0),
-
-
- 'GetLine' : (0,
- 'wxString %s(int line);',
-
- '''wxString %s(int line) {
- wxString text;
- int len = LineLength(line);
- char* buf = text.GetWriteBuf(len+1);
-
- int pos = SendMsg(%s, line, (long)buf);
- text.UngetWriteBuf();
-
- return text;''',
-
- ('Retrieve the contents of a line.',)),
+ 'FindText' :
+ (0,
+ '''int %s(int minPos, int maxPos, const wxString& text, int flags=0);''',
+
+ '''int %s(int minPos, int maxPos,
+ const wxString& text,
+ int flags) {
+ TextToFind ft;
+ ft.chrg.cpMin = minPos;
+ ft.chrg.cpMax = maxPos;
+ wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(text);
+ ft.lpstrText = (char*)(const char*)buf;
+
+ return SendMsg(%s, flags, (long)&ft);''',
+ 0),
+
+ 'FormatRange' :
+ (0,
+ '''int %s(bool doDraw,
+ int startPos,
+ int endPos,
+ wxDC* draw,
+ wxDC* target,
+ wxRect renderRect,
+ wxRect pageRect);''',
+ ''' int %s(bool doDraw,
+ int startPos,
+ int endPos,
+ wxDC* draw,
+ wxDC* target,
+ wxRect renderRect,
+ wxRect pageRect) {
+ RangeToFormat fr;
+
+ if (endPos < startPos) {
+ int temp = startPos;
+ startPos = endPos;
+ endPos = temp;
+ }
+ fr.hdc = draw;
+ fr.hdcTarget = target;
+ fr.rc.top = renderRect.GetTop();
+ fr.rc.left = renderRect.GetLeft();
+ fr.rc.right = renderRect.GetRight();
+ fr.rc.bottom = renderRect.GetBottom();
+ fr.rcPage.top = pageRect.GetTop();
+ fr.rcPage.left = pageRect.GetLeft();
+ fr.rcPage.right = pageRect.GetRight();
+ fr.rcPage.bottom = pageRect.GetBottom();
+ fr.chrg.cpMin = startPos;
+ fr.chrg.cpMax = endPos;
+
+ return SendMsg(%s, doDraw, (long)&fr);''',
+ 0),
+
+
+ 'GetLine' :
+ (0,
+ 'wxString %s(int line);',
+
+ '''wxString %s(int line) {
+ int len = LineLength(line);
+ if (!len) return wxEmptyString;
+
+ 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.',)),
'SetSel' : ('SetSelection', 0, 0, 0),
- 'GetSelText' : ('GetSelectedText',
- 'wxString %s();',
-
- '''wxString %s() {
- wxString text;
- int start;
- int end;
-
- GetSelection(&start, &end);
- int len = end - start;
- char* buff = text.GetWriteBuf(len+1);
-
- SendMsg(%s, 0, (long)buff);
- text.UngetWriteBuf();
- return text;''',
-
- ('Retrieve the selected text.',)),
-
- 'GetTextRange' : (0,
- 'wxString %s(int startPos, int endPos);',
- '''wxString %s(int startPos, int endPos) {
- wxString text;
- int len = endPos - startPos;
- char* buff = text.GetWriteBuf(len+1);
- TextRange tr;
- tr.lpstrText = buff;
- tr.chrg.cpMin = startPos;
- tr.chrg.cpMax = endPos;
-
- SendMsg(%s, 0, (long)&tr);
- text.UngetWriteBuf();
- return text;''',
-
- ('Retrieve a range of text.',)),
+ 'GetSelText' :
+ ('GetSelectedText',
+ 'wxString %s();',
+
+ '''wxString %s() {
+ int start;
+ int end;
+
+ GetSelection(&start, &end);
+ int len = end - start;
+ if (!len) return wxEmptyString;
+
+ wxMemoryBuffer mbuf(len+2);
+ 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.',)),
+
+
+ 'GetTextRange' :
+ (0,
+ 'wxString %s(int startPos, int endPos);',
+
+ '''wxString %s(int startPos, int endPos) {
+ if (endPos < startPos) {
+ int temp = startPos;
+ startPos = endPos;
+ endPos = temp;
+ }
+ int len = endPos - startPos;
+ if (!len) return wxEmptyString;
+ wxMemoryBuffer mbuf(len+1);
+ char* buf = (char*)mbuf.GetWriteBuf(len);
+ TextRange tr;
+ tr.lpstrText = buf;
+ tr.chrg.cpMin = startPos;
+ tr.chrg.cpMax = endPos;
+ SendMsg(%s, 0, (long)&tr);
+ mbuf.UngetWriteBuf(len);
+ mbuf.AppendByte(0);
+ return stc2wx(buf);''',
+
+ ('Retrieve a range of text.',)),
'PointXFromPosition' : (None, 0, 0, 0),
'PointYFromPosition' : (None, 0, 0, 0),
'ReplaceSel' : ('ReplaceSelection', 0, 0, 0),
'Null' : (None, 0, 0, 0),
- 'GetText' : (0,
- 'wxString %s();',
-
- '''wxString %s() {
- wxString text;
- int len = GetTextLength();
- char* buff = text.GetWriteBuf(len+1);
+ 'GetText' :
+ (0,
+ 'wxString %s();',
- SendMsg(%s, len, (long)buff);
- buff[len] = 0;
- text.UngetWriteBuf();
- return text;''',
+ '''wxString %s() {
+ 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.', )),
+ ('Retrieve all the text in the document.', )),
'GetDirectFunction' : (None, 0, 0, 0),
'GetDirectPointer' : (None, 0, 0, 0),
- 'CallTipPosStart' : ('CallTipPosAtStart', 0, 0, 0),
- 'CallTipSetHlt' : ('CallTipSetHighlight', 0, 0, 0),
- 'CallTipSetBack' : ('CallTipSetBackground', 0, 0, 0),
+ 'CallTipPosStart' : ('CallTipPosAtStart', 0, 0, 0),
+ 'CallTipSetHlt' : ('CallTipSetHighlight', 0, 0, 0),
+ 'CallTipSetBack' : ('CallTipSetBackground', 0, 0, 0),
+ 'CallTipSetFore' : ('CallTipSetForeground', 0, 0, 0),
+ 'CallTipSetForeHlt' : ('CallTipSetForegroundHighlight', 0, 0, 0),
+
+ 'SetHotspotActiveFore' : ('SetHotspotActiveForeground', 0, 0, 0),
+ 'SetHotspotActiveBack' : ('SetHotspotActiveBackground', 0, 0, 0),
+
+
+ 'ReplaceTarget' :
+ (0,
+ 'int %s(const wxString& text);',
+
+ '''
+ int %s(const wxString& text) {
+ wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(text);
+ return SendMsg(%s, strlen(buf), (long)(const char*)buf);''',
+ 0),
+
+ 'ReplaceTargetRE' :
+ (0,
+ 'int %s(const wxString& text);',
+
+ '''
+ int %s(const wxString& text) {
+ wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(text);
+ return SendMsg(%s, strlen(buf), (long)(const char*)buf);''',
+ 0),
+
+ 'SearchInTarget' :
+ (0,
+ 'int %s(const wxString& text);',
+
+ '''
+ int %s(const wxString& text) {
+ 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),
+
+ # Rename some that woudl otherwise hid the wxWindow methods
+ '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),
+
# 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),
-
-
- 'GetDocPointer' : (0,
- 'void* %s();',
- '''void* %s() {
- return (void*)SendMsg(%s);''',
- 0),
-
- 'SetDocPointer' : (0,
- 'void %s(void* docPointer);',
- '''void %s(void* docPointer) {
- SendMsg(%s, (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),
+ '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),
+ 'LineDownRectExtend' : (None, 0, 0, 0),
+ 'LineUpRectExtend' : (None, 0, 0, 0),
+ 'CharLeftRectExtend' : (None, 0, 0, 0),
+ 'CharRightRectExtend' : (None, 0, 0, 0),
+ 'HomeRectExtend' : (None, 0, 0, 0),
+ 'VCHomeRectExtend' : (None, 0, 0, 0),
+ 'LineEndRectExtend' : (None, 0, 0, 0),
+ 'PageUpRectExtend' : (None, 0, 0, 0),
+ 'PageDownRectExtend' : (None, 0, 0, 0),
+ 'StutteredPageUp' : (None, 0, 0, 0),
+ 'StutteredPageUpExtend' : (None, 0, 0, 0),
+ 'StutteredPageDown' : (None, 0, 0, 0),
+ 'StutteredPageDownExtend' : (None, 0, 0, 0),
+ 'WordLeftEnd' : (None, 0, 0, 0),
+ 'WordLeftEndExtend' : (None, 0, 0, 0),
+ 'WordRightEnd' : (None, 0, 0, 0),
+ 'WordRightEndExtend' : (None, 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