Update of /cvsroot/wxlua/wxLua/modules/wxlua/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24398/modules/wxlua/src
Modified Files:
wxlbind.cpp wxlstate.cpp
Log Message:
updated bakefiles
Index: wxlstate.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlstate.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** wxlstate.cpp 19 Jan 2006 03:49:37 -0000 1.20
--- wxlstate.cpp 23 Jan 2006 19:38:30 -0000 1.21
***************
*** 1272,1276 ****
{
wxCHECK_RET(Ok() && pObject, wxT("Invalid wxLuaState or wxObject to track"));
! M_WXLSTATEDATA->m_pTrackedList->Put((int)pObject, pObject);
}
--- 1272,1276 ----
{
wxCHECK_RET(Ok() && pObject, wxT("Invalid wxLuaState or wxObject to track"));
! M_WXLSTATEDATA->m_pTrackedList->Put((long)pObject, pObject);
}
***************
*** 1285,1289 ****
wxCHECK_MSG(Ok() && pObject, false, wxT("Invalid wxLuaState or object"))
! wxObject *pDeleteObject = M_WXLSTATEDATA->m_pTrackedList->Delete((int) pObject);
bool result = pDeleteObject != NULL;
--- 1285,1289 ----
wxCHECK_MSG(Ok() && pObject, false, wxT("Invalid wxLuaState or object"))
! wxObject *pDeleteObject = M_WXLSTATEDATA->m_pTrackedList->Delete((long) pObject);
bool result = pDeleteObject != NULL;
***************
*** 2124,2128 ****
if (wxlsData)
{
! wxHashTable *pHashTable = (wxHashTable *) wxlsData->m_pDerivedList->Get((int) pObject);
if (pHashTable != NULL)
{
--- 2124,2128 ----
if (wxlsData)
{
! wxHashTable *pHashTable = (wxHashTable *) wxlsData->m_pDerivedList->Get((long) pObject);
if (pHashTable != NULL)
{
***************
*** 2142,2146 ****
if (wxlsData)
{
! wxHashTable *pHashTable = (wxHashTable *) wxlsData->m_pDerivedList->Get((int) pObject);
if (pHashTable != NULL)
{
--- 2142,2146 ----
if (wxlsData)
{
! wxHashTable *pHashTable = (wxHashTable *) wxlsData->m_pDerivedList->Get((long) pObject);
if (pHashTable != NULL)
{
Index: wxlbind.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlbind.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** wxlbind.cpp 30 Dec 2005 04:35:59 -0000 1.12
--- wxlbind.cpp 23 Jan 2006 19:38:30 -0000 1.13
***************
*** 44,48 ****
if ((pClass != NULL) && lua_isuserdata(L, 1) && (lua_islightuserdata(L, 1) == 0) && (wxlState.ttag(1) == *pClass->class_tag))
{
! wxHashTable *pHashTable = (wxHashTable *) wxlState.GetLuaStateRefData()->m_pDerivedList->Delete((int)wxlState.ttouserdata(1, true));
if (pHashTable != NULL)
delete pHashTable;
--- 44,49 ----
if ((pClass != NULL) && lua_isuserdata(L, 1) && (lua_islightuserdata(L, 1) == 0) && (wxlState.ttag(1) == *pClass->class_tag))
{
! wxHashTable *pHashTable = (wxHashTable *) wxlState.GetLuaStateRefData()->
! m_pDerivedList->Delete((long)wxlState.ttouserdata(1, true));
if (pHashTable != NULL)
delete pHashTable;
***************
*** 169,173 ****
bool fCreated = false;
! wxHashTable *pHashTable = (wxHashTable *) wxlState.GetLuaStateRefData()->m_pDerivedList->Get((int) pObject);
if (pHashTable == NULL)
{
--- 170,174 ----
bool fCreated = false;
! wxHashTable *pHashTable = (wxHashTable *) wxlState.GetLuaStateRefData()->m_pDerivedList->Get((long) pObject);
if (pHashTable == NULL)
{
***************
*** 177,181 ****
pHashTable->DeleteContents(true);
! wxlState.GetLuaStateRefData()->m_pDerivedList->Put((int) pObject, pHashTable);
fCreated = true;
}
--- 178,182 ----
pHashTable->DeleteContents(true);
! wxlState.GetLuaStateRefData()->m_pDerivedList->Put((long) pObject, pHashTable);
fCreated = true;
}
|