From: John L. <jr...@us...> - 2007-06-18 02:56:59
|
Update of /cvsroot/wxlua/wxLua/bindings/wxstc In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv7428/wxLua/bindings/wxstc Modified Files: stc.i wxstc_datatypes.lua Log Message: Add more classes from wxWidgets 2.8 Index: stc.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxstc/stc.i,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** stc.i 11 Jun 2007 03:57:58 -0000 1.12 --- stc.i 18 Jun 2007 02:56:23 -0000 1.13 *************** *** 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 --- 341,346 ---- // These are deprecated, STC_LEX_HTML should be used instead. ! !%wxchkver_2_8 %define wxSTC_LEX_ASP ! !%wxchkver_2_8 %define wxSTC_LEX_PHP // When a lexer specifies its language as SCLEX_AUTOMATIC it receives a *************** *** 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 --- 825,865 ---- // Lexical states for SCLEX_SCRIPTOL ! !%wxchkver_2_6 %define wxSTC_SCRIPTOL_DEFAULT ! !%wxchkver_2_6 %define wxSTC_SCRIPTOL_COMMENT ! !%wxchkver_2_6 %define wxSTC_SCRIPTOL_COMMENTLINE ! !%wxchkver_2_6 %define wxSTC_SCRIPTOL_COMMENTDOC ! !%wxchkver_2_6 %define wxSTC_SCRIPTOL_NUMBER ! !%wxchkver_2_6 %define wxSTC_SCRIPTOL_WORD ! !%wxchkver_2_6 %define wxSTC_SCRIPTOL_STRING ! !%wxchkver_2_6 %define wxSTC_SCRIPTOL_CHARACTER ! !%wxchkver_2_6 %define wxSTC_SCRIPTOL_UUID ! !%wxchkver_2_6 %define wxSTC_SCRIPTOL_PREPROCESSOR ! !%wxchkver_2_6 %define wxSTC_SCRIPTOL_OPERATOR ! !%wxchkver_2_6 %define wxSTC_SCRIPTOL_IDENTIFIER ! !%wxchkver_2_6 %define wxSTC_SCRIPTOL_STRINGEOL ! !%wxchkver_2_6 %define wxSTC_SCRIPTOL_VERBATIM ! !%wxchkver_2_6 %define wxSTC_SCRIPTOL_REGEX ! !%wxchkver_2_6 %define wxSTC_SCRIPTOL_COMMENTLINEDOC ! !%wxchkver_2_6 %define wxSTC_SCRIPTOL_WORD2 ! !%wxchkver_2_6 %define wxSTC_SCRIPTOL_COMMENTDOCKEYWORD ! !%wxchkver_2_6 %define wxSTC_SCRIPTOL_COMMENTDOCKEYWORDERROR ! !%wxchkver_2_6 %define wxSTC_SCRIPTOL_COMMENTBASIC ! %wxchkver_2_6 %define wxSTC_SCRIPTOL_DEFAULT ! %wxchkver_2_6 %define wxSTC_SCRIPTOL_WHITE ! %wxchkver_2_6 %define wxSTC_SCRIPTOL_COMMENTLINE ! %wxchkver_2_6 %define wxSTC_SCRIPTOL_PERSISTENT ! %wxchkver_2_6 %define wxSTC_SCRIPTOL_CSTYLE ! %wxchkver_2_6 %define wxSTC_SCRIPTOL_COMMENTBLOCK ! %wxchkver_2_6 %define wxSTC_SCRIPTOL_NUMBER ! %wxchkver_2_6 %define wxSTC_SCRIPTOL_STRING ! %wxchkver_2_6 %define wxSTC_SCRIPTOL_CHARACTER ! %wxchkver_2_6 %define wxSTC_SCRIPTOL_STRINGEOL ! %wxchkver_2_6 %define wxSTC_SCRIPTOL_KEYWORD ! %wxchkver_2_6 %define wxSTC_SCRIPTOL_OPERATOR ! %wxchkver_2_6 %define wxSTC_SCRIPTOL_IDENTIFIER ! %wxchkver_2_6 %define wxSTC_SCRIPTOL_TRIPLE ! %wxchkver_2_6 %define wxSTC_SCRIPTOL_CLASSNAME ! %wxchkver_2_6 %define wxSTC_SCRIPTOL_PREPROCESSOR // Lexical states for SCLEX_ASM *************** *** 2020,2029 **** // 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). --- 2020,2029 ---- // Get the colour of the background of the line containing the caret. ! !%wxchkver_2_8 wxColour GetCaretLineBack(); ! %wxchkver_2_8 wxColour GetCaretLineBackground(); // Set the colour of the background of the line containing the caret. ! !%wxchkver_2_8 void SetCaretLineBack(const wxColour& back); ! %wxchkver_2_8 void SetCaretLineBackground(const wxColour& back); // Set a style to be changeable or not (read only). *************** *** 3214,3218 **** %define_event wxEVT_STC_MARGINCLICK // EVT_STC_MARGINCLICK(id, fn) %define_event wxEVT_STC_NEEDSHOWN // EVT_STC_NEEDSHOWN(id, fn) ! !%wxchkver_2_5 %define_event wxEVT_STC_POSCHANGED // ?? %define_event wxEVT_STC_PAINTED // EVT_STC_PAINTED(id, fn) %define_event wxEVT_STC_USERLISTSELECTION // EVT_STC_USERLISTSELECTION(id, fn) --- 3214,3218 ---- %define_event wxEVT_STC_MARGINCLICK // EVT_STC_MARGINCLICK(id, fn) %define_event wxEVT_STC_NEEDSHOWN // EVT_STC_NEEDSHOWN(id, fn) ! !%wxchkver_2_6 %define_event wxEVT_STC_POSCHANGED // ?? %define_event wxEVT_STC_PAINTED // EVT_STC_PAINTED(id, fn) %define_event wxEVT_STC_USERLISTSELECTION // EVT_STC_USERLISTSELECTION(id, fn) Index: wxstc_datatypes.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxstc/wxstc_datatypes.lua,v retrieving revision 1.59 retrieving revision 1.60 diff -C2 -d -r1.59 -r1.60 *** wxstc_datatypes.lua 17 Jun 2007 18:36:06 -0000 1.59 --- wxstc_datatypes.lua 18 Jun 2007 02:56:23 -0000 1.60 *************** *** 238,241 **** --- 238,261 ---- Name = "wxAlignment", }, + wxAnimation = { + BaseClass = "wxGDIObject", + Condition = "wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL && wxchkver_2_8", + DefType = "class", + IsNumber = false, + Name = "wxAnimation", + }, + wxAnimationCtrl = { + BaseClass = "wxControl", + Condition = "wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL && wxchkver_2_8", + DefType = "class", + IsNumber = false, + Name = "wxAnimationCtrl", + }, + wxAnimationType = { + Condition = "wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL && wxchkver_2_8", + DefType = "enum", + IsNumber = true, + Name = "wxAnimationType", + }, wxApp = { BaseClass = "wxEvtHandler", *************** *** 245,248 **** --- 265,273 ---- Name = "wxApp", }, + wxArchitecture = { + DefType = "enum", + IsNumber = true, + Name = "wxArchitecture", + }, wxArrayInt = { Condition = "wxLUA_USE_wxArrayInt", *************** *** 299,302 **** --- 324,332 ---- Name = "wxBackgroundStyle", }, + wxBatteryState = { + DefType = "enum", + IsNumber = true, + Name = "wxBatteryState", + }, wxBestHelpController = { BaseClass = "wxHelpControllerBase", *************** *** 320,323 **** --- 350,360 ---- Name = "wxBitmapButton", }, + wxBitmapComboBox = { + BaseClass = "wxControlWithItems", + Condition = "wxLUA_USE_wxBitmapComboBox && wxUSE_BITMAPCOMBOBOX", + DefType = "class", + IsNumber = false, + Name = "wxBitmapComboBox", + }, wxBitmapDataObject = { BaseClass = "wxDataObjectSimple", *************** *** 568,571 **** --- 605,622 ---- Name = "wxCloseEvent", }, + wxCollapsiblePane = { + BaseClass = "wxControl", + Condition = "wxchkver_2_8 && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE", + DefType = "class", + IsNumber = false, + Name = "wxCollapsiblePane", + }, + wxCollapsiblePaneEvent = { + BaseClass = "wxCommandEvent", + Condition = "wxchkver_2_8 && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE", + DefType = "class", + IsNumber = false, + Name = "wxCollapsiblePaneEvent", + }, wxColour = { BaseClass = "wxGDIObject", *************** *** 677,680 **** --- 728,737 ---- Name = "wxContextHelpButton", }, + wxContextMenuEvent = { + BaseClass = "wxCommandEvent", + DefType = "class", + IsNumber = false, + Name = "wxContextMenuEvent", + }, wxControl = { BaseClass = "wxWindow", *************** *** 916,919 **** --- 973,990 ---- Name = "wxDocChildFrame", }, + wxDocMDIChildFrame = { + BaseClass = "wxMDIChildFrame", + Condition = "wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE", + DefType = "class", + IsNumber = false, + Name = "wxDocMDIChildFrame", + }, + wxDocMDIParentFrame = { + BaseClass = "wxMDIParentFrame", + Condition = "wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE", + DefType = "class", + IsNumber = false, + Name = "wxDocMDIParentFrame", + }, wxDocManager = { BaseClass = "wxEvtHandler", *************** *** 999,1002 **** --- 1070,1078 ---- Name = "wxEffects", }, + wxEndianness = { + DefType = "enum", + IsNumber = true, + Name = "wxEndianness", + }, wxEraseEvent = { BaseClass = "wxEvent", *************** *** 1143,1146 **** --- 1219,1240 ---- Name = "wxFilePickerCtrl", }, + wxFileType = { + DefType = "class", + Encapsulate = true, + IsNumber = false, + Name = "wxFileType", + }, + ["wxFileType::MessageParameters"] = { + DefType = "class", + Encapsulate = true, + IsNumber = false, + Name = "wxFileType::MessageParameters", + }, + wxFileTypeInfo = { + DefType = "class", + Encapsulate = true, + IsNumber = false, + Name = "wxFileTypeInfo", + }, wxFindDialogEvent = { BaseClass = "wxCommandEvent", *************** *** 1736,1740 **** }, wxHtmlWindowInterface = { ! Condition = "(wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML && wxUSE_HTML)", DefType = "class", IsNumber = false, --- 1830,1834 ---- }, wxHtmlWindowInterface = { ! Condition = "(wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxHTML && wxUSE_HTML)", DefType = "class", IsNumber = false, *************** *** 1742,1746 **** }, ["wxHtmlWindowInterface::HTMLCursor"] = { ! Condition = "(wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML && wxUSE_HTML)", DefType = "enum", IsNumber = true, --- 1836,1840 ---- }, ["wxHtmlWindowInterface::HTMLCursor"] = { ! Condition = "(wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxHTML && wxUSE_HTML)", DefType = "enum", IsNumber = true, *************** *** 2302,2305 **** --- 2396,2405 ---- Name = "wxMetafileDC", }, + wxMimeTypesManager = { + DefType = "class", + Encapsulate = true, + IsNumber = false, + Name = "wxMimeTypesManager", + }, wxMiniFrame = { BaseClass = "wxFrame", *************** *** 2336,2340 **** }, wxMouseState = { ! Condition = "wxCHECK_VERSION(2,7,0)", DefType = "class", Encapsulate = true, --- 2436,2440 ---- }, wxMouseState = { ! Condition = "wxCHECK_VERSION(2,8,0)", DefType = "class", Encapsulate = true, *************** *** 2395,2399 **** wxNotebookSizer = { BaseClass = "wxSizer", ! Condition = "(wxUSE_NOTEBOOK && (!wxCHECK_VERSION(2,5,0))) && (wxLUA_USE_wxSizer)", DefType = "class", IsNumber = false, --- 2495,2499 ---- wxNotebookSizer = { BaseClass = "wxSizer", ! Condition = "(wxUSE_NOTEBOOK && (!wxCHECK_VERSION(2,6,0))) && (wxLUA_USE_wxSizer)", DefType = "class", IsNumber = false, *************** *** 2418,2421 **** --- 2518,2526 ---- Name = "wxObjectRefData", }, + wxOperatingSystemId = { + DefType = "enum", + IsNumber = true, + Name = "wxOperatingSystemId", + }, wxOrientation = { DefType = "enum", *************** *** 2556,2559 **** --- 2661,2670 ---- Name = "wxPickerBase", }, + wxPlatformInfo = { + DefType = "class", + Encapsulate = true, + IsNumber = false, + Name = "wxPlatformInfo", + }, wxPoint = { Condition = "wxLUA_USE_wxPointSizeRect", *************** *** 2577,2580 **** --- 2688,2696 ---- Name = "wxPoint2DInt", }, + wxPortId = { + DefType = "enum", + IsNumber = true, + Name = "wxPortId", + }, wxPostScriptDC = { BaseClass = "wxDC", *************** *** 2584,2587 **** --- 2700,2715 ---- Name = "wxPostScriptDC", }, + wxPowerEvent = { + BaseClass = "wxEvent", + Condition = "wxHAS_POWER_EVENTS", + DefType = "class", + IsNumber = false, + Name = "wxPowerEvent", + }, + wxPowerType = { + DefType = "enum", + IsNumber = true, + Name = "wxPowerType", + }, wxPreviewCanvas = { BaseClass = "wxWindow", *************** *** 2606,2610 **** }, wxPrintBin = { ! Condition = "(wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_wxPrint && wxUSE_PRINTING_ARCHITECTURE)", DefType = "enum", IsNumber = true, --- 2734,2738 ---- }, wxPrintBin = { ! Condition = "(wxCHECK_VERSION(2,6,0)) && (wxLUA_USE_wxPrint && wxUSE_PRINTING_ARCHITECTURE)", DefType = "enum", IsNumber = true, *************** *** 2724,2727 **** --- 2852,2862 ---- Name = "wxProtocolError", }, + wxQuantize = { + BaseClass = "wxObject", + Condition = "wxLUA_USE_wxImage && wxUSE_IMAGE", + DefType = "class", + IsNumber = false, + Name = "wxQuantize", + }, wxQueryLayoutInfoEvent = { BaseClass = "wxEvent", *************** *** 2905,2909 **** wxSimpleHtmlListBox = { BaseClass = "wxHtmlWindowInterface", ! Condition = "(wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML && wxUSE_HTML)", DefType = "class", IsNumber = false, --- 3040,3044 ---- wxSimpleHtmlListBox = { BaseClass = "wxHtmlWindowInterface", ! Condition = "(wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxHTML && wxUSE_HTML)", DefType = "class", IsNumber = false, *************** *** 3383,3387 **** wxToolBarSimple = { BaseClass = "wxToolBarBase", ! Condition = "(!wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_wxToolbar)", DefType = "class", IsNumber = false, --- 3518,3522 ---- wxToolBarSimple = { BaseClass = "wxToolBarBase", ! Condition = "(!wxCHECK_VERSION(2,6,0)) && (wxLUA_USE_wxToolbar)", DefType = "class", IsNumber = false, *************** *** 3585,3589 **** wxWave = { BaseClass = "wxObject", ! Condition = "(defined(__WXMSW__) && !wxCHECK_VERSION(2,5,0) && wxUSE_WAVE) && (wxLUA_USE_wxWave)", DefType = "class", IsNumber = false, --- 3720,3724 ---- wxWave = { BaseClass = "wxObject", ! Condition = "(defined(__WXMSW__) && !wxCHECK_VERSION(2,6,0) && wxUSE_WAVE) && (wxLUA_USE_wxWave)", DefType = "class", IsNumber = false, *************** *** 3773,3781 **** ["%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_6_4"] = "wxCHECK_VERSION(2,6,4)", - ["%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)", ["%wxchkver_2_8_1"] = "wxCHECK_VERSION(2,8,1)", --- 3908,3913 ---- *************** *** 3788,3791 **** --- 3920,3925 ---- WXWIN_COMPATIBILITY_2_6 = "(defined(WXWIN_COMPATIBILITY_2_6) && WXWIN_COMPATIBILITY_2_6)", WXWIN_COMPATIBILITY_2_8 = "(defined(WXWIN_COMPATIBILITY_2_8) && WXWIN_COMPATIBILITY_2_8)", + wxHAS_POWER_EVENTS = "wxHAS_POWER_EVENTS", + wxLUA_USE_Animation = "wxLUA_USE_Animation", wxLUA_USE_FL = "wxLUA_USE_FL", wxLUA_USE_Geometry = "wxLUA_USE_Geometry", *************** *** 3799,3802 **** --- 3933,3937 ---- wxLUA_USE_wxBitmap = "wxLUA_USE_wxBitmap", wxLUA_USE_wxBitmapButton = "wxLUA_USE_wxBitmapButton", + wxLUA_USE_wxBitmapComboBox = "wxLUA_USE_wxBitmapComboBox", wxLUA_USE_wxBrushList = "wxLUA_USE_wxBrushList", wxLUA_USE_wxBusyCursor = "wxLUA_USE_wxBusyCursor", *************** *** 3810,3813 **** --- 3945,3949 ---- wxLUA_USE_wxClassInfo = "wxLUA_USE_wxClassInfo", wxLUA_USE_wxClipboard = "wxLUA_USE_wxClipboard", + wxLUA_USE_wxCollapsiblePane = "wxLUA_USE_wxCollapsiblePane", wxLUA_USE_wxColourDialog = "wxLUA_USE_wxColourDialog", wxLUA_USE_wxColourPenBrush = "wxLUA_USE_wxColourPenBrush", *************** *** 3923,3927 **** --- 4059,4065 ---- wxUSE_ACCESSIBILITY = "wxUSE_ACCESSIBILITY", wxUSE_AFM_FOR_POSTSCRIPT = "wxUSE_AFM_FOR_POSTSCRIPT", + wxUSE_ANIMATIONCTRL = "wxUSE_ANIMATIONCTRL", wxUSE_APPLE_IEEE = "wxUSE_APPLE_IEEE", + wxUSE_BITMAPCOMBOBOX = "wxUSE_BITMAPCOMBOBOX", wxUSE_BMPBUTTON = "wxUSE_BMPBUTTON", wxUSE_BOOKCTRL = "wxUSE_BOOKCTRL", *************** *** 3938,3941 **** --- 4076,4080 ---- wxUSE_CLIPBOARD = "wxUSE_CLIPBOARD", wxUSE_CMDLINE_PARSER = "wxUSE_CMDLINE_PARSER", + wxUSE_COLLPANE = "wxUSE_COLLPANE", wxUSE_COLOURDLG = "wxUSE_COLOURDLG", wxUSE_COLOURPICKERCTRL = "wxUSE_COLOURPICKERCTRL", |