[Wxlua-commit] wxLua/modules/wxlua/src wxlcallb.cpp, 1.19, 1.20 wxlstate.cpp, 1.79, 1.80

[John L. <jr...@us...>]

Update of /cvsroot/wxlua/wxLua/modules/wxlua/src
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv7442/wxLua/modules/wxlua/src

Modified Files:
	wxlcallb.cpp wxlstate.cpp 
Log Message:
fix warnings in wxlstate for VC
cleanup wxlcallb
rename m_deleteTable to m_winDestroyTable since it's the tag for EVT_DESTROY
simplify the wxLua editor app and add more messages, make the console really work nicely


Index: wxlstate.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlstate.cpp,v
retrieving revision 1.79
retrieving revision 1.80
diff -C2 -d -r1.79 -r1.80
*** wxlstate.cpp	6 Dec 2006 06:58:23 -0000	1.79
--- wxlstate.cpp	7 Dec 2006 01:22:02 -0000	1.80
***************
*** 903,907 ****
      m_functionTag         = 0;
      m_wxLuaNull           = 0;
!     m_wxDeleteTable       = 0;
      m_wxEventTag          = 0;
      m_wxWindowTag         = 0;
--- 903,907 ----
      m_functionTag         = 0;
      m_wxLuaNull           = 0;
!     m_wxWinDestroyTable   = 0;
      m_wxEventTag          = 0;
      m_wxWindowTag         = 0;
***************
*** 1756,1760 ****
      {
          M_WXLSTATEDATA->m_wxlStateData->m_functionTag = tnewtag();
!         M_WXLSTATEDATA->m_wxlStateData->m_wxDeleteTable = tnewweaktag(false, true);
      }
  
--- 1756,1760 ----
      {
          M_WXLSTATEDATA->m_wxlStateData->m_functionTag = tnewtag();
!         M_WXLSTATEDATA->m_wxlStateData->m_wxWinDestroyTable = tnewweaktag(false, true);
      }
  
***************
*** 1892,1899 ****
      return M_WXLSTATEDATA->m_wxlStateData->m_wxLuaNull;
  }
! int wxLuaState::GetLuaDeleteTable() const
  {
      wxCHECK_MSG(GetRefData() != NULL, 0, wxT("Invalid wxLuaState"));
!     return M_WXLSTATEDATA->m_wxlStateData->m_wxDeleteTable;
  }
  int wxLuaState::GetwxEventTag() const
--- 1892,1899 ----
      return M_WXLSTATEDATA->m_wxlStateData->m_wxLuaNull;
  }
! int wxLuaState::GetLuaWinDestroyTable() const
  {
      wxCHECK_MSG(GetRefData() != NULL, 0, wxT("Invalid wxLuaState"));
!     return M_WXLSTATEDATA->m_wxlStateData->m_wxWinDestroyTable;
  }
  int wxLuaState::GetwxEventTag() const
***************
*** 2528,2532 ****
                  if ((pLuaObject != NULL) && pLuaObject->GetObject())
                  {
!                     wxCHECK_MSG(pLuaObject->GetwxLuaState() == *this, false, wxT("wxLuaState GetDerivedMethod out of sync"));
                      return true;
                  }
--- 2528,2532 ----
                  if ((pLuaObject != NULL) && pLuaObject->GetObject())
                  {
!                     wxCHECK_MSG(pLuaObject->GetwxLuaState() == *this, false, wxT("wxLuaState HasDerivedMethod out of sync"));
                      return true;
                  }
***************
*** 2546,2550 ****
           it != wxLuaStateRefData::s_wxHashMapLuaStateRefData.end(); ++it)
      {
!         wxLuaState wxlState((wxLuaStateRefData*)it->second);
          if (wxlState.HasDerivedMethod(pObject, method))
              return wxlState;
--- 2546,2550 ----
           it != wxLuaStateRefData::s_wxHashMapLuaStateRefData.end(); ++it)
      {
!         wxLuaState wxlState((wxLuaStateRefData*)it->second, ((wxLuaStateRefData*)it->second)->m_lua_State);
          if (wxlState.HasDerivedMethod(pObject, method))
              return wxlState;

Index: wxlcallb.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlcallb.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** wxlcallb.cpp	28 Aug 2006 05:26:20 -0000	1.19
--- wxlcallb.cpp	7 Dec 2006 01:22:02 -0000	1.20
***************
*** 34,39 ****
  
  wxLuaCallback::wxLuaCallback( const wxLuaState& state, int theRoutine,
!                               wxWindowID winId, wxWindowID lastId, wxEventType eventType,
!                               wxEvtHandler *pEvtHandler )
                : wxEvtHandler(), m_wxlState(state),
                  m_pHandler(pEvtHandler), m_id(winId), m_lastId(lastId),
--- 34,39 ----
  
  wxLuaCallback::wxLuaCallback( const wxLuaState& state, int theRoutine,
!                               wxWindowID winId, wxWindowID lastId, 
!                               wxEventType eventType, wxEvtHandler *pEvtHandler )
                : wxEvtHandler(), m_wxlState(state),
                  m_pHandler(pEvtHandler), m_id(winId), m_lastId(lastId),
***************
*** 178,182 ****
  
          // get a reference to the destroy handler table
!         if (m_wxlState.tget(m_wxlState.GetLuaDeleteTable()))
          {
              // create a reference to object
--- 178,182 ----
  
          // get a reference to the destroy handler table
!         if (m_wxlState.tget(m_wxlState.GetLuaWinDestroyTable()))
          {
              // create a reference to object
***************
*** 227,231 ****
      // Note: do not remove from wxLuaState's destroyHandlerList here, wait 'till destructor
  
!     if (m_wxlState.tget(m_wxlState.GetLuaDeleteTable()))
      {
          lua_State* L = m_wxlState.GetLuaState();
--- 227,231 ----
      // Note: do not remove from wxLuaState's destroyHandlerList here, wait 'till destructor
  
!     if (m_wxlState.tget(m_wxlState.GetLuaWinDestroyTable()))
      {
          lua_State* L = m_wxlState.GetLuaState();