[Wxlua-commit] wxLua/modules/wxlua/include wxlstate.h,1.65,1.66

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

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

Modified Files:
	wxlstate.h 
Log Message:
Add accelerators for running, breaking in wxLuaEdit
Fix "reset" to work every time in the wxLuaShell
Use simplified wxWidgets (>2.6?) macros for declaring the wxLuaEvents


Index: wxlstate.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlstate.h,v
retrieving revision 1.65
retrieving revision 1.66
diff -C2 -d -r1.65 -r1.66
*** wxlstate.h	23 Mar 2007 04:27:23 -0000	1.65
--- wxlstate.h	8 May 2007 00:55:12 -0000	1.66
***************
*** 987,999 ****
  typedef void (wxEvtHandler::*wxLuaEventFunction)(wxLuaEvent&);
  
! #define EVT_LUA_CREATION(id, fn)     DECLARE_EVENT_TABLE_ENTRY(wxEVT_LUA_CREATION,   id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxLuaEventFunction) & fn, (wxObject *) NULL ),
! #define EVT_LUA_PRINT(id, fn)        DECLARE_EVENT_TABLE_ENTRY(wxEVT_LUA_PRINT,      id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxLuaEventFunction) & fn, (wxObject *) NULL ),
! #define EVT_LUA_ERROR(id, fn)        DECLARE_EVENT_TABLE_ENTRY(wxEVT_LUA_ERROR,      id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxLuaEventFunction) & fn, (wxObject *) NULL ),
! #define EVT_LUA_DEBUG_HOOK(id, fn)   DECLARE_EVENT_TABLE_ENTRY(wxEVT_LUA_DEBUG_HOOK, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxLuaEventFunction) & fn, (wxObject *) NULL ),
! //#define EVT_LUA_INIT(id, fn)         DECLARE_EVENT_TABLE_ENTRY(wxEVT_LUA_INIT,       id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxLuaEventFunction) & fn, (wxObject *) NULL ),
! //#define EVT_LUA_DEBUGGERATTACHED(fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_LUA_DEBUGGERATTACHED, wxID_ANY, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxLuaEventFunction) & fn, (wxObject *) NULL ),
  
! #define wxEVT_LUA_CONSOLE wxEVT_LUA_PRINT
! #define EVT_LUA_CONSOLE   EVT_LUA_PRINT
  
  #endif // _WXLSTATE_H_
--- 987,999 ----
  typedef void (wxEvtHandler::*wxLuaEventFunction)(wxLuaEvent&);
  
! #define wxLuaEventHandler(func) \
!     (wxObjectEventFunction)(wxEventFunction)(wxCommandEventFunction)(wxNotifyEventFunction)wxStaticCastEvent(wxLuaEventFunction, &func)
  
! #define wx__DECLARE_WXLUAEVT(evt, id, fn) wx__DECLARE_EVT1(evt, id, wxLuaEventHandler(fn))
! 
! #define EVT_LUA_CREATION(id, fn)   wx__DECLARE_WXLUAEVT(wxEVT_LUA_CREATION,   id, fn)
! #define EVT_LUA_PRINT(id, fn)      wx__DECLARE_WXLUAEVT(wxEVT_LUA_PRINT,      id, fn)
! #define EVT_LUA_ERROR(id, fn)      wx__DECLARE_WXLUAEVT(wxEVT_LUA_ERROR,      id, fn)
! #define EVT_LUA_DEBUG_HOOK(id, fn) wx__DECLARE_WXLUAEVT(wxEVT_LUA_DEBUG_HOOK, id, fn)
  
  #endif // _WXLSTATE_H_