From: John L. <jr...@us...> - 2007-02-26 01:57:46
|
Update of /cvsroot/wxlua/wxLua/apps/wxluacan/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv32575/wxLua/apps/wxluacan/src Modified Files: wxluacan.cpp wxluacan.h wxluacan_bind.cpp Log Message: Change WXLUACLASS to keep a pointer to the base class's WXLUACLASS not it's tag for faster lookup. cleanup of the headers, more comments Index: wxluacan.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/wxluacan.cpp,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** wxluacan.cpp 22 Feb 2007 00:01:33 -0000 1.20 --- wxluacan.cpp 26 Feb 2007 01:57:00 -0000 1.21 *************** *** 1,7 **** ! // ---------------------------------------------------------------------------- // This file was generated by genwxbind.lua // // Any changes made to this file may be lost when file is regenerated. ! // ---------------------------------------------------------------------------- #ifdef __BORLANDC__ --- 1,7 ---- ! // --------------------------------------------------------------------------- // This file was generated by genwxbind.lua // // Any changes made to this file may be lost when file is regenerated. ! // --------------------------------------------------------------------------- #ifdef __BORLANDC__ *************** *** 20,26 **** ! // ------------------------------------------------------------------------------------------------- // Bind class wxlCanObj ! // ------------------------------------------------------------------------------------------------- // Lua MetaTable Tag for Class 'wxlCanObj' --- 20,26 ---- ! // --------------------------------------------------------------------------- // Bind class wxlCanObj ! // --------------------------------------------------------------------------- // Lua MetaTable Tag for Class 'wxlCanObj' *************** *** 186,192 **** int wxlCanObj_methodCount = sizeof(wxlCanObj_methods)/sizeof(wxlCanObj_methods[0]); ! // ------------------------------------------------------------------------------------------------- // Bind class wxlCanObjRect ! // ------------------------------------------------------------------------------------------------- // Lua MetaTable Tag for Class 'wxlCanObjRect' --- 186,192 ---- int wxlCanObj_methodCount = sizeof(wxlCanObj_methods)/sizeof(wxlCanObj_methods[0]); ! // --------------------------------------------------------------------------- // Bind class wxlCanObjRect ! // --------------------------------------------------------------------------- // Lua MetaTable Tag for Class 'wxlCanObjRect' *************** *** 230,236 **** int wxlCanObjRect_methodCount = sizeof(wxlCanObjRect_methods)/sizeof(wxlCanObjRect_methods[0]); ! // ------------------------------------------------------------------------------------------------- // Bind class wxlCanObjCircle ! // ------------------------------------------------------------------------------------------------- // Lua MetaTable Tag for Class 'wxlCanObjCircle' --- 230,236 ---- int wxlCanObjRect_methodCount = sizeof(wxlCanObjRect_methods)/sizeof(wxlCanObjRect_methods[0]); ! // --------------------------------------------------------------------------- // Bind class wxlCanObjCircle ! // --------------------------------------------------------------------------- // Lua MetaTable Tag for Class 'wxlCanObjCircle' *************** *** 272,278 **** int wxlCanObjCircle_methodCount = sizeof(wxlCanObjCircle_methods)/sizeof(wxlCanObjCircle_methods[0]); ! // ------------------------------------------------------------------------------------------------- // Bind class wxlCanObjScript ! // ------------------------------------------------------------------------------------------------- // Lua MetaTable Tag for Class 'wxlCanObjScript' --- 272,278 ---- int wxlCanObjCircle_methodCount = sizeof(wxlCanObjCircle_methods)/sizeof(wxlCanObjCircle_methods[0]); ! // --------------------------------------------------------------------------- // Bind class wxlCanObjScript ! // --------------------------------------------------------------------------- // Lua MetaTable Tag for Class 'wxlCanObjScript' *************** *** 314,320 **** int wxlCanObjScript_methodCount = sizeof(wxlCanObjScript_methods)/sizeof(wxlCanObjScript_methods[0]); ! // ------------------------------------------------------------------------------------------------- // Bind class wxlCanObjAddScript ! // ------------------------------------------------------------------------------------------------- // Lua MetaTable Tag for Class 'wxlCanObjAddScript' --- 314,320 ---- int wxlCanObjScript_methodCount = sizeof(wxlCanObjScript_methods)/sizeof(wxlCanObjScript_methods[0]); ! // --------------------------------------------------------------------------- // Bind class wxlCanObjAddScript ! // --------------------------------------------------------------------------- // Lua MetaTable Tag for Class 'wxlCanObjAddScript' *************** *** 372,378 **** int wxlCanObjAddScript_methodCount = sizeof(wxlCanObjAddScript_methods)/sizeof(wxlCanObjAddScript_methods[0]); ! // ------------------------------------------------------------------------------------------------- // Bind class wxlCan ! // ------------------------------------------------------------------------------------------------- // Lua MetaTable Tag for Class 'wxlCan' --- 372,378 ---- int wxlCanObjAddScript_methodCount = sizeof(wxlCanObjAddScript_methods)/sizeof(wxlCanObjAddScript_methods[0]); ! // --------------------------------------------------------------------------- // Bind class wxlCan ! // --------------------------------------------------------------------------- // Lua MetaTable Tag for Class 'wxlCan' *************** *** 474,480 **** int wxlCan_methodCount = sizeof(wxlCan_methods)/sizeof(wxlCan_methods[0]); ! // ------------------------------------------------------------------------------------------------- // Bind class wxlLuaCanCmd ! // ------------------------------------------------------------------------------------------------- // Lua MetaTable Tag for Class 'wxlLuaCanCmd' --- 474,480 ---- int wxlCan_methodCount = sizeof(wxlCan_methods)/sizeof(wxlCan_methods[0]); ! // --------------------------------------------------------------------------- // Bind class wxlLuaCanCmd ! // --------------------------------------------------------------------------- // Lua MetaTable Tag for Class 'wxlLuaCanCmd' Index: wxluacan_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/wxluacan_bind.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** wxluacan_bind.cpp 7 Feb 2007 18:39:06 -0000 1.13 --- wxluacan_bind.cpp 26 Feb 2007 01:57:00 -0000 1.14 *************** *** 1,7 **** ! // ---------------------------------------------------------------------------- // This file was generated by genwxbind.lua // // Any changes made to this file may be lost when file is regenerated. ! // ---------------------------------------------------------------------------- #ifdef __BORLANDC__ --- 1,7 ---- ! // --------------------------------------------------------------------------- // This file was generated by genwxbind.lua // // Any changes made to this file may be lost when file is regenerated. ! // --------------------------------------------------------------------------- #ifdef __BORLANDC__ *************** *** 20,26 **** ! // ---------------------------------------------------------------------------- // wxLuaGetEventList_wxluacan() is called to register events ! // ---------------------------------------------------------------------------- WXLUAEVENT* wxLuaGetEventList_wxluacan(size_t &count) --- 20,26 ---- ! // --------------------------------------------------------------------------- // wxLuaGetEventList_wxluacan() is called to register events ! // --------------------------------------------------------------------------- WXLUAEVENT* wxLuaGetEventList_wxluacan(size_t &count) *************** *** 34,40 **** } ! // ---------------------------------------------------------------------------- // wxLuaGetDefineList_wxluacan() is called to register defines and enums ! // ---------------------------------------------------------------------------- WXLUADEFINE* wxLuaGetDefineList_wxluacan(size_t &count) --- 34,40 ---- } ! // --------------------------------------------------------------------------- // wxLuaGetDefineList_wxluacan() is called to register defines and enums ! // --------------------------------------------------------------------------- WXLUADEFINE* wxLuaGetDefineList_wxluacan(size_t &count) *************** *** 42,52 **** static WXLUADEFINE defineList[] = { ! // -------------------------------------------------------------------- // %define ! // -------------------------------------------------------------------- ! // -------------------------------------------------------------------- // %enum ! // -------------------------------------------------------------------- { 0, 0 }, --- 42,52 ---- static WXLUADEFINE defineList[] = { ! // ------------------------------------------------------------------- // %define ! // ------------------------------------------------------------------- ! // ------------------------------------------------------------------- // %enum ! // ------------------------------------------------------------------- { 0, 0 }, *************** *** 56,63 **** } ! // ---------------------------------------------------------------------------- // wxLuaGetStringList_wxluacan() is called to register strings ! // ---------------------------------------------------------------------------- WXLUASTRING* wxLuaGetStringList_wxluacan(size_t &count) --- 56,63 ---- } ! // --------------------------------------------------------------------------- // wxLuaGetStringList_wxluacan() is called to register strings ! // --------------------------------------------------------------------------- WXLUASTRING* wxLuaGetStringList_wxluacan(size_t &count) *************** *** 65,71 **** static WXLUASTRING stringList[] = { ! // -------------------------------------------------------------------- // %define %string ! // -------------------------------------------------------------------- { 0, 0 }, --- 65,71 ---- static WXLUASTRING stringList[] = { ! // ------------------------------------------------------------------- // %define %string ! // ------------------------------------------------------------------- { 0, 0 }, *************** *** 75,81 **** } ! // ---------------------------------------------------------------------------- // wxLuaGetObjectList_wxluacan() is called to register object and pointer bindings ! // ---------------------------------------------------------------------------- WXLUAOBJECT* wxLuaGetObjectList_wxluacan(size_t &count) --- 75,81 ---- } ! // --------------------------------------------------------------------------- // wxLuaGetObjectList_wxluacan() is called to register object and pointer bindings ! // --------------------------------------------------------------------------- WXLUAOBJECT* wxLuaGetObjectList_wxluacan(size_t &count) *************** *** 89,95 **** } ! // ---------------------------------------------------------------------------- // wxLuaGetFunctionList_wxluacan() is called to register global functions ! // ---------------------------------------------------------------------------- --- 89,95 ---- } ! // --------------------------------------------------------------------------- // wxLuaGetFunctionList_wxluacan() is called to register global functions ! // --------------------------------------------------------------------------- *************** *** 122,128 **** ! // ---------------------------------------------------------------------------- // wxLuaGetFunctionList_wxluacan() is called to register global functions ! // ---------------------------------------------------------------------------- WXLUAMETHOD* wxLuaGetFunctionList_wxluacan(size_t &count) --- 122,128 ---- ! // --------------------------------------------------------------------------- // wxLuaGetFunctionList_wxluacan() is called to register global functions ! // --------------------------------------------------------------------------- WXLUAMETHOD* wxLuaGetFunctionList_wxluacan(size_t &count) *************** *** 140,146 **** ! // ---------------------------------------------------------------------------- // wxLuaGetClassList_wxluacan() is called to register classes ! // ---------------------------------------------------------------------------- WXLUACLASS* wxLuaGetClassList_wxluacan(size_t &count) --- 140,146 ---- ! // --------------------------------------------------------------------------- // wxLuaGetClassList_wxluacan() is called to register classes ! // --------------------------------------------------------------------------- WXLUACLASS* wxLuaGetClassList_wxluacan(size_t &count) *************** *** 148,158 **** static WXLUACLASS classList[] = { ! { "wxlCan", wxlCan_methods, wxlCan_methodCount, -1, NULL, &s_wxluatag_wxlCan, "wxScrolledWindow" }, ! { "wxlCanObj", wxlCanObj_methods, wxlCanObj_methodCount, -1, NULL, &s_wxluatag_wxlCanObj, "wxObject" }, ! { "wxlCanObjAddScript", wxlCanObjAddScript_methods, wxlCanObjAddScript_methodCount, -1, NULL, &s_wxluatag_wxlCanObjAddScript, "wxlCanObj" }, ! { "wxlCanObjCircle", wxlCanObjCircle_methods, wxlCanObjCircle_methodCount, -1, NULL, &s_wxluatag_wxlCanObjCircle, "wxlCanObj" }, ! { "wxlCanObjRect", wxlCanObjRect_methods, wxlCanObjRect_methodCount, -1, NULL, &s_wxluatag_wxlCanObjRect, "wxlCanObj" }, ! { "wxlCanObjScript", wxlCanObjScript_methods, wxlCanObjScript_methodCount, -1, NULL, &s_wxluatag_wxlCanObjScript, "wxlCanObj" }, ! { "wxlLuaCanCmd", wxlLuaCanCmd_methods, wxlLuaCanCmd_methodCount, -1, NULL, &s_wxluatag_wxlLuaCanCmd, "wxCommandProcessor" }, { 0, 0, 0, 0, 0, 0, 0 }, }; --- 148,158 ---- static WXLUACLASS classList[] = { ! { "wxlCan", wxlCan_methods, wxlCan_methodCount, NULL, &s_wxluatag_wxlCan, "wxScrolledWindow", NULL }, ! { "wxlCanObj", wxlCanObj_methods, wxlCanObj_methodCount, NULL, &s_wxluatag_wxlCanObj, "wxObject", NULL }, ! { "wxlCanObjAddScript", wxlCanObjAddScript_methods, wxlCanObjAddScript_methodCount, NULL, &s_wxluatag_wxlCanObjAddScript, "wxlCanObj", NULL }, ! { "wxlCanObjCircle", wxlCanObjCircle_methods, wxlCanObjCircle_methodCount, NULL, &s_wxluatag_wxlCanObjCircle, "wxlCanObj", NULL }, ! { "wxlCanObjRect", wxlCanObjRect_methods, wxlCanObjRect_methodCount, NULL, &s_wxluatag_wxlCanObjRect, "wxlCanObj", NULL }, ! { "wxlCanObjScript", wxlCanObjScript_methods, wxlCanObjScript_methodCount, NULL, &s_wxluatag_wxlCanObjScript, "wxlCanObj", NULL }, ! { "wxlLuaCanCmd", wxlLuaCanCmd_methods, wxlLuaCanCmd_methodCount, NULL, &s_wxluatag_wxlLuaCanCmd, "wxCommandProcessor", NULL }, { 0, 0, 0, 0, 0, 0, 0 }, }; *************** *** 163,169 **** ! // ---------------------------------------------------------------------------- // wxLuaGetClassList_wxluacan() is called to register classes ! // ---------------------------------------------------------------------------- // binding class --- 163,169 ---- ! // --------------------------------------------------------------------------- // wxLuaGetClassList_wxluacan() is called to register classes ! // --------------------------------------------------------------------------- // binding class Index: wxluacan.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/wxluacan.h,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** wxluacan.h 17 Dec 2006 07:47:14 -0000 1.19 --- wxluacan.h 26 Feb 2007 01:57:00 -0000 1.20 *************** *** 1,8 **** ! // ---------------------------------------------------------------------------- // wxluacan.h - headers and tags for wxLua binding // // This file was generated by genwxbind.lua // Any changes made to this file may be lost when file is regenerated ! // ---------------------------------------------------------------------------- #ifndef __HOOK_WXLUA_wxluacan_H__ --- 1,8 ---- ! // --------------------------------------------------------------------------- // wxluacan.h - headers and tags for wxLua binding // // This file was generated by genwxbind.lua // Any changes made to this file may be lost when file is regenerated ! // --------------------------------------------------------------------------- #ifndef __HOOK_WXLUA_wxluacan_H__ *************** *** 14,20 **** #include "wxlua/include/wxlbind.h" ! #if WXLUA_BINDING_VERSION > 4 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 4 // binding class --- 14,25 ---- #include "wxlua/include/wxlbind.h" ! // --------------------------------------------------------------------------- ! // Check if the version of binding generator used to create this is older than ! // the current version of the bindings. ! // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 5 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 5 ! // --------------------------------------------------------------------------- // binding class *************** *** 38,44 **** extern WXLUA_NO_DLLIMPEXP bool wxLuaBinding_wxluacan_init(); ! // ---------------------------------------------------------------------------- // Includes ! // ---------------------------------------------------------------------------- #include "cancom.h" --- 43,49 ---- extern WXLUA_NO_DLLIMPEXP bool wxLuaBinding_wxluacan_init(); ! // --------------------------------------------------------------------------- // Includes ! // --------------------------------------------------------------------------- #include "cancom.h" *************** *** 48,54 **** ! // ---------------------------------------------------------------------------- // Lua Tag Method Values for each Class ! // ---------------------------------------------------------------------------- extern WXLUA_NO_DLLIMPEXP_DATA(int) s_wxluatag_wxlCan; --- 53,59 ---- ! // --------------------------------------------------------------------------- // Lua Tag Method Values for each Class ! // --------------------------------------------------------------------------- extern WXLUA_NO_DLLIMPEXP_DATA(int) s_wxluatag_wxlCan; *************** *** 62,68 **** ! // ---------------------------------------------------------------------------- // Method Tables ! // ---------------------------------------------------------------------------- extern WXLUA_NO_DLLIMPEXP WXLUAMETHOD wxlCan_methods[]; --- 67,73 ---- ! // --------------------------------------------------------------------------- // Method Tables ! // --------------------------------------------------------------------------- extern WXLUA_NO_DLLIMPEXP WXLUAMETHOD wxlCan_methods[]; *************** *** 83,89 **** ! // ---------------------------------------------------------------------------- // Encapsulation Declarations ! // ---------------------------------------------------------------------------- --- 88,94 ---- ! // --------------------------------------------------------------------------- // Encapsulation Declarations ! // --------------------------------------------------------------------------- |