Update of /cvsroot/wxlua/wxLua/apps/wxluacan/src
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv15657/wxLua/apps/wxluacan/src
Modified Files:
wxluacan.cpp wxluacan.h
Log Message:
Remove wxLua_AddTrackedObject functions and just use wxLuaState::AddTrackedObject directly
Remove all gc (destructor, LuaDelete) functions from the methods of a class since
we can delete the objects in the single gc function in wxlbind.cpp anyway.
Index: wxluacan.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/wxluacan.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** wxluacan.cpp 9 Mar 2007 06:10:13 -0000 1.22
--- wxluacan.cpp 15 Mar 2007 00:01:08 -0000 1.23
***************
*** 126,134 ****
}
- static int LUACALL wxLua_wxlCanObj_destructor(lua_State *)
- {
- return 0;
- }
-
#if wxLUA_USE_wxColourPenBrush
--- 126,129 ----
***************
*** 175,179 ****
{ LuaMethod, "SetPending", wxLua_wxlCanObj_SetPending, 1, 0, s_wxluatagArray_wxLua_wxlCanObj_SetPending },
{ LuaMethod, "AddObject", wxLua_wxlCanObj_AddObject, 1, 1, s_wxluatagArray_wxLua_wxlCanObj_AddObject },
- { LuaDelete, "wxlCanObj", wxLua_wxlCanObj_destructor, 0, 0, s_wxluaargArray_None },
#if wxLUA_USE_wxColourPenBrush
--- 170,173 ----
***************
*** 215,223 ****
}
- static int LUACALL wxLua_wxlCanObjRect_destructor(lua_State *)
- {
- return 0;
- }
-
--- 209,212 ----
***************
*** 225,229 ****
WXLUAMETHOD wxlCanObjRect_methods[] = {
{ LuaConstructor, "wxlCanObjRect", wxLua_wxlCanObjRect_constructor, 4, 4, s_wxluatagArray_wxLua_wxlCanObjRect_constructor },
- { LuaDelete, "wxlCanObjRect", wxLua_wxlCanObjRect_destructor, 0, 0, s_wxluaargArray_None },
};
--- 214,217 ----
***************
*** 257,265 ****
}
- static int LUACALL wxLua_wxlCanObjCircle_destructor(lua_State *)
- {
- return 0;
- }
-
--- 245,248 ----
***************
*** 267,271 ****
WXLUAMETHOD wxlCanObjCircle_methods[] = {
{ LuaConstructor, "wxlCanObjCircle", wxLua_wxlCanObjCircle_constructor, 3, 3, s_wxluatagArray_wxLua_wxlCanObjCircle_constructor },
- { LuaDelete, "wxlCanObjCircle", wxLua_wxlCanObjCircle_destructor, 0, 0, s_wxluaargArray_None },
};
--- 250,253 ----
***************
*** 299,307 ****
}
- static int LUACALL wxLua_wxlCanObjScript_destructor(lua_State *)
- {
- return 0;
- }
-
--- 281,284 ----
***************
*** 309,313 ****
WXLUAMETHOD wxlCanObjScript_methods[] = {
{ LuaConstructor, "wxlCanObjScript", wxLua_wxlCanObjScript_constructor, 3, 3, s_wxluatagArray_wxLua_wxlCanObjScript_constructor },
- { LuaDelete, "wxlCanObjScript", wxLua_wxlCanObjScript_destructor, 0, 0, s_wxluaargArray_None },
};
--- 286,289 ----
***************
*** 356,364 ****
}
- static int LUACALL wxLua_wxlCanObjAddScript_destructor(lua_State *)
- {
- return 0;
- }
-
--- 332,335 ----
***************
*** 367,371 ****
{ LuaConstructor, "wxlCanObjAddScript", wxLua_wxlCanObjAddScript_constructor, 3, 3, s_wxluatagArray_wxLua_wxlCanObjAddScript_constructor },
{ LuaMethod, "SetScript", wxLua_wxlCanObjAddScript_SetScript, 1, 1, s_wxluatagArray_wxLua_wxlCanObjAddScript_SetScript },
- { LuaDelete, "wxlCanObjAddScript", wxLua_wxlCanObjAddScript_destructor, 0, 0, s_wxluaargArray_None },
};
--- 338,341 ----
***************
*** 424,432 ****
}
- static int LUACALL wxLua_wxlCan_destructor(lua_State *)
- {
- return 0;
- }
-
#if wxLUA_USE_wxPointSizeRect
--- 394,397 ----
***************
*** 464,468 ****
{ LuaMethod, "GetYaxis", wxLua_wxlCan_GetYaxis, 0, 0, s_wxluaargArray_None },
{ LuaMethod, "GetCmdh", wxLua_wxlCan_GetCmdh, 0, 0, s_wxluaargArray_None },
- { LuaDelete, "wxlCan", wxLua_wxlCan_destructor, 0, 0, s_wxluaargArray_None },
#if wxLUA_USE_wxPointSizeRect
--- 429,432 ----
***************
*** 520,528 ****
}
- static int LUACALL wxLua_wxlLuaCanCmd_destructor(lua_State *)
- {
- return 0;
- }
-
--- 484,487 ----
***************
*** 531,535 ****
{ LuaConstructor, "wxlLuaCanCmd", wxLua_wxlLuaCanCmd_constructor, 2, 1, s_wxluatagArray_wxLua_wxlLuaCanCmd_constructor },
{ LuaMethod, "MoveObject", wxLua_wxlLuaCanCmd_MoveObject, 3, 3, s_wxluatagArray_wxLua_wxlLuaCanCmd_MoveObject },
- { LuaDelete, "wxlLuaCanCmd", wxLua_wxlLuaCanCmd_destructor, 0, 0, s_wxluaargArray_None },
};
--- 490,493 ----
Index: wxluacan.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/wxluacan.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** wxluacan.h 26 Feb 2007 01:57:00 -0000 1.20
--- wxluacan.h 15 Mar 2007 00:01:08 -0000 1.21
***************
*** 18,24 ****
// 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
// ---------------------------------------------------------------------------
--- 18,24 ----
// the current version of the bindings.
// See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 6
# error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 6
// ---------------------------------------------------------------------------
|
