wxlua-commit

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

Update of /cvsroot/wxlua/wxLua/modules/wxluadebug/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32720/wxLua/modules/wxluadebug/include

Modified Files:
	splttree.h wxldebug.h 
Log Message:
wxEVT_DEBUG_XXX -> wxEVT_WXLUA_DEBUG_XXX and export them for DLL
reorder libs for linking in wxluaedit
TRUE/FALSE -> true/false
EVENT_DEBUG_XXX and CMD_XXX -> wxLUA_EVENT_DEBUG_XXX wxLUA_CMD_XXX


Index: splttree.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/include/splttree.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** splttree.h	29 Nov 2005 05:45:10 -0000	1.4
--- splttree.h	1 Dec 2005 04:17:29 -0000	1.5
***************
*** 64,68 ****
                               int noUnitsX, int noUnitsY,
                               int xPos = 0, int yPos = 0,
!                              bool noRefresh = FALSE );
  
      // In case we're using the generic tree control.
--- 64,68 ----
                               int noUnitsX, int noUnitsY,
                               int xPos = 0, int yPos = 0,
!                              bool noRefresh = false );
  
      // In case we're using the generic tree control.

Index: wxldebug.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/include/wxldebug.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** wxldebug.h	30 Nov 2005 04:46:17 -0000	1.6
--- wxldebug.h	1 Dec 2005 04:17:29 -0000	1.7
***************
*** 150,163 ****
  enum wxLuaDebugEvents_Type
  {
!     EVENT_DEBUG_BREAK,
!     EVENT_DEBUG_PRINT,
!     EVENT_DEBUG_ERROR,
!     EVENT_DEBUG_EXIT,
!     EVENT_DEBUG_STACK_ENUM,
!     EVENT_DEBUG_STACK_ENTRY_ENUM,
!     EVENT_DEBUG_TABLE_ENUM,
!     EVENT_DEBUG_EVALUATE_EXPR,
!     EVENT_DEBUG_BREAKPOINT_ADDED,
!     EVENT_DEBUG_BREAKPOINT_REMOVED
  };
  
--- 150,163 ----
  enum wxLuaDebugEvents_Type
  {
!     wxLUA_EVENT_DEBUG_BREAK,
!     wxLUA_EVENT_DEBUG_PRINT,
!     wxLUA_EVENT_DEBUG_ERROR,
!     wxLUA_EVENT_DEBUG_EXIT,
!     wxLUA_EVENT_DEBUG_STACK_ENUM,
!     wxLUA_EVENT_DEBUG_STACK_ENTRY_ENUM,
!     wxLUA_EVENT_DEBUG_TABLE_ENUM,
!     wxLUA_EVENT_DEBUG_EVALUATE_EXPR,
!     wxLUA_EVENT_DEBUG_BREAKPOINT_ADDED,
!     wxLUA_EVENT_DEBUG_BREAKPOINT_REMOVED
  };
  
***************
*** 168,188 ****
  enum wxLuaDebugCommands_Type
  {
!     CMD_ADD_BREAKPOINT,
!     CMD_REMOVE_BREAKPOINT,
!     CMD_CLEAR_ALL_BREAKPOINTS,
!     CMD_RUN_BUFFER,
!     CMD_DEBUG_STEP,
!     CMD_DEBUG_STEPOVER,
!     CMD_DEBUG_STEPOUT,
!     CMD_DEBUG_CONTINUE,
!     CMD_DEBUG_BREAK,
!     CMD_ENUMERATE_STACK,
!     CMD_ENUMERATE_STACK_ENTRY,
!     CMD_ENUMERATE_TABLE_REF,
!     CMD_EVALUATE_EXPR,
!     CMD_RESET,
!     CMD_CLEAR_DEBUG_REFERENCES,
!     CMD_DISABLE_BREAKPOINT,
!     CMD_ENABLE_BREAKPOINT
  };
  
