Menu
▾
▴
wxlua-commit
|
From: John L. <jr...@us...> - 2007-03-15 23:25:06
|
Update of /cvsroot/wxlua/wxLua/modules/wxbindstc/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv5608/wxLua/modules/wxbindstc/src Modified Files: stc.cpp wxstc_bind.cpp Log Message: simplified binding generator and write bindings out alphabetically use #elif statements to guarantee there is only one item with the same name Index: wxstc_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbindstc/src/wxstc_bind.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** wxstc_bind.cpp 26 Feb 2007 01:57:06 -0000 1.18 --- wxstc_bind.cpp 15 Mar 2007 23:24:58 -0000 1.19 *************** *** 28,35 **** static WXLUAEVENT eventList[] = { - #if !wxCHECK_VERSION(2,5,0) - { &wxEVT_STC_POSCHANGED, "wxEVT_STC_POSCHANGED", &s_wxluatag_wxStyledTextEvent }, - #endif // !wxCHECK_VERSION(2,5,0) - { &wxEVT_STC_AUTOCOMP_SELECTION, "wxEVT_STC_AUTOCOMP_SELECTION", &s_wxluatag_wxStyledTextEvent }, { &wxEVT_STC_CALLTIP_CLICK, "wxEVT_STC_CALLTIP_CLICK", &s_wxluatag_wxStyledTextEvent }, --- 28,31 ---- *************** *** 49,52 **** --- 45,53 ---- { &wxEVT_STC_NEEDSHOWN, "wxEVT_STC_NEEDSHOWN", &s_wxluatag_wxStyledTextEvent }, { &wxEVT_STC_PAINTED, "wxEVT_STC_PAINTED", &s_wxluatag_wxStyledTextEvent }, + + #if !wxCHECK_VERSION(2,5,0) + { &wxEVT_STC_POSCHANGED, "wxEVT_STC_POSCHANGED", &s_wxluatag_wxStyledTextEvent }, + #endif // !wxCHECK_VERSION(2,5,0) + { &wxEVT_STC_ROMODIFYATTEMPT, "wxEVT_STC_ROMODIFYATTEMPT", &s_wxluatag_wxStyledTextEvent }, { &wxEVT_STC_SAVEPOINTLEFT, "wxEVT_STC_SAVEPOINTLEFT", &s_wxluatag_wxStyledTextEvent }, *************** *** 66,70 **** // --------------------------------------------------------------------------- ! // wxLuaGetDefineList_wxstc() is called to register defines and enums // --------------------------------------------------------------------------- --- 67,71 ---- // --------------------------------------------------------------------------- ! // wxLuaGetDefineList_wxstc() is called to register %define and %enum // --------------------------------------------------------------------------- *************** *** 73,108 **** static WXLUADEFINE defineList[] = { - // ------------------------------------------------------------------- - // %define - // ------------------------------------------------------------------- - - #if !wxCHECK_VERSION(2,5,0) - { "wxSTC_SCRIPTOL_CHARACTER", wxSTC_SCRIPTOL_CHARACTER }, - { "wxSTC_SCRIPTOL_COMMENT", wxSTC_SCRIPTOL_COMMENT }, - { "wxSTC_SCRIPTOL_COMMENTBASIC", wxSTC_SCRIPTOL_COMMENTBASIC }, - { "wxSTC_SCRIPTOL_COMMENTDOC", wxSTC_SCRIPTOL_COMMENTDOC }, - { "wxSTC_SCRIPTOL_COMMENTDOCKEYWORD", wxSTC_SCRIPTOL_COMMENTDOCKEYWORD }, - { "wxSTC_SCRIPTOL_COMMENTDOCKEYWORDERROR", wxSTC_SCRIPTOL_COMMENTDOCKEYWORDERROR }, - { "wxSTC_SCRIPTOL_COMMENTLINE", wxSTC_SCRIPTOL_COMMENTLINE }, - { "wxSTC_SCRIPTOL_COMMENTLINEDOC", wxSTC_SCRIPTOL_COMMENTLINEDOC }, - { "wxSTC_SCRIPTOL_DEFAULT", wxSTC_SCRIPTOL_DEFAULT }, - { "wxSTC_SCRIPTOL_IDENTIFIER", wxSTC_SCRIPTOL_IDENTIFIER }, - { "wxSTC_SCRIPTOL_NUMBER", wxSTC_SCRIPTOL_NUMBER }, - { "wxSTC_SCRIPTOL_OPERATOR", wxSTC_SCRIPTOL_OPERATOR }, - { "wxSTC_SCRIPTOL_PREPROCESSOR", wxSTC_SCRIPTOL_PREPROCESSOR }, - { "wxSTC_SCRIPTOL_REGEX", wxSTC_SCRIPTOL_REGEX }, - { "wxSTC_SCRIPTOL_STRING", wxSTC_SCRIPTOL_STRING }, - { "wxSTC_SCRIPTOL_STRINGEOL", wxSTC_SCRIPTOL_STRINGEOL }, - { "wxSTC_SCRIPTOL_UUID", wxSTC_SCRIPTOL_UUID }, - { "wxSTC_SCRIPTOL_VERBATIM", wxSTC_SCRIPTOL_VERBATIM }, - { "wxSTC_SCRIPTOL_WORD", wxSTC_SCRIPTOL_WORD }, - { "wxSTC_SCRIPTOL_WORD2", wxSTC_SCRIPTOL_WORD2 }, - #endif // !wxCHECK_VERSION(2,5,0) - - #if !wxCHECK_VERSION(2,7,0) - { "wxSTC_LEX_ASP", wxSTC_LEX_ASP }, - { "wxSTC_LEX_PHP", wxSTC_LEX_PHP }, - #endif // !wxCHECK_VERSION(2,7,0) - { "wxSTC_ADA_CHARACTER", wxSTC_ADA_CHARACTER }, { "wxSTC_ADA_CHARACTEREOL", wxSTC_ADA_CHARACTEREOL }, --- 74,77 ---- *************** *** 772,775 **** --- 741,749 ---- { "wxSTC_LEX_ASM", wxSTC_LEX_ASM }, { "wxSTC_LEX_ASN1", wxSTC_LEX_ASN1 }, + + #if !wxCHECK_VERSION(2,7,0) + { "wxSTC_LEX_ASP", wxSTC_LEX_ASP }, + #endif // !wxCHECK_VERSION(2,7,0) + { "wxSTC_LEX_AU3", wxSTC_LEX_AU3 }, { "wxSTC_LEX_AUTOMATIC", wxSTC_LEX_AUTOMATIC }, *************** *** 820,823 **** --- 794,802 ---- { "wxSTC_LEX_PASCAL", wxSTC_LEX_PASCAL }, { "wxSTC_LEX_PERL", wxSTC_LEX_PERL }, + + #if !wxCHECK_VERSION(2,7,0) + { "wxSTC_LEX_PHP", wxSTC_LEX_PHP }, + #endif // !wxCHECK_VERSION(2,7,0) + { "wxSTC_LEX_PHPSCRIPT", wxSTC_LEX_PHPSCRIPT }, { "wxSTC_LEX_POV", wxSTC_LEX_POV }, *************** *** 1197,1200 **** --- 1176,1273 ---- { "wxSTC_SCMOD_NORM", wxSTC_SCMOD_NORM }, { "wxSTC_SCMOD_SHIFT", wxSTC_SCMOD_SHIFT }, + + #if wxCHECK_VERSION(2,5,0) + { "wxSTC_SCRIPTOL_CHARACTER", wxSTC_SCRIPTOL_CHARACTER }, + #elif !wxCHECK_VERSION(2,5,0) + { "wxSTC_SCRIPTOL_CHARACTER", wxSTC_SCRIPTOL_CHARACTER }, + #endif // !wxCHECK_VERSION(2,5,0) + #if wxCHECK_VERSION(2,5,0) + { "wxSTC_SCRIPTOL_CLASSNAME", wxSTC_SCRIPTOL_CLASSNAME }, + #endif // wxCHECK_VERSION(2,5,0) + + #if !wxCHECK_VERSION(2,5,0) + { "wxSTC_SCRIPTOL_COMMENT", wxSTC_SCRIPTOL_COMMENT }, + { "wxSTC_SCRIPTOL_COMMENTBASIC", wxSTC_SCRIPTOL_COMMENTBASIC }, + #endif // !wxCHECK_VERSION(2,5,0) + + #if wxCHECK_VERSION(2,5,0) + { "wxSTC_SCRIPTOL_COMMENTBLOCK", wxSTC_SCRIPTOL_COMMENTBLOCK }, + #endif // wxCHECK_VERSION(2,5,0) + + #if !wxCHECK_VERSION(2,5,0) + { "wxSTC_SCRIPTOL_COMMENTDOC", wxSTC_SCRIPTOL_COMMENTDOC }, + { "wxSTC_SCRIPTOL_COMMENTDOCKEYWORD", wxSTC_SCRIPTOL_COMMENTDOCKEYWORD }, + { "wxSTC_SCRIPTOL_COMMENTDOCKEYWORDERROR", wxSTC_SCRIPTOL_COMMENTDOCKEYWORDERROR }, + #endif // !wxCHECK_VERSION(2,5,0) + + #if wxCHECK_VERSION(2,5,0) + { "wxSTC_SCRIPTOL_COMMENTLINE", wxSTC_SCRIPTOL_COMMENTLINE }, + #elif !wxCHECK_VERSION(2,5,0) + { "wxSTC_SCRIPTOL_COMMENTLINE", wxSTC_SCRIPTOL_COMMENTLINE }, + #endif // !wxCHECK_VERSION(2,5,0) + #if !wxCHECK_VERSION(2,5,0) + { "wxSTC_SCRIPTOL_COMMENTLINEDOC", wxSTC_SCRIPTOL_COMMENTLINEDOC }, + #endif // !wxCHECK_VERSION(2,5,0) + + #if wxCHECK_VERSION(2,5,0) + { "wxSTC_SCRIPTOL_CSTYLE", wxSTC_SCRIPTOL_CSTYLE }, + { "wxSTC_SCRIPTOL_DEFAULT", wxSTC_SCRIPTOL_DEFAULT }, + #elif !wxCHECK_VERSION(2,5,0) + { "wxSTC_SCRIPTOL_DEFAULT", wxSTC_SCRIPTOL_DEFAULT }, + #endif // !wxCHECK_VERSION(2,5,0) + #if wxCHECK_VERSION(2,5,0) + { "wxSTC_SCRIPTOL_IDENTIFIER", wxSTC_SCRIPTOL_IDENTIFIER }, + #elif !wxCHECK_VERSION(2,5,0) + { "wxSTC_SCRIPTOL_IDENTIFIER", wxSTC_SCRIPTOL_IDENTIFIER }, + #endif // !wxCHECK_VERSION(2,5,0) + #if wxCHECK_VERSION(2,5,0) + { "wxSTC_SCRIPTOL_KEYWORD", wxSTC_SCRIPTOL_KEYWORD }, + { "wxSTC_SCRIPTOL_NUMBER", wxSTC_SCRIPTOL_NUMBER }, + #elif !wxCHECK_VERSION(2,5,0) + { "wxSTC_SCRIPTOL_NUMBER", wxSTC_SCRIPTOL_NUMBER }, + #endif // !wxCHECK_VERSION(2,5,0) + #if wxCHECK_VERSION(2,5,0) + { "wxSTC_SCRIPTOL_OPERATOR", wxSTC_SCRIPTOL_OPERATOR }, + #elif !wxCHECK_VERSION(2,5,0) + { "wxSTC_SCRIPTOL_OPERATOR", wxSTC_SCRIPTOL_OPERATOR }, + #endif // !wxCHECK_VERSION(2,5,0) + #if wxCHECK_VERSION(2,5,0) + { "wxSTC_SCRIPTOL_PERSISTENT", wxSTC_SCRIPTOL_PERSISTENT }, + { "wxSTC_SCRIPTOL_PREPROCESSOR", wxSTC_SCRIPTOL_PREPROCESSOR }, + #elif !wxCHECK_VERSION(2,5,0) + { "wxSTC_SCRIPTOL_PREPROCESSOR", wxSTC_SCRIPTOL_PREPROCESSOR }, + #endif // !wxCHECK_VERSION(2,5,0) + #if !wxCHECK_VERSION(2,5,0) + { "wxSTC_SCRIPTOL_REGEX", wxSTC_SCRIPTOL_REGEX }, + #endif // !wxCHECK_VERSION(2,5,0) + + #if wxCHECK_VERSION(2,5,0) + { "wxSTC_SCRIPTOL_STRING", wxSTC_SCRIPTOL_STRING }, + #elif !wxCHECK_VERSION(2,5,0) + { "wxSTC_SCRIPTOL_STRING", wxSTC_SCRIPTOL_STRING }, + #endif // !wxCHECK_VERSION(2,5,0) + #if wxCHECK_VERSION(2,5,0) + { "wxSTC_SCRIPTOL_STRINGEOL", wxSTC_SCRIPTOL_STRINGEOL }, + #elif !wxCHECK_VERSION(2,5,0) + { "wxSTC_SCRIPTOL_STRINGEOL", wxSTC_SCRIPTOL_STRINGEOL }, + #endif // !wxCHECK_VERSION(2,5,0) + #if wxCHECK_VERSION(2,5,0) + { "wxSTC_SCRIPTOL_TRIPLE", wxSTC_SCRIPTOL_TRIPLE }, + #endif // wxCHECK_VERSION(2,5,0) + + #if !wxCHECK_VERSION(2,5,0) + { "wxSTC_SCRIPTOL_UUID", wxSTC_SCRIPTOL_UUID }, + { "wxSTC_SCRIPTOL_VERBATIM", wxSTC_SCRIPTOL_VERBATIM }, + #endif // !wxCHECK_VERSION(2,5,0) + + #if wxCHECK_VERSION(2,5,0) + { "wxSTC_SCRIPTOL_WHITE", wxSTC_SCRIPTOL_WHITE }, + #endif // wxCHECK_VERSION(2,5,0) + + #if !wxCHECK_VERSION(2,5,0) + { "wxSTC_SCRIPTOL_WORD", wxSTC_SCRIPTOL_WORD }, + { "wxSTC_SCRIPTOL_WORD2", wxSTC_SCRIPTOL_WORD2 }, + #endif // !wxCHECK_VERSION(2,5,0) + { "wxSTC_SEL_LINES", wxSTC_SEL_LINES }, { "wxSTC_SEL_RECTANGLE", wxSTC_SEL_RECTANGLE }, *************** *** 1358,1384 **** { "wxSTC_YAML_TEXT", wxSTC_YAML_TEXT }, - #if wxCHECK_VERSION(2,5,0) - { "wxSTC_SCRIPTOL_CHARACTER", wxSTC_SCRIPTOL_CHARACTER }, - { "wxSTC_SCRIPTOL_CLASSNAME", wxSTC_SCRIPTOL_CLASSNAME }, - { "wxSTC_SCRIPTOL_COMMENTBLOCK", wxSTC_SCRIPTOL_COMMENTBLOCK }, - { "wxSTC_SCRIPTOL_COMMENTLINE", wxSTC_SCRIPTOL_COMMENTLINE }, - { "wxSTC_SCRIPTOL_CSTYLE", wxSTC_SCRIPTOL_CSTYLE }, - { "wxSTC_SCRIPTOL_DEFAULT", wxSTC_SCRIPTOL_DEFAULT }, - { "wxSTC_SCRIPTOL_IDENTIFIER", wxSTC_SCRIPTOL_IDENTIFIER }, - { "wxSTC_SCRIPTOL_KEYWORD", wxSTC_SCRIPTOL_KEYWORD }, - { "wxSTC_SCRIPTOL_NUMBER", wxSTC_SCRIPTOL_NUMBER }, - { "wxSTC_SCRIPTOL_OPERATOR", wxSTC_SCRIPTOL_OPERATOR }, - { "wxSTC_SCRIPTOL_PERSISTENT", wxSTC_SCRIPTOL_PERSISTENT }, - { "wxSTC_SCRIPTOL_PREPROCESSOR", wxSTC_SCRIPTOL_PREPROCESSOR }, - { "wxSTC_SCRIPTOL_STRING", wxSTC_SCRIPTOL_STRING }, - { "wxSTC_SCRIPTOL_STRINGEOL", wxSTC_SCRIPTOL_STRINGEOL }, - { "wxSTC_SCRIPTOL_TRIPLE", wxSTC_SCRIPTOL_TRIPLE }, - { "wxSTC_SCRIPTOL_WHITE", wxSTC_SCRIPTOL_WHITE }, - #endif // wxCHECK_VERSION(2,5,0) - - // ------------------------------------------------------------------- - // %enum - // ------------------------------------------------------------------- - { 0, 0 }, }; --- 1431,1434 ---- *************** *** 1389,1393 **** // --------------------------------------------------------------------------- ! // wxLuaGetStringList_wxstc() is called to register strings // --------------------------------------------------------------------------- --- 1439,1443 ---- // --------------------------------------------------------------------------- ! // wxLuaGetStringList_wxstc() is called to register %define %string // --------------------------------------------------------------------------- *************** *** 1396,1402 **** static WXLUASTRING stringList[] = { - // ------------------------------------------------------------------- - // %define %string - // ------------------------------------------------------------------- { 0, 0 }, --- 1446,1449 ---- *************** *** 1414,1417 **** --- 1461,1465 ---- static WXLUAOBJECT objectList[] = { + { 0, 0, 0, 0 }, }; *************** *** 1432,1435 **** --- 1480,1484 ---- static WXLUAMETHOD functionList[] = { + { LuaGlobal, 0, 0, 0, 0, s_wxluaargArray_None }, }; *************** *** 1450,1453 **** --- 1499,1503 ---- { "wxStyledTextCtrl", wxStyledTextCtrl_methods, wxStyledTextCtrl_methodCount, CLASSINFO(wxStyledTextCtrl), &s_wxluatag_wxStyledTextCtrl, "wxControl", NULL }, { "wxStyledTextEvent", wxStyledTextEvent_methods, wxStyledTextEvent_methodCount, CLASSINFO(wxStyledTextEvent), &s_wxluatag_wxStyledTextEvent, "wxCommandEvent", NULL }, + { 0, 0, 0, 0, 0, 0, 0 }, }; *************** *** 1459,1463 **** // --------------------------------------------------------------------------- ! // wxLuaGetClassList_wxstc() is called to register classes // --------------------------------------------------------------------------- --- 1509,1513 ---- // --------------------------------------------------------------------------- ! // wxLuaBinding_wxstc() - the binding class // --------------------------------------------------------------------------- Index: stc.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbindstc/src/stc.cpp,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** stc.cpp 15 Mar 2007 00:01:24 -0000 1.28 --- stc.cpp 15 Mar 2007 23:24:57 -0000 1.29 *************** *** 27,138 **** int s_wxluatag_wxStyledTextCtrl = -1; ! ! #if (wxCHECK_VERSION(2,7,1)) && (wxLUA_USE_wxColourPenBrush) ! // %wxchkver_2_7_1 wxColour GetCaretLineBackground(); ! static int LUACALL wxLua_wxStyledTextCtrl_GetCaretLineBackground(lua_State *L) ! { ! wxLuaState wxlState(L); ! wxColour *returns; ! // get this [...15879 lines suppressed...] + { LuaMethod, "SetMessage", wxLua_wxStyledTextEvent_SetMessage, 1, 1, s_wxluatagArray_wxLua_wxStyledTextEvent_SetMessage }, + { LuaMethod, "SetModificationType", wxLua_wxStyledTextEvent_SetModificationType, 1, 1, s_wxluatagArray_wxLua_wxStyledTextEvent_SetModificationType }, + { LuaMethod, "SetModifiers", wxLua_wxStyledTextEvent_SetModifiers, 1, 1, s_wxluatagArray_wxLua_wxStyledTextEvent_SetModifiers }, + { LuaMethod, "SetPosition", wxLua_wxStyledTextEvent_SetPosition, 1, 1, s_wxluatagArray_wxLua_wxStyledTextEvent_SetPosition }, + { LuaMethod, "SetText", wxLua_wxStyledTextEvent_SetText, 1, 1, s_wxluatagArray_wxLua_wxStyledTextEvent_SetText }, + { LuaMethod, "SetWParam", wxLua_wxStyledTextEvent_SetWParam, 1, 1, s_wxluatagArray_wxLua_wxStyledTextEvent_SetWParam }, + { LuaMethod, "SetX", wxLua_wxStyledTextEvent_SetX, 1, 1, s_wxluatagArray_wxLua_wxStyledTextEvent_SetX }, + { LuaMethod, "SetY", wxLua_wxStyledTextEvent_SetY, 1, 1, s_wxluatagArray_wxLua_wxStyledTextEvent_SetY }, + { LuaGetProp, "Shift", wxLua_wxStyledTextEvent_GetShift, 0, 0, s_wxluaargArray_None }, + { LuaGetProp, "Text", wxLua_wxStyledTextEvent_GetText, 0, 0, s_wxluaargArray_None }, + { LuaSetProp, "Text", wxLua_wxStyledTextEvent_SetText, 1, 1, s_wxluaargArray_None }, { LuaGetProp, "WParam", wxLua_wxStyledTextEvent_GetWParam, 0, 0, s_wxluaargArray_None }, { LuaSetProp, "WParam", wxLua_wxStyledTextEvent_SetWParam, 1, 1, s_wxluaargArray_None }, { LuaGetProp, "X", wxLua_wxStyledTextEvent_GetX, 0, 0, s_wxluaargArray_None }, { LuaSetProp, "X", wxLua_wxStyledTextEvent_SetX, 1, 1, s_wxluaargArray_None }, { LuaGetProp, "Y", wxLua_wxStyledTextEvent_GetY, 0, 0, s_wxluaargArray_None }, { LuaSetProp, "Y", wxLua_wxStyledTextEvent_SetY, 1, 1, s_wxluaargArray_None }, ! { LuaConstructor, "wxStyledTextEvent", wxLua_wxStyledTextEvent_constructor, 2, 0, s_wxluatagArray_wxLua_wxStyledTextEvent_constructor }, }; |
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X