From: John L. <jr...@us...> - 2007-03-09 00:15:46
|
Update of /cvsroot/wxlua/wxLua/bindings/wxstc In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv32506/wxLua/bindings/wxstc Modified Files: stc.i wxstc_datatypes.lua Log Message: update to 2.8 using C++ header files Index: stc.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxstc/stc.i,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** stc.i 11 Oct 2006 03:24:01 -0000 1.7 --- stc.i 9 Mar 2007 00:15:11 -0000 1.8 *************** *** 341,346 **** // These are deprecated, STC_LEX_HTML should be used instead. ! !%wxchkver27 %define wxSTC_LEX_ASP ! !%wxchkver27 %define wxSTC_LEX_PHP // When a lexer specifies its language as SCLEX_AUTOMATIC it receives a --- 341,346 ---- // These are deprecated, STC_LEX_HTML should be used instead. ! !%wxchkver_2_7 %define wxSTC_LEX_ASP ! !%wxchkver_2_7 %define wxSTC_LEX_PHP // When a lexer specifies its language as SCLEX_AUTOMATIC it receives a *************** *** 825,865 **** // Lexical states for SCLEX_SCRIPTOL ! !%wxchkver25 %define wxSTC_SCRIPTOL_DEFAULT ! !%wxchkver25 %define wxSTC_SCRIPTOL_COMMENT ! !%wxchkver25 %define wxSTC_SCRIPTOL_COMMENTLINE ! !%wxchkver25 %define wxSTC_SCRIPTOL_COMMENTDOC ! !%wxchkver25 %define wxSTC_SCRIPTOL_NUMBER ! !%wxchkver25 %define wxSTC_SCRIPTOL_WORD ! !%wxchkver25 %define wxSTC_SCRIPTOL_STRING ! !%wxchkver25 %define wxSTC_SCRIPTOL_CHARACTER ! !%wxchkver25 %define wxSTC_SCRIPTOL_UUID ! !%wxchkver25 %define wxSTC_SCRIPTOL_PREPROCESSOR ! !%wxchkver25 %define wxSTC_SCRIPTOL_OPERATOR ! !%wxchkver25 %define wxSTC_SCRIPTOL_IDENTIFIER ! !%wxchkver25 %define wxSTC_SCRIPTOL_STRINGEOL ! !%wxchkver25 %define wxSTC_SCRIPTOL_VERBATIM ! !%wxchkver25 %define wxSTC_SCRIPTOL_REGEX ! !%wxchkver25 %define wxSTC_SCRIPTOL_COMMENTLINEDOC ! !%wxchkver25 %define wxSTC_SCRIPTOL_WORD2 ! !%wxchkver25 %define wxSTC_SCRIPTOL_COMMENTDOCKEYWORD ! !%wxchkver25 %define wxSTC_SCRIPTOL_COMMENTDOCKEYWORDERROR ! !%wxchkver25 %define wxSTC_SCRIPTOL_COMMENTBASIC ! %wxchkver25 %define wxSTC_SCRIPTOL_DEFAULT ! %wxchkver25 %define wxSTC_SCRIPTOL_WHITE ! %wxchkver25 %define wxSTC_SCRIPTOL_COMMENTLINE ! %wxchkver25 %define wxSTC_SCRIPTOL_PERSISTENT ! %wxchkver25 %define wxSTC_SCRIPTOL_CSTYLE ! %wxchkver25 %define wxSTC_SCRIPTOL_COMMENTBLOCK ! %wxchkver25 %define wxSTC_SCRIPTOL_NUMBER ! %wxchkver25 %define wxSTC_SCRIPTOL_STRING ! %wxchkver25 %define wxSTC_SCRIPTOL_CHARACTER ! %wxchkver25 %define wxSTC_SCRIPTOL_STRINGEOL ! %wxchkver25 %define wxSTC_SCRIPTOL_KEYWORD ! %wxchkver25 %define wxSTC_SCRIPTOL_OPERATOR ! %wxchkver25 %define wxSTC_SCRIPTOL_IDENTIFIER ! %wxchkver25 %define wxSTC_SCRIPTOL_TRIPLE ! %wxchkver25 %define wxSTC_SCRIPTOL_CLASSNAME ! %wxchkver25 %define wxSTC_SCRIPTOL_PREPROCESSOR // Lexical states for SCLEX_ASM --- 825,865 ---- // Lexical states for SCLEX_SCRIPTOL ! !%wxchkver_2_5 %define wxSTC_SCRIPTOL_DEFAULT ! !%wxchkver_2_5 %define wxSTC_SCRIPTOL_COMMENT ! !%wxchkver_2_5 %define wxSTC_SCRIPTOL_COMMENTLINE ! !%wxchkver_2_5 %define wxSTC_SCRIPTOL_COMMENTDOC ! !%wxchkver_2_5 %define wxSTC_SCRIPTOL_NUMBER ! !%wxchkver_2_5 %define wxSTC_SCRIPTOL_WORD ! !%wxchkver_2_5 %define wxSTC_SCRIPTOL_STRING ! !%wxchkver_2_5 %define wxSTC_SCRIPTOL_CHARACTER ! !%wxchkver_2_5 %define wxSTC_SCRIPTOL_UUID ! !%wxchkver_2_5 %define wxSTC_SCRIPTOL_PREPROCESSOR ! !%wxchkver_2_5 %define wxSTC_SCRIPTOL_OPERATOR ! !%wxchkver_2_5 %define wxSTC_SCRIPTOL_IDENTIFIER ! !%wxchkver_2_5 %define wxSTC_SCRIPTOL_STRINGEOL ! !%wxchkver_2_5 %define wxSTC_SCRIPTOL_VERBATIM ! !%wxchkver_2_5 %define wxSTC_SCRIPTOL_REGEX ! !%wxchkver_2_5 %define wxSTC_SCRIPTOL_COMMENTLINEDOC ! !%wxchkver_2_5 %define wxSTC_SCRIPTOL_WORD2 ! !%wxchkver_2_5 %define wxSTC_SCRIPTOL_COMMENTDOCKEYWORD ! !%wxchkver_2_5 %define wxSTC_SCRIPTOL_COMMENTDOCKEYWORDERROR ! !%wxchkver_2_5 %define wxSTC_SCRIPTOL_COMMENTBASIC ! %wxchkver_2_5 %define wxSTC_SCRIPTOL_DEFAULT ! %wxchkver_2_5 %define wxSTC_SCRIPTOL_WHITE ! %wxchkver_2_5 %define wxSTC_SCRIPTOL_COMMENTLINE ! %wxchkver_2_5 %define wxSTC_SCRIPTOL_PERSISTENT ! %wxchkver_2_5 %define wxSTC_SCRIPTOL_CSTYLE ! %wxchkver_2_5 %define wxSTC_SCRIPTOL_COMMENTBLOCK ! %wxchkver_2_5 %define wxSTC_SCRIPTOL_NUMBER ! %wxchkver_2_5 %define wxSTC_SCRIPTOL_STRING ! %wxchkver_2_5 %define wxSTC_SCRIPTOL_CHARACTER ! %wxchkver_2_5 %define wxSTC_SCRIPTOL_STRINGEOL ! %wxchkver_2_5 %define wxSTC_SCRIPTOL_KEYWORD ! %wxchkver_2_5 %define wxSTC_SCRIPTOL_OPERATOR ! %wxchkver_2_5 %define wxSTC_SCRIPTOL_IDENTIFIER ! %wxchkver_2_5 %define wxSTC_SCRIPTOL_TRIPLE ! %wxchkver_2_5 %define wxSTC_SCRIPTOL_CLASSNAME ! %wxchkver_2_5 %define wxSTC_SCRIPTOL_PREPROCESSOR // Lexical states for SCLEX_ASM *************** *** 2017,2026 **** // Get the colour of the background of the line containing the caret. ! !%wxchkver271 wxColour GetCaretLineBack(); ! %wxchkver271 wxColour GetCaretLineBackground(); // Set the colour of the background of the line containing the caret. ! !%wxchkver271 void SetCaretLineBack(const wxColour& back); ! %wxchkver271 void SetCaretLineBackground(const wxColour& back); // Set a style to be changeable or not (read only). --- 2017,2026 ---- // Get the colour of the background of the line containing the caret. ! !%wxchkver_2_7_1 wxColour GetCaretLineBack(); ! %wxchkver_2_7_1 wxColour GetCaretLineBackground(); // Set the colour of the background of the line containing the caret. ! !%wxchkver_2_7_1 void SetCaretLineBack(const wxColour& back); ! %wxchkver_2_7_1 void SetCaretLineBackground(const wxColour& back); // Set a style to be changeable or not (read only). *************** *** 3204,3209 **** %property=MaxLineState, read %property=CaretLineVisible, read, write ! !%wxchkver271 %property=CaretLineBack, read, write ! %wxchkver271 %property=CaretLineBackground, read, write %property=Indent, read, write %property=UseTabs, read, write --- 3204,3209 ---- %property=MaxLineState, read %property=CaretLineVisible, read, write ! !%wxchkver_2_7_1 %property=CaretLineBack, read, write ! %wxchkver_2_7_1 %property=CaretLineBackground, read, write %property=Indent, read, write %property=UseTabs, read, write *************** *** 3274,3278 **** %define %event wxEVT_STC_MARGINCLICK %define %event wxEVT_STC_NEEDSHOWN ! !%wxchkver25 %define %event wxEVT_STC_POSCHANGED %define %event wxEVT_STC_PAINTED %define %event wxEVT_STC_USERLISTSELECTION --- 3274,3278 ---- %define %event wxEVT_STC_MARGINCLICK %define %event wxEVT_STC_NEEDSHOWN ! !%wxchkver_2_5 %define %event wxEVT_STC_POSCHANGED %define %event wxEVT_STC_PAINTED %define %event wxEVT_STC_USERLISTSELECTION Index: wxstc_datatypes.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxstc/wxstc_datatypes.lua,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -d -r1.45 -r1.46 *** wxstc_datatypes.lua 2 Mar 2007 05:44:21 -0000 1.45 --- wxstc_datatypes.lua 9 Mar 2007 00:15:11 -0000 1.46 *************** *** 385,388 **** --- 385,394 ---- Name = "wxBusyCursor", }, + wxBusyCursorSuspender = { + Condition = "wxLUA_USE_wxBusyCursor", + DefType = "class", + IsNumber = false, + Name = "wxBusyCursorSuspender", + }, wxBusyInfo = { BaseClass = "wxObject", *************** *** 456,459 **** --- 462,471 ---- Name = "wxCaret", }, + wxCaretSuspend = { + Condition = "wxLUA_USE_wxCaret && wxUSE_CARET", + DefType = "class", + IsNumber = false, + Name = "wxCaretSuspend", + }, wxChar = { DefType = "number", *************** *** 481,484 **** --- 493,502 ---- Name = "wxCheckListBox", }, + wxChildFocusEvent = { + BaseClass = "wxCommandEvent", + DefType = "class", + IsNumber = false, + Name = "wxChildFocusEvent", + }, wxChoice = { BaseClass = "wxControlWithItems", *************** *** 533,536 **** --- 551,561 ---- Name = "wxClipboard", }, + wxClipboardTextEvent = { + BaseClass = "wxCommandEvent", + Condition = "(wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxClipboard && wxUSE_CLIPBOARD)", + DefType = "class", + IsNumber = false, + Name = "wxClipboardTextEvent", + }, wxCloseEvent = { BaseClass = "wxEvent", *************** *** 612,615 **** --- 637,660 ---- Name = "wxConfigBase::EntryType", }, + wxConfigPathChanger = { + Condition = "wxLUA_USE_wxConfig && wxUSE_CONFIG", + DefType = "class", + IsNumber = false, + Name = "wxConfigPathChanger", + }, + wxContextHelp = { + BaseClass = "wxObject", + Condition = "wxLUA_USE_wxHelpController && wxUSE_HELP", + DefType = "class", + IsNumber = false, + Name = "wxContextHelp", + }, + wxContextHelpButton = { + BaseClass = "wxBitmapButton", + Condition = "(wxLUA_USE_wxBitmapButton && wxUSE_BMPBUTTON) && (wxLUA_USE_wxHelpController && wxUSE_HELP)", + DefType = "class", + IsNumber = false, + Name = "wxContextHelpButton", + }, wxControl = { BaseClass = "wxWindow", *************** *** 818,821 **** --- 863,872 ---- Name = "wxDisplay", }, + wxDisplayChangedEvent = { + BaseClass = "wxEvent", + DefType = "class", + IsNumber = false, + Name = "wxDisplayChangedEvent", + }, wxDocChildFrame = { BaseClass = "wxFrame", *************** *** 901,904 **** --- 952,961 ---- Name = "wxEdge", }, + wxEffects = { + BaseClass = "wxObject", + DefType = "class", + IsNumber = false, + Name = "wxEffects", + }, wxEraseEvent = { BaseClass = "wxEvent", *************** *** 1465,1468 **** --- 1522,1532 ---- Name = "wxHelpController", }, + wxHelpControllerHelpProvider = { + BaseClass = "wxSimpleHelpProvider", + Condition = "wxLUA_USE_wxHelpController && wxUSE_HELP", + DefType = "class", + IsNumber = false, + Name = "wxHelpControllerHelpProvider", + }, wxHelpEvent = { BaseClass = "wxCommandEvent", *************** *** 1471,1474 **** --- 1535,1550 ---- Name = "wxHelpEvent", }, + ["wxHelpEvent::Origin"] = { + Condition = "wxCHECK_VERSION(2,8,0)", + DefType = "enum", + IsNumber = true, + Name = "wxHelpEvent::Origin", + }, + wxHelpProvider = { + Condition = "wxLUA_USE_wxHelpController && wxUSE_HELP", + DefType = "class", + IsNumber = false, + Name = "wxHelpProvider", + }, wxHelpSearchMode = { Condition = "wxLUA_USE_wxHelpController && wxUSE_HELP", *************** *** 2044,2047 **** --- 2120,2130 ---- Name = "wxMouseCaptureChangedEvent", }, + wxMouseCaptureLostEvent = { + BaseClass = "wxEvent", + Condition = "wxCHECK_VERSION(2,8,0)", + DefType = "class", + IsNumber = false, + Name = "wxMouseCaptureLostEvent", + }, wxMouseEvent = { BaseClass = "wxEvent", *************** *** 2069,2072 **** --- 2152,2166 ---- Name = "wxMultiChoiceDialog", }, + wxNavigationKeyEvent = { + BaseClass = "wxEvent", + DefType = "class", + IsNumber = false, + Name = "wxNavigationKeyEvent", + }, + ["wxNavigationKeyEvent::dummy"] = { + DefType = "enum", + IsNumber = true, + Name = "wxNavigationKeyEvent::dummy", + }, wxNode = { Condition = "wxLUA_USE_wxList", *************** *** 2187,2190 **** --- 2281,2290 ---- Name = "wxPalette", }, + wxPaletteChangedEvent = { + BaseClass = "wxEvent", + DefType = "class", + IsNumber = false, + Name = "wxPaletteChangedEvent", + }, wxPanel = { BaseClass = "wxWindow", *************** *** 2391,2394 **** --- 2491,2500 ---- Name = "wxQueryLayoutInfoEvent", }, + wxQueryNewPaletteEvent = { + BaseClass = "wxEvent", + DefType = "class", + IsNumber = false, + Name = "wxQueryNewPaletteEvent", + }, wxRadioBox = { BaseClass = "wxControl", *************** *** 2533,2536 **** --- 2639,2648 ---- Name = "wxSetCursorEvent", }, + wxShowEvent = { + BaseClass = "wxEvent", + DefType = "class", + IsNumber = false, + Name = "wxShowEvent", + }, wxSignal = { Condition = "wxLUA_USE_wxProcess", *************** *** 2539,2542 **** --- 2651,2661 ---- Name = "wxSignal", }, + wxSimpleHelpProvider = { + BaseClass = "wxHelpProvider", + Condition = "wxLUA_USE_wxHelpController && wxUSE_HELP", + DefType = "class", + IsNumber = false, + Name = "wxSimpleHelpProvider", + }, wxSingleChoiceDialog = { BaseClass = "wxDialog", *************** *** 2644,2647 **** --- 2763,2773 ---- Name = "wxSocketType", }, + wxSortedArrayString = { + BaseClass = "wxArrayString", + Condition = "wxLUA_USE_wxArrayString", + DefType = "class", + IsNumber = false, + Name = "wxSortedArrayString", + }, wxSound = { BaseClass = "wxObject", *************** *** 3082,3085 **** --- 3208,3218 ---- Name = "wxURL", }, + wxURLDataObject = { + BaseClass = "wxTextDataObject", + Condition = "(wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxDataObject && wxUSE_DATAOBJ)", + DefType = "class", + IsNumber = false, + Name = "wxURLDataObject", + }, wxURLError = { Condition = "(wxUSE_URL) && (wxLUA_USE_wxSocket && wxUSE_SOCKETS)", *************** *** 3341,3364 **** ["%win"] = "defined(__WXMSW__)", ["%wince"] = "defined(__WXWINCE__)", ! ["%wxchkver22"] = "wxCHECK_VERSION(2,2,0)", ! ["%wxchkver23"] = "wxCHECK_VERSION(2,3,0)", ! ["%wxchkver24"] = "wxCHECK_VERSION(2,4,0)", ! ["%wxchkver25"] = "wxCHECK_VERSION(2,5,0)", ! ["%wxchkver26"] = "wxCHECK_VERSION(2,6,0)", ! ["%wxchkver261"] = "wxCHECK_VERSION(2,6,1)", ! ["%wxchkver262"] = "wxCHECK_VERSION(2,6,2)", ! ["%wxchkver263"] = "wxCHECK_VERSION(2,6,2)", ! ["%wxchkver264"] = "wxCHECK_VERSION(2,6,4)", ! ["%wxchkver265"] = "wxCHECK_VERSION(2,6,5)", ! ["%wxchkver27"] = "wxCHECK_VERSION(2,7,0)", ! ["%wxchkver271"] = "wxCHECK_VERSION(2,7,1)", ! ["%wxchkver272"] = "wxCHECK_VERSION(2,7,2)", ! ["%wxchkver28"] = "wxCHECK_VERSION(2,8,0)", ["%wxchkver_2_8"] = "wxCHECK_VERSION(2,8,0)", ! ["%wxcompat20"] = "(defined(WXWIN_COMPATIBILITY_2) && WXWIN_COMPATIBILITY_2)", ! ["%wxcompat22"] = "(defined(WXWIN_COMPATIBILITY_2_2) && WXWIN_COMPATIBILITY_2_2)", ! ["%wxcompat24"] = "(defined(WXWIN_COMPATIBILITY_2_4) && WXWIN_COMPATIBILITY_2_4)", ! ["%wxcompat26"] = "(defined(WXWIN_COMPATIBILITY_2_6) && WXWIN_COMPATIBILITY_2_6)", ! ["%wxcompat28"] = "(defined(WXWIN_COMPATIBILITY_2_8) && WXWIN_COMPATIBILITY_2_8)", ["%x11"] = "defined(__WXX11__)", WXWIN_COMPATIBILITY_2 = "(defined(WXWIN_COMPATIBILITY_2) && WXWIN_COMPATIBILITY_2)", --- 3474,3485 ---- ["%win"] = "defined(__WXMSW__)", ["%wince"] = "defined(__WXWINCE__)", ! ["%wxchkver_2_4"] = "wxCHECK_VERSION(2,4,0)", ! ["%wxchkver_2_5"] = "wxCHECK_VERSION(2,5,0)", ! ["%wxchkver_2_6"] = "wxCHECK_VERSION(2,6,0)", ! ["%wxchkver_2_7"] = "wxCHECK_VERSION(2,7,0)", ! ["%wxchkver_2_7_1"] = "wxCHECK_VERSION(2,7,1)", ["%wxchkver_2_8"] = "wxCHECK_VERSION(2,8,0)", ! ["%wxcompat_2_4"] = "(defined(WXWIN_COMPATIBILITY_2_4) && WXWIN_COMPATIBILITY_2_4)", ! ["%wxcompat_2_6"] = "(defined(WXWIN_COMPATIBILITY_2_6) && WXWIN_COMPATIBILITY_2_6)", ["%x11"] = "defined(__WXX11__)", WXWIN_COMPATIBILITY_2 = "(defined(WXWIN_COMPATIBILITY_2) && WXWIN_COMPATIBILITY_2)", |