--- 168,188 ----
  enum wxLuaDebugCommands_Type
  {
!     wxLUA_CMD_ADD_BREAKPOINT,
!     wxLUA_CMD_REMOVE_BREAKPOINT,
!     wxLUA_CMD_CLEAR_ALL_BREAKPOINTS,
!     wxLUA_CMD_RUN_BUFFER,
!     wxLUA_CMD_DEBUG_STEP,
!     wxLUA_CMD_DEBUG_STEPOVER,
!     wxLUA_CMD_DEBUG_STEPOUT,
!     wxLUA_CMD_DEBUG_CONTINUE,
!     wxLUA_CMD_DEBUG_BREAK,
!     wxLUA_CMD_ENUMERATE_STACK,
!     wxLUA_CMD_ENUMERATE_STACK_ENTRY,
!     wxLUA_CMD_ENUMERATE_TABLE_REF,
!     wxLUA_CMD_EVALUATE_EXPR,
!     wxLUA_CMD_RESET,
!     wxLUA_CMD_CLEAR_DEBUG_REFERENCES,
!     wxLUA_CMD_DISABLE_BREAKPOINT,
!     wxLUA_CMD_ENABLE_BREAKPOINT
  };
  
***************
*** 258,292 ****
  typedef void (wxEvtHandler::*wxLuaDebugEventFunction)(wxLuaDebugEvent&);
  
- // FIXME prefix wxLUA on these
- 
  BEGIN_DECLARE_EVENT_TYPES()
!     DECLARE_LOCAL_EVENT_TYPE(wxEVT_DEBUG_CLIENT_CONNECTED,    2510)
!     DECLARE_LOCAL_EVENT_TYPE(wxEVT_DEBUG_BREAK,               2511)
!     DECLARE_LOCAL_EVENT_TYPE(wxEVT_DEBUG_PRINT,               2512)
!     DECLARE_LOCAL_EVENT_TYPE(wxEVT_DEBUG_ERROR,               2513)
!     DECLARE_LOCAL_EVENT_TYPE(wxEVT_DEBUG_EXIT,                2514)
!     DECLARE_LOCAL_EVENT_TYPE(wxEVT_DEBUG_STACK_ENUM,          2515)
!     DECLARE_LOCAL_EVENT_TYPE(wxEVT_DEBUG_STACK_ENTRY_ENUM,    2516)
!     DECLARE_LOCAL_EVENT_TYPE(wxEVT_DEBUG_TABLE_ENUM,          2517)
!     DECLARE_LOCAL_EVENT_TYPE(wxEVT_DEBUG_EVALUATE_EXPR,       2518)
!     DECLARE_LOCAL_EVENT_TYPE(wxEVT_DEBUG_STARTDEBUGGER,       2519)
!     DECLARE_LOCAL_EVENT_TYPE(wxEVT_DEBUG_STOPDEBUGGER,        2520)
!     DECLARE_LOCAL_EVENT_TYPE(wxEVT_DEBUG_BREAKPOINT_ADDED,    2521)
!     DECLARE_LOCAL_EVENT_TYPE(wxEVT_DEBUG_BREAKPOINT_REMOVED,  2522)
  END_DECLARE_EVENT_TYPES()
  
