Menu
▾
▴
[Wxlua-commit] wxLua/apps/wxluacan/src wxluacan.cpp,1.12,1.13 wxluacan.h,1.10,1.11 wxluacan_bind.cpp,1.5,1.6 wxluacan_rules.lua,1.9,1.10
|
From: John L. <jr...@us...> - 2006-05-25 01:19:13
|
Update of /cvsroot/wxlua/wxLua/apps/wxluacan/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv21513/wxLua/apps/wxluacan/src Modified Files: wxluacan.cpp wxluacan.h wxluacan_bind.cpp wxluacan_rules.lua Log Message: regen wxluacan bindings cleanup rules files Index: wxluacan.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/wxluacan.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** wxluacan.cpp 23 Apr 2006 19:36:48 -0000 1.12 --- wxluacan.cpp 25 May 2006 01:19:07 -0000 1.13 *************** *** 163,167 **** - // Overloaded function bindings --- 163,166 ---- *************** *** 174,178 **** { LuaMethod, "SetPending", wxLua_wxlCanObj_SetPending, 1, 0, { &s_wxluaarg_Boolean, 0 } }, { LuaMethod, "AddObject", wxLua_wxlCanObj_AddObject, 1, 1, { &s_wxluatag_wxlCanObj, 0 } }, ! { LuaDelete, "wxlCanObj", wxLua_wxlCanObj_destructor, 0, 0, {0} }, #if wxLUA_USE_wxColourPenBrush --- 173,177 ---- { LuaMethod, "SetPending", wxLua_wxlCanObj_SetPending, 1, 0, { &s_wxluaarg_Boolean, 0 } }, { LuaMethod, "AddObject", wxLua_wxlCanObj_AddObject, 1, 1, { &s_wxluatag_wxlCanObj, 0 } }, ! { LuaDelete, "wxlCanObj", wxLua_wxlCanObj_destructor, 0, 0, {0} }, #if wxLUA_USE_wxColourPenBrush *************** *** 222,226 **** - // Overloaded function bindings --- 221,224 ---- *************** *** 228,232 **** static WXLUAMETHOD s_wxlCanObjRect_methods[] = { { LuaConstructor, "wxlCanObjRect", wxLua_wxlCanObjRect_constructor, 4, 4, { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, 0 } }, ! { LuaDelete, "wxlCanObjRect", wxLua_wxlCanObjRect_destructor, 0, 0, {0} }, }; --- 226,230 ---- static WXLUAMETHOD s_wxlCanObjRect_methods[] = { { LuaConstructor, "wxlCanObjRect", wxLua_wxlCanObjRect_constructor, 4, 4, { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, 0 } }, ! { LuaDelete, "wxlCanObjRect", wxLua_wxlCanObjRect_destructor, 0, 0, {0} }, }; *************** *** 268,272 **** - // Overloaded function bindings --- 266,269 ---- *************** *** 274,278 **** static WXLUAMETHOD s_wxlCanObjCircle_methods[] = { { LuaConstructor, "wxlCanObjCircle", wxLua_wxlCanObjCircle_constructor, 3, 3, { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, 0 } }, ! { LuaDelete, "wxlCanObjCircle", wxLua_wxlCanObjCircle_destructor, 0, 0, {0} }, }; --- 271,275 ---- static WXLUAMETHOD s_wxlCanObjCircle_methods[] = { { LuaConstructor, "wxlCanObjCircle", wxLua_wxlCanObjCircle_constructor, 3, 3, { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, 0 } }, ! { LuaDelete, "wxlCanObjCircle", wxLua_wxlCanObjCircle_destructor, 0, 0, {0} }, }; *************** *** 314,318 **** - // Overloaded function bindings --- 311,314 ---- *************** *** 320,324 **** static WXLUAMETHOD s_wxlCanObjScript_methods[] = { { LuaConstructor, "wxlCanObjScript", wxLua_wxlCanObjScript_constructor, 3, 3, { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_String, 0 } }, ! { LuaDelete, "wxlCanObjScript", wxLua_wxlCanObjScript_destructor, 0, 0, {0} }, }; --- 316,320 ---- static WXLUAMETHOD s_wxlCanObjScript_methods[] = { { LuaConstructor, "wxlCanObjScript", wxLua_wxlCanObjScript_constructor, 3, 3, { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_String, 0 } }, ! { LuaDelete, "wxlCanObjScript", wxLua_wxlCanObjScript_destructor, 0, 0, {0} }, }; *************** *** 374,378 **** - // Overloaded function bindings --- 370,373 ---- *************** *** 381,385 **** { LuaConstructor, "wxlCanObjAddScript", wxLua_wxlCanObjAddScript_constructor, 3, 3, { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_String, 0 } }, { LuaMethod, "SetScript", wxLua_wxlCanObjAddScript_SetScript, 1, 1, { &s_wxluaarg_String, 0 } }, ! { LuaDelete, "wxlCanObjAddScript", wxLua_wxlCanObjAddScript_destructor, 0, 0, {0} }, }; --- 376,380 ---- { LuaConstructor, "wxlCanObjAddScript", wxLua_wxlCanObjAddScript_constructor, 3, 3, { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_String, 0 } }, { LuaMethod, "SetScript", wxLua_wxlCanObjAddScript_SetScript, 1, 1, { &s_wxluaarg_String, 0 } }, ! { LuaDelete, "wxlCanObjAddScript", wxLua_wxlCanObjAddScript_destructor, 0, 0, {0} }, }; *************** *** 473,477 **** - // Overloaded function bindings --- 468,471 ---- *************** *** 481,485 **** { LuaMethod, "GetYaxis", wxLua_wxlCan_GetYaxis, 0, 0, { 0 } }, { LuaMethod, "GetCmdh", wxLua_wxlCan_GetCmdh, 0, 0, { 0 } }, ! { LuaDelete, "wxlCan", wxLua_wxlCan_destructor, 0, 0, {0} }, #if wxLUA_USE_wxPointSizeRect --- 475,479 ---- { LuaMethod, "GetYaxis", wxLua_wxlCan_GetYaxis, 0, 0, { 0 } }, { LuaMethod, "GetCmdh", wxLua_wxlCan_GetCmdh, 0, 0, { 0 } }, ! { LuaDelete, "wxlCan", wxLua_wxlCan_destructor, 0, 0, {0} }, #if wxLUA_USE_wxPointSizeRect *************** *** 544,548 **** - // Overloaded function bindings --- 538,541 ---- *************** *** 551,555 **** { LuaConstructor, "wxlLuaCanCmd", wxLua_wxlLuaCanCmd_constructor, 2, 1, { &s_wxluatag_wxlCan, &s_wxluaarg_Number, 0 } }, { LuaMethod, "MoveObject", wxLua_wxlLuaCanCmd_MoveObject, 3, 3, { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, 0 } }, ! { LuaDelete, "wxlLuaCanCmd", wxLua_wxlLuaCanCmd_destructor, 0, 0, {0} }, }; --- 544,548 ---- { LuaConstructor, "wxlLuaCanCmd", wxLua_wxlLuaCanCmd_constructor, 2, 1, { &s_wxluatag_wxlCan, &s_wxluaarg_Number, 0 } }, { LuaMethod, "MoveObject", wxLua_wxlLuaCanCmd_MoveObject, 3, 3, { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, 0 } }, ! { LuaDelete, "wxlLuaCanCmd", wxLua_wxlLuaCanCmd_destructor, 0, 0, {0} }, }; Index: wxluacan.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/wxluacan.h,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** wxluacan.h 17 Apr 2006 22:42:29 -0000 1.10 --- wxluacan.h 25 May 2006 01:19:07 -0000 1.11 *************** *** 29,67 **** // bind wxLuaBinding_wxluacan to a single wxLuaState ! extern bool wxLuaBinding_wxluacan_bind(const wxLuaState& wxlState); // initialize wxLuaBinding_wxluacan for all wxLuaStates ! extern bool wxLuaBinding_wxluacan_init(); #include "canlua.h" #include "cansim.h" - #include "cancom.h" - #include "wxlua/include/internal.h" #include "wx/gdicmn.h" // Lua Tag Method Values for each Class ! extern int s_wxluatag_wxlCanObjAddScript; ! extern int s_wxluatag_wxlLuaCanCmd; ! extern int s_wxluatag_wxlCan; ! extern int s_wxluatag_wxlCanObjScript; ! extern int s_wxluatag_wxlCanObjCircle; ! extern int s_wxluatag_wxlCanObjRect; ! extern int s_wxluatag_wxlCanObj; // Method Table ! extern WXLUAMETHOD* wxlCanObjAddScript_methods; ! extern int wxlCanObjAddScript_methodCount; ! extern WXLUAMETHOD* wxlLuaCanCmd_methods; ! extern int wxlLuaCanCmd_methodCount; ! extern WXLUAMETHOD* wxlCan_methods; ! extern int wxlCan_methodCount; ! extern WXLUAMETHOD* wxlCanObjScript_methods; ! extern int wxlCanObjScript_methodCount; ! extern WXLUAMETHOD* wxlCanObjCircle_methods; ! extern int wxlCanObjCircle_methodCount; ! extern WXLUAMETHOD* wxlCanObjRect_methods; ! extern int wxlCanObjRect_methodCount; ! extern WXLUAMETHOD* wxlCanObj_methods; ! extern int wxlCanObj_methodCount; --- 29,67 ---- // bind wxLuaBinding_wxluacan to a single wxLuaState ! extern bool wxLuaBinding_wxluacan_bind(const wxLuaState& wxlState); // initialize wxLuaBinding_wxluacan for all wxLuaStates ! extern bool wxLuaBinding_wxluacan_init(); + #include "cancom.h" #include "canlua.h" #include "cansim.h" #include "wx/gdicmn.h" + #include "wxlua/include/internal.h" // Lua Tag Method Values for each Class ! extern (int) s_wxluatag_wxlCan; ! extern (int) s_wxluatag_wxlCanObj; ! extern (int) s_wxluatag_wxlCanObjAddScript; ! extern (int) s_wxluatag_wxlCanObjCircle; ! extern (int) s_wxluatag_wxlCanObjRect; ! extern (int) s_wxluatag_wxlCanObjScript; ! extern (int) s_wxluatag_wxlLuaCanCmd; // Method Table ! extern WXLUAMETHOD* wxlCan_methods; ! extern (int) wxlCan_methodCount; ! extern WXLUAMETHOD* wxlCanObj_methods; ! extern (int) wxlCanObj_methodCount; ! extern WXLUAMETHOD* wxlCanObjAddScript_methods; ! extern (int) wxlCanObjAddScript_methodCount; ! extern WXLUAMETHOD* wxlCanObjCircle_methods; ! extern (int) wxlCanObjCircle_methodCount; ! extern WXLUAMETHOD* wxlCanObjRect_methods; ! extern (int) wxlCanObjRect_methodCount; ! extern WXLUAMETHOD* wxlCanObjScript_methods; ! extern (int) wxlCanObjScript_methodCount; ! extern WXLUAMETHOD* wxlLuaCanCmd_methods; ! extern (int) wxlLuaCanCmd_methodCount; Index: wxluacan_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/wxluacan_bind.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** wxluacan_bind.cpp 24 Apr 2006 02:33:26 -0000 1.5 --- wxluacan_bind.cpp 25 May 2006 01:19:07 -0000 1.6 *************** *** 93,118 **** ! // %function wxlLuaCanCmd* GetCmdhMain() ! static int LUACALL wxLua_function_GetCmdhMain(lua_State *L) { wxLuaState wxlState(L); ! wxlLuaCanCmd *returns; ! // call GetCmdhMain ! returns = GetCmdhMain(); // push the result datatype ! wxlState.PushUserDataType(s_wxluatag_wxlLuaCanCmd, returns); return 1; } ! // %function wxlCan* GetCan() ! static int LUACALL wxLua_function_GetCan(lua_State *L) { wxLuaState wxlState(L); ! wxlCan *returns; ! // call GetCan ! returns = GetCan(); // push the result datatype ! wxlState.PushUserDataType(s_wxluatag_wxlCan, returns); return 1; --- 93,118 ---- ! // %function wxlCan* GetCan() ! static int LUACALL wxLua_function_GetCan(lua_State *L) { wxLuaState wxlState(L); ! wxlCan *returns; ! // call GetCan ! returns = GetCan(); // push the result datatype ! wxlState.PushUserDataType(s_wxluatag_wxlCan, returns); return 1; } ! // %function wxlLuaCanCmd* GetCmdhMain() ! static int LUACALL wxLua_function_GetCmdhMain(lua_State *L) { wxLuaState wxlState(L); ! wxlLuaCanCmd *returns; ! // call GetCmdhMain ! returns = GetCmdhMain(); // push the result datatype ! wxlState.PushUserDataType(s_wxluatag_wxlLuaCanCmd, returns); return 1; *************** *** 125,130 **** static WXLUAMETHOD functionList[] = { - { LuaGlobal, "GetCmdhMain", wxLua_function_GetCmdhMain, 0, 0, { 0 } }, { LuaGlobal, "GetCan", wxLua_function_GetCan, 0, 0, { 0 } }, { LuaGlobal, 0, 0, 0, 0, {0} }, }; --- 125,130 ---- static WXLUAMETHOD functionList[] = { { LuaGlobal, "GetCan", wxLua_function_GetCan, 0, 0, { 0 } }, + { LuaGlobal, "GetCmdhMain", wxLua_function_GetCmdhMain, 0, 0, { 0 } }, { LuaGlobal, 0, 0, 0, 0, {0} }, }; *************** *** 133,136 **** --- 133,157 ---- } + + + WXLUACLASS* wxLuaGetClassList_wxluacan(size_t &count) + { + 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 }, + }; + count = (sizeof(classList)/sizeof(classList[0])) - 1; + + return classList; + } + + // ---------------------------------------------------------------------------- // wxLuaGetClassList_wxluacan() is called to register classes *************** *** 203,222 **** - - WXLUACLASS* wxLuaGetClassList_wxluacan(size_t &count) - { - static WXLUACLASS classList[] = - { - { "wxlCanObjAddScript", wxlCanObjAddScript_methods, wxlCanObjAddScript_methodCount, -1, NULL, &s_wxluatag_wxlCanObjAddScript, "wxlCanObj" }, - { "wxlLuaCanCmd", wxlLuaCanCmd_methods, wxlLuaCanCmd_methodCount, -1, NULL, &s_wxluatag_wxlLuaCanCmd, "wxCommandProcessor" }, - { "wxlCan", wxlCan_methods, wxlCan_methodCount, -1, NULL, &s_wxluatag_wxlCan, "wxScrolledWindow" }, - { "wxlCanObjScript", wxlCanObjScript_methods, wxlCanObjScript_methodCount, -1, NULL, &s_wxluatag_wxlCanObjScript, "wxlCanObj" }, - { "wxlCanObjCircle", wxlCanObjCircle_methods, wxlCanObjCircle_methodCount, -1, NULL, &s_wxluatag_wxlCanObjCircle, "wxlCanObj" }, - { "wxlCanObjRect", wxlCanObjRect_methods, wxlCanObjRect_methodCount, -1, NULL, &s_wxluatag_wxlCanObjRect, "wxlCanObj" }, - { "wxlCanObj", wxlCanObj_methods, wxlCanObj_methodCount, -1, NULL, &s_wxluatag_wxlCanObj, "wxObject" }, - { 0, 0, 0, 0, 0, 0, 0 }, - }; - count = (sizeof(classList)/sizeof(classList[0])) - 1; - - return classList; - } --- 224,225 ---- Index: wxluacan_rules.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/wxluacan_rules.lua,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** wxluacan_rules.lua 24 Apr 2006 02:33:26 -0000 1.9 --- wxluacan_rules.lua 25 May 2006 01:19:07 -0000 1.10 *************** *** 22,25 **** --- 22,32 ---- output_cpp_filepath = "." + --============================================================================= + -- Set the DLLIMPEXP macros for compiling these bindings into a DLL + -- Set to "" for no IMPEXP macros + + output_cpp_impexpsymbol = "" + output_cpp_impexpdatasymbol = "" + ------------------------------------------------------------------------------- -- Set the name of the header file that will have the #includes from the *************** *** 77,81 **** ------------------------------------------------------------------------------- ! -- A list of files that contain bindings that need to be overridden. -- The files are loaded from the interface_filepath. override_fileTable = {} --- 84,89 ---- ------------------------------------------------------------------------------- ! -- A list of files that contain bindings that need to be overridden or empty ! -- table {} for none. -- The files are loaded from the interface_filepath. override_fileTable = {} |
