Menu
▾
▴
[Wxlua-commit] wxLua/apps/wxluacan/src wxluacan.cpp, 1.15, 1.16 wxluacan.h, 1.15, 1.16 wxluacan_bind.cpp, 1.9, 1.10
|
From: John L. <jr...@us...> - 2006-12-13 00:28:01
|
Update of /cvsroot/wxlua/wxLua/apps/wxluacan/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv17364/wxLua/apps/wxluacan/src Modified Files: wxluacan.cpp wxluacan.h wxluacan_bind.cpp Log Message: Add version #define for bindings to tell people to regenerate them Index: wxluacan.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/wxluacan.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** wxluacan.cpp 28 Aug 2006 05:26:19 -0000 1.15 --- wxluacan.cpp 13 Dec 2006 00:27:55 -0000 1.16 *************** *** 164,168 **** // Map Lua Class Methods to C Binding Functions ! static WXLUAMETHOD s_wxlCanObj_methods[] = { { LuaConstructor, "wxlCanObj", wxLua_wxlCanObj_constructor, 2, 0, { &s_wxluaarg_Number, &s_wxluaarg_Number, 0 } }, { LuaMethod, "SetPos", wxLua_wxlCanObj_SetPos, 2, 2, { &s_wxluaarg_Number, &s_wxluaarg_Number, 0 } }, --- 164,168 ---- // Map Lua Class Methods to C Binding Functions ! WXLUAMETHOD wxlCanObj_methods[] = { { LuaConstructor, "wxlCanObj", wxLua_wxlCanObj_constructor, 2, 0, { &s_wxluaarg_Number, &s_wxluaarg_Number, 0 } }, { LuaMethod, "SetPos", wxLua_wxlCanObj_SetPos, 2, 2, { &s_wxluaarg_Number, &s_wxluaarg_Number, 0 } }, *************** *** 180,186 **** }; ! // Extern accessor to class method map ! WXLUAMETHOD* wxlCanObj_methods = s_wxlCanObj_methods; ! int wxlCanObj_methodCount = sizeof(s_wxlCanObj_methods)/sizeof(s_wxlCanObj_methods[0]); // ------------------------------------------------------------------------------------------------- --- 180,184 ---- }; ! int wxlCanObj_methodCount = sizeof(wxlCanObj_methods)/sizeof(wxlCanObj_methods[0]); // ------------------------------------------------------------------------------------------------- *************** *** 222,233 **** // Map Lua Class Methods to C Binding Functions ! 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} }, }; ! // Extern accessor to class method map ! WXLUAMETHOD* wxlCanObjRect_methods = s_wxlCanObjRect_methods; ! int wxlCanObjRect_methodCount = sizeof(s_wxlCanObjRect_methods)/sizeof(s_wxlCanObjRect_methods[0]); // ------------------------------------------------------------------------------------------------- --- 220,229 ---- // Map Lua Class Methods to C Binding Functions ! WXLUAMETHOD 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} }, }; ! int wxlCanObjRect_methodCount = sizeof(wxlCanObjRect_methods)/sizeof(wxlCanObjRect_methods[0]); // ------------------------------------------------------------------------------------------------- *************** *** 267,278 **** // Map Lua Class Methods to C Binding Functions ! 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} }, }; ! // Extern accessor to class method map ! WXLUAMETHOD* wxlCanObjCircle_methods = s_wxlCanObjCircle_methods; ! int wxlCanObjCircle_methodCount = sizeof(s_wxlCanObjCircle_methods)/sizeof(s_wxlCanObjCircle_methods[0]); // ------------------------------------------------------------------------------------------------- --- 263,272 ---- // Map Lua Class Methods to C Binding Functions ! WXLUAMETHOD 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} }, }; ! int wxlCanObjCircle_methodCount = sizeof(wxlCanObjCircle_methods)/sizeof(wxlCanObjCircle_methods[0]); // ------------------------------------------------------------------------------------------------- *************** *** 312,323 **** // Map Lua Class Methods to C Binding Functions ! 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} }, }; ! // Extern accessor to class method map ! WXLUAMETHOD* wxlCanObjScript_methods = s_wxlCanObjScript_methods; ! int wxlCanObjScript_methodCount = sizeof(s_wxlCanObjScript_methods)/sizeof(s_wxlCanObjScript_methods[0]); // ------------------------------------------------------------------------------------------------- --- 306,315 ---- // Map Lua Class Methods to C Binding Functions ! WXLUAMETHOD 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} }, }; ! int wxlCanObjScript_methodCount = sizeof(wxlCanObjScript_methods)/sizeof(wxlCanObjScript_methods[0]); // ------------------------------------------------------------------------------------------------- *************** *** 371,375 **** // Map Lua Class Methods to C Binding Functions ! static WXLUAMETHOD s_wxlCanObjAddScript_methods[] = { { 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 } }, --- 363,367 ---- // Map Lua Class Methods to C Binding Functions ! WXLUAMETHOD wxlCanObjAddScript_methods[] = { { 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 } }, *************** *** 377,383 **** }; ! // Extern accessor to class method map ! WXLUAMETHOD* wxlCanObjAddScript_methods = s_wxlCanObjAddScript_methods; ! int wxlCanObjAddScript_methodCount = sizeof(s_wxlCanObjAddScript_methods)/sizeof(s_wxlCanObjAddScript_methods[0]); // ------------------------------------------------------------------------------------------------- --- 369,373 ---- }; ! int wxlCanObjAddScript_methodCount = sizeof(wxlCanObjAddScript_methods)/sizeof(wxlCanObjAddScript_methods[0]); // ------------------------------------------------------------------------------------------------- *************** *** 469,473 **** // Map Lua Class Methods to C Binding Functions ! static WXLUAMETHOD s_wxlCan_methods[] = { { LuaMethod, "AddObject", wxLua_wxlCan_AddObject, 1, 1, { &s_wxluatag_wxlCanObj, 0 } }, { LuaMethod, "GetYaxis", wxLua_wxlCan_GetYaxis, 0, 0, { 0 } }, --- 459,463 ---- // Map Lua Class Methods to C Binding Functions ! WXLUAMETHOD wxlCan_methods[] = { { LuaMethod, "AddObject", wxLua_wxlCan_AddObject, 1, 1, { &s_wxluatag_wxlCanObj, 0 } }, { LuaMethod, "GetYaxis", wxLua_wxlCan_GetYaxis, 0, 0, { 0 } }, *************** *** 481,487 **** }; ! // Extern accessor to class method map ! WXLUAMETHOD* wxlCan_methods = s_wxlCan_methods; ! int wxlCan_methodCount = sizeof(s_wxlCan_methods)/sizeof(s_wxlCan_methods[0]); // ------------------------------------------------------------------------------------------------- --- 471,475 ---- }; ! int wxlCan_methodCount = sizeof(wxlCan_methods)/sizeof(wxlCan_methods[0]); // ------------------------------------------------------------------------------------------------- *************** *** 539,543 **** // Map Lua Class Methods to C Binding Functions ! static WXLUAMETHOD s_wxlLuaCanCmd_methods[] = { { 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 } }, --- 527,531 ---- // Map Lua Class Methods to C Binding Functions ! WXLUAMETHOD wxlLuaCanCmd_methods[] = { { 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 } }, *************** *** 545,550 **** }; ! // Extern accessor to class method map ! WXLUAMETHOD* wxlLuaCanCmd_methods = s_wxlLuaCanCmd_methods; ! int wxlLuaCanCmd_methodCount = sizeof(s_wxlLuaCanCmd_methods)/sizeof(s_wxlLuaCanCmd_methods[0]); --- 533,536 ---- }; ! int wxlLuaCanCmd_methodCount = sizeof(wxlLuaCanCmd_methods)/sizeof(wxlLuaCanCmd_methods[0]); Index: wxluacan_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/wxluacan_bind.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** wxluacan_bind.cpp 1 Dec 2006 06:25:45 -0000 1.9 --- wxluacan_bind.cpp 13 Dec 2006 00:27:55 -0000 1.10 *************** *** 198,206 **** // 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(); - - // bind wxLuaBinding_wxluacan to a single wxLuaState bool wxLuaBinding_wxluacan_bind(const wxLuaState& wxlState_) { --- 198,201 ---- *************** *** 208,212 **** wxCHECK_MSG(wxlState.Ok(), false, wxT("Invalid wxLuaState")); ! wxASSERT(!wxlState.GetLuaStateData()->m_typesRegistered); wxASSERT(!wxlState.GetLuaBinding(wxT("wxluacan"))); --- 203,207 ---- wxCHECK_MSG(wxlState.Ok(), false, wxT("Invalid wxLuaState")); ! wxASSERT(!wxlState.GetLuaStateData()->m_bindings_registered); wxASSERT(!wxlState.GetLuaBinding(wxT("wxluacan"))); *************** *** 215,219 **** return false; ! wxlState.GetLuaStateData()->m_bindings.Append(new wxLuaBinding_wxluacan()); return true; --- 210,214 ---- return false; ! wxlState.GetLuaStateData()->m_bindingList.Append(new wxLuaBinding_wxluacan()); return true; Index: wxluacan.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/wxluacan.h,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** wxluacan.h 28 Aug 2006 05:26:19 -0000 1.15 --- wxluacan.h 13 Dec 2006 00:27:55 -0000 1.16 *************** *** 13,16 **** --- 13,21 ---- #include "wxlua/include/wxlstate.h" #include "wxlua/include/wxlbind.h" + + #if WXLUA_BINDING_VERSION > 1 + # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." + #endif //WXLUA_BINDING_VERSION > 1 + // binding class class wxLuaBinding_wxluacan : public wxLuaBinding *************** *** 61,77 **** // ---------------------------------------------------------------------------- ! extern WXLUA_NO_DLLIMPEXP WXLUAMETHOD* wxlCan_methods; extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCan_methodCount; ! extern WXLUA_NO_DLLIMPEXP WXLUAMETHOD* wxlCanObj_methods; extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObj_methodCount; ! extern WXLUA_NO_DLLIMPEXP WXLUAMETHOD* wxlCanObjAddScript_methods; extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObjAddScript_methodCount; ! extern WXLUA_NO_DLLIMPEXP WXLUAMETHOD* wxlCanObjCircle_methods; extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObjCircle_methodCount; ! extern WXLUA_NO_DLLIMPEXP WXLUAMETHOD* wxlCanObjRect_methods; extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObjRect_methodCount; ! extern WXLUA_NO_DLLIMPEXP WXLUAMETHOD* wxlCanObjScript_methods; extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObjScript_methodCount; ! extern WXLUA_NO_DLLIMPEXP WXLUAMETHOD* wxlLuaCanCmd_methods; extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlLuaCanCmd_methodCount; --- 66,82 ---- // ---------------------------------------------------------------------------- ! extern WXLUA_NO_DLLIMPEXP WXLUAMETHOD wxlCan_methods[]; extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCan_methodCount; ! extern WXLUA_NO_DLLIMPEXP WXLUAMETHOD wxlCanObj_methods[]; extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObj_methodCount; ! extern WXLUA_NO_DLLIMPEXP WXLUAMETHOD wxlCanObjAddScript_methods[]; extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObjAddScript_methodCount; ! extern WXLUA_NO_DLLIMPEXP WXLUAMETHOD wxlCanObjCircle_methods[]; extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObjCircle_methodCount; ! extern WXLUA_NO_DLLIMPEXP WXLUAMETHOD wxlCanObjRect_methods[]; extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObjRect_methodCount; ! extern WXLUA_NO_DLLIMPEXP WXLUAMETHOD wxlCanObjScript_methods[]; extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObjScript_methodCount; ! extern WXLUA_NO_DLLIMPEXP WXLUAMETHOD wxlLuaCanCmd_methods[]; extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlLuaCanCmd_methodCount; |