! #define EVT_DEBUG_CLIENT_CONNECTED(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_DEBUG_BREAK,               id, -1, (wxObjectEventFunction) (wxEventFunction) (wxLuaDebugEventFunction) & fn, (wxObject *) NULL),
! #define EVT_DEBUG_BREAK(id, fn)            DECLARE_EVENT_TABLE_ENTRY(wxEVT_DEBUG_BREAK,               id, -1, (wxObjectEventFunction) (wxEventFunction) (wxLuaDebugEventFunction) & fn, (wxObject *) NULL),
! #define EVT_DEBUG_PRINT(id, fn)            DECLARE_EVENT_TABLE_ENTRY(wxEVT_DEBUG_PRINT,               id, -1, (wxObjectEventFunction) (wxEventFunction) (wxLuaDebugEventFunction) & fn, (wxObject *) NULL),
! #define EVT_DEBUG_ERROR(id, fn)            DECLARE_EVENT_TABLE_ENTRY(wxEVT_DEBUG_ERROR,               id, -1, (wxObjectEventFunction) (wxEventFunction) (wxLuaDebugEventFunction) & fn, (wxObject *) NULL),
! #define EVT_DEBUG_EXIT(id, fn)             DECLARE_EVENT_TABLE_ENTRY(wxEVT_DEBUG_EXIT,                id, -1, (wxObjectEventFunction) (wxEventFunction) (wxLuaDebugEventFunction) & fn, (wxObject *) NULL),
! #define EVT_DEBUG_STACK_ENUM(fn)           DECLARE_EVENT_TABLE_ENTRY(wxEVT_DEBUG_STACK_ENUM,          -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxLuaDebugEventFunction) & fn, (wxObject *) NULL),
! #define EVT_DEBUG_STACK_ENTRY_ENUM(fn)     DECLARE_EVENT_TABLE_ENTRY(wxEVT_DEBUG_STACK_ENTRY_ENUM,    -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxLuaDebugEventFunction) & fn, (wxObject *) NULL),
! #define EVT_DEBUG_TABLE_ENUM(fn)           DECLARE_EVENT_TABLE_ENTRY(wxEVT_DEBUG_TABLE_ENUM,          -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxLuaDebugEventFunction) & fn, (wxObject *) NULL),
! #define EVT_DEBUG_EVALUATE_EXPR(id, fn)    DECLARE_EVENT_TABLE_ENTRY(wxEVT_DEBUG_EVALUATE_EXPR,       id, -1, (wxObjectEventFunction) (wxEventFunction) (wxLuaDebugEventFunction) & fn, (wxObject *) NULL),
! #define EVT_DEBUG_STARTDEBUGGER(fn)        DECLARE_EVENT_TABLE_ENTRY(wxEVT_DEBUG_STARTDEBUGGER,       -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxLuaDebugEventFunction) & fn, (wxObject *) NULL),
! #define EVT_DEBUG_STOPDEBUGGER(fn)         DECLARE_EVENT_TABLE_ENTRY(wxEVT_DEBUG_STOPDEBUGGER,        -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxLuaDebugEventFunction) & fn, (wxObject *) NULL),
! #define EVT_DEBUG_BREAKPOINT_ADDED(fn)     DECLARE_EVENT_TABLE_ENTRY(wxEVT_DEBUG_BREAKPOINT_ADDED,    -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxLuaDebugEventFunction) & fn, (wxObject *) NULL),
! #define EVT_DEBUG_BREAKPOINT_REMOVED(fn)   DECLARE_EVENT_TABLE_ENTRY(wxEVT_DEBUG_BREAKPOINT_REMOVED,  -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxLuaDebugEventFunction) & fn, (wxObject *) NULL),
  
  #endif // WX_LUA_DEBUG_H
--- 258,293 ----
  typedef void (wxEvtHandler::*wxLuaDebugEventFunction)(wxLuaDebugEvent&);
  
  BEGIN_DECLARE_EVENT_TYPES()
!     DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUA, wxEVT_WXLUA_DEBUG_CLIENT_CONNECTED,    2510)
!     DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUA, wxEVT_WXLUA_DEBUG_BREAK,               2511)
!     DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUA, wxEVT_WXLUA_DEBUG_PRINT,               2512)
!     DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUA, wxEVT_WXLUA_DEBUG_ERROR,               2513)
!     DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUA, wxEVT_WXLUA_DEBUG_EXIT,                2514)
!     DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUA, wxEVT_WXLUA_DEBUG_STACK_ENUM,          2515)
!     DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUA, wxEVT_WXLUA_DEBUG_STACK_ENTRY_ENUM,    2516)
!     DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUA, wxEVT_WXLUA_DEBUG_TABLE_ENUM,          2517)
!     DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUA, wxEVT_WXLUA_DEBUG_EVALUATE_EXPR,       2518)
!     DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUA, wxEVT_WXLUA_DEBUG_STARTDEBUGGER,       2519)
!     DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUA, wxEVT_WXLUA_DEBUG_STOPDEBUGGER,        2520)
!     DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUA, wxEVT_WXLUA_DEBUG_BREAKPOINT_ADDED,    2521)
!     DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUA, wxEVT_WXLUA_DEBUG_BREAKPOINT_REMOVED,  2522)
  END_DECLARE_EVENT_TYPES()
  
