[Wxlua-commit] wxLua/modules/wxlua/include wxlcallb.h, 1.11, 1.12 wxlstate.h, 1.52, 1.53

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

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

Modified Files:
	wxlcallb.h wxlstate.h 
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: wxlcallb.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlcallb.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** wxlcallb.h	25 May 2006 03:55:23 -0000	1.11
--- wxlcallb.h	7 Dec 2006 01:22:02 -0000	1.12
***************
*** 28,33 ****
      //  if only one event Id is needed set lastId = wxID_ANY
      wxLuaCallback( const wxLuaState& state, int theRoutine,
!                    wxWindowID winId, wxWindowID lastId, wxEventType eventType,
!                    wxEvtHandler *pHandler );
  
      virtual ~wxLuaCallback();
--- 28,33 ----
      //  if only one event Id is needed set lastId = wxID_ANY
      wxLuaCallback( const wxLuaState& state, int theRoutine,
!                    wxWindowID winId, wxWindowID lastId, 
!                    wxEventType eventType, wxEvtHandler *pHandler );
  
      virtual ~wxLuaCallback();
***************
*** 67,72 ****
  
  // ----------------------------------------------------------------------------
! // LuaDestroyCallback - proxy class to handle the destruction of wxWindow
! //                      derived objects using wxEVT_DESTROY
  // ----------------------------------------------------------------------------
  
--- 67,72 ----
  
  // ----------------------------------------------------------------------------
! // wxLuaDestroyCallback - proxy class to handle the destruction of wxWindow
! //                        derived objects using wxEVT_DESTROY
  // ----------------------------------------------------------------------------
  
***************
*** 83,86 ****
--- 83,87 ----
  
      wxLuaState GetwxLuaState() const { return m_wxlState; }
+     int GetId() const { return m_id; }
      wxEvtHandler* GetEvtHandler() const { return m_pHandler; }
  

Index: wxlstate.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlstate.h,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -d -r1.52 -r1.53
*** wxlstate.h	6 Dec 2006 06:58:23 -0000	1.52
--- wxlstate.h	7 Dec 2006 01:22:02 -0000	1.53
***************
*** 205,209 ****
      int  m_functionTag;     // The lua tag for function objects.
      int  m_wxLuaNull;       // The lua tag for wxLuaNull (for NULL pointers)
!     int  m_wxDeleteTable;   // The lua tag for the wxWindow destroy tracking table
      int  m_wxEventTag;      // The lua tag for wxEvents
      int  m_wxWindowTag;     // The lua tag for wxWindows
--- 205,209 ----
      int  m_functionTag;     // The lua tag for function objects.
      int  m_wxLuaNull;       // The lua tag for wxLuaNull (for NULL pointers)
!     int  m_wxWinDestroyTable; // The lua tag for the wxWindow destroy tracking table
      int  m_wxEventTag;      // The lua tag for wxEvents
      int  m_wxWindowTag;     // The lua tag for wxWindows
***************
*** 317,321 ****
      wxLuaState(const wxLuaState& wxlState) { Create(wxlState); }
      // Copy constructor, refs existing wxLuaStateRefData (internal use)
!     wxLuaState(wxLuaStateRefData* refData) { Create(refData); }
  
      // ALWAYS destroy lua_State instead of calling UnRef, else circular
--- 317,321 ----
      wxLuaState(const wxLuaState& wxlState) { Create(wxlState); }
      // Copy constructor, refs existing wxLuaStateRefData (internal use)
!     wxLuaState(wxLuaStateRefData* refData, lua_State* L) { Create(refData, L); }
  
      // ALWAYS destroy lua_State instead of calling UnRef, else circular
***************
*** 484,488 ****
      int  GetLuaFunctionTag() const;  // The lua tag for function objects.
      int  GetLuaNull() const;         // The lua tag for wxLuaNull (for NULL pointers)
!     int  GetLuaDeleteTable() const;  // The lua tag for the wxWindow destroy tracking table
      int  GetwxEventTag() const;      // The lua tag for wxEvents
      int  GetwxWindowTag() const;     // The lua tag for wxWindows
--- 484,488 ----
      int  GetLuaFunctionTag() const;  // The lua tag for function objects.
      int  GetLuaNull() const;         // The lua tag for wxLuaNull (for NULL pointers)
!     int  GetLuaWinDestroyTable() const; // The lua tag for the wxWindow destroy tracking table
      int  GetwxEventTag() const;      // The lua tag for wxEvents
      int  GetwxWindowTag() const;     // The lua tag for wxWindows