[Wxlua-commit] wxLua/modules/wxlua/src wxlcallb.cpp,1.17,1.18 wxlstate.cpp,1.69,1.70

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

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

Modified Files:
	wxlcallb.cpp wxlstate.cpp 
Log Message:
changed wxEvtHandler::ConnectEvent to Connect
update all samples to reflect this
add win id ranges to connect
add untested wxEvtHandler::Disconnect


Index: wxlstate.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlstate.cpp,v
retrieving revision 1.69
retrieving revision 1.70
diff -C2 -d -r1.69 -r1.70
*** wxlstate.cpp	18 May 2006 05:47:40 -0000	1.69
--- wxlstate.cpp	25 May 2006 03:55:23 -0000	1.70
***************
*** 1567,1571 ****
      {
          M_WXLSTATEDATA->m_wxlStateData->m_windowList.Append(pWindow);
!         new wxLuaCallback(*this, 3, pWindow->GetId(), wxEVT_DESTROY, pWindow->GetEventHandler());
      }
  }
--- 1567,1571 ----
      {
          M_WXLSTATEDATA->m_wxlStateData->m_windowList.Append(pWindow);
!         new wxLuaCallback(*this, 3, pWindow->GetId(), wxID_ANY, wxEVT_DESTROY, pWindow->GetEventHandler());
      }
  }

Index: wxlcallb.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlcallb.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** wxlcallb.cpp	14 May 2006 17:45:05 -0000	1.17
--- wxlcallb.cpp	25 May 2006 03:55:23 -0000	1.18
***************
*** 35,42 ****
  
  wxLuaCallback::wxLuaCallback( const wxLuaState& state, int theRoutine,
!                               wxWindowID id, wxEventType eventType,
                                wxEvtHandler *pEvtHandler )
                : wxEvtHandler(), m_wxlState(state),
!                 m_pHandler(pEvtHandler), m_id(id),
                  m_eventType(eventType)
  {
--- 35,42 ----
  
  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),
                  m_eventType(eventType)
  {
***************
*** 45,49 ****
      m_routine = m_wxlState.tinsert(theRoutine);
  
!     pEvtHandler->Connect( id, eventType,
                            (wxObjectEventFunction)&wxLuaCallback::EventHandler,
                            this);
--- 45,49 ----
      m_routine = m_wxlState.tinsert(theRoutine);
  
!     pEvtHandler->Connect( winId, lastId, eventType,
                            (wxObjectEventFunction)&wxLuaCallback::EventHandler,
                            this);