! #define wxLuaDebugEventHandler(func) \
!     (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxLuaDebugEventFunction, &func)
! 
! #define EVT_WXLUA_DEBUG_CLIENT_CONNECTED(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_WXLUA_DEBUG_BREAK,               id, -1, wxLuaDebugEventHandler(fn), (wxObject *) NULL),
! #define EVT_WXLUA_DEBUG_BREAK(id, fn)            DECLARE_EVENT_TABLE_ENTRY(wxEVT_WXLUA_DEBUG_BREAK,               id, -1, wxLuaDebugEventHandler(fn), (wxObject *) NULL),
! #define EVT_WXLUA_DEBUG_PRINT(id, fn)            DECLARE_EVENT_TABLE_ENTRY(wxEVT_WXLUA_DEBUG_PRINT,               id, -1, wxLuaDebugEventHandler(fn), (wxObject *) NULL),
! #define EVT_WXLUA_DEBUG_ERROR(id, fn)            DECLARE_EVENT_TABLE_ENTRY(wxEVT_WXLUA_DEBUG_ERROR,               id, -1, wxLuaDebugEventHandler(fn), (wxObject *) NULL),
! #define EVT_WXLUA_DEBUG_EXIT(id, fn)             DECLARE_EVENT_TABLE_ENTRY(wxEVT_WXLUA_DEBUG_EXIT,                id, -1, wxLuaDebugEventHandler(fn), (wxObject *) NULL),
! #define EVT_WXLUA_DEBUG_STACK_ENUM(fn)           DECLARE_EVENT_TABLE_ENTRY(wxEVT_WXLUA_DEBUG_STACK_ENUM,          -1, -1, wxLuaDebugEventHandler(fn), (wxObject *) NULL),
! #define EVT_WXLUA_DEBUG_STACK_ENTRY_ENUM(fn)     DECLARE_EVENT_TABLE_ENTRY(wxEVT_WXLUA_DEBUG_STACK_ENTRY_ENUM,    -1, -1, wxLuaDebugEventHandler(fn), (wxObject *) NULL),
! #define EVT_WXLUA_DEBUG_TABLE_ENUM(fn)           DECLARE_EVENT_TABLE_ENTRY(wxEVT_WXLUA_DEBUG_TABLE_ENUM,          -1, -1, wxLuaDebugEventHandler(fn), (wxObject *) NULL),
! #define EVT_WXLUA_DEBUG_EVALUATE_EXPR(id, fn)    DECLARE_EVENT_TABLE_ENTRY(wxEVT_WXLUA_DEBUG_EVALUATE_EXPR,       id, -1, wxLuaDebugEventHandler(fn), (wxObject *) NULL),
! #define EVT_WXLUA_DEBUG_STARTDEBUGGER(fn)        DECLARE_EVENT_TABLE_ENTRY(wxEVT_WXLUA_DEBUG_STARTDEBUGGER,       -1, -1, wxLuaDebugEventHandler(fn), (wxObject *) NULL),
! #define EVT_WXLUA_DEBUG_STOPDEBUGGER(fn)         DECLARE_EVENT_TABLE_ENTRY(wxEVT_WXLUA_DEBUG_STOPDEBUGGER,        -1, -1, wxLuaDebugEventHandler(fn), (wxObject *) NULL),
! #define EVT_WXLUA_DEBUG_BREAKPOINT_ADDED(fn)     DECLARE_EVENT_TABLE_ENTRY(wxEVT_WXLUA_DEBUG_BREAKPOINT_ADDED,    -1, -1, wxLuaDebugEventHandler(fn), (wxObject *) NULL),
! #define EVT_WXLUA_DEBUG_BREAKPOINT_REMOVED(fn)   DECLARE_EVENT_TABLE_ENTRY(wxEVT_WXLUA_DEBUG_BREAKPOINT_REMOVED,  -1, -1, wxLuaDebugEventHandler(fn), (wxObject *) NULL),
  
  #endif // WX_LUA_DEBUG_H