Update of /cvsroot/wxlua/wxLua/modules/wxlua/include
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv21439/wxLua/modules/wxlua/include
Modified Files:
wxlbind.h wxlcallb.h
Log Message:
init all image handlers in luamodule to make things easy
simplify wxLuaSmartXXX by adding operator type*() so it can be used as is
fix lua callback to clear the correct wxluastate and some formatting
add destroy handler list to things shown in the stacktree and show items for them
Index: wxlcallb.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlcallb.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** wxlcallb.h 23 Apr 2006 19:36:50 -0000 1.9
--- wxlcallb.h 14 May 2006 17:45:05 -0000 1.10
***************
*** 25,37 ****
{
public:
! wxLuaCallback( const wxLuaState& state,
! int theRoutine,
! wxWindowID id,
! wxEventType eventType,
wxEvtHandler *pHandler );
virtual ~wxLuaCallback();
! void ClearLuaState() { m_wxlState.UnRef(); }
wxLuaState GetwxLuaState() const { return m_wxlState; }
--- 25,35 ----
{
public:
! wxLuaCallback( const wxLuaState& state, int theRoutine,
! wxWindowID id, wxEventType eventType,
wxEvtHandler *pHandler );
virtual ~wxLuaCallback();
! void ClearLuaState() { m_wxlState.UnRef(); }
wxLuaState GetwxLuaState() const { return m_wxlState; }
***************
*** 53,63 ****
// reference to the lua routine to call
! int m_routine;
// store the wxLuaState since we're added to a list of it's callbacks.
! wxLuaState m_wxlState;
! wxEvtHandler *m_pHandler;
! wxWindowID m_id;
! wxEventType m_eventType;
private:
--- 51,61 ----
// reference to the lua routine to call
! int m_routine;
// store the wxLuaState since we're added to a list of it's callbacks.
! wxLuaState m_wxlState;
! wxEvtHandler* m_pHandler;
! wxWindowID m_id;
! wxEventType m_eventType;
private:
***************
*** 74,84 ****
public:
wxLuaDestroyCallback( const wxLuaState& state,
! wxWindowID id,
! wxEvtHandler *pHandler,
! int iTag);
virtual ~wxLuaDestroyCallback();
! void ClearLuaState() { m_wxlState.UnRef(); }
wxLuaState GetwxLuaState() const { return m_wxlState; }
--- 72,81 ----
public:
wxLuaDestroyCallback( const wxLuaState& state,
! wxWindowID id, wxEvtHandler *pHandler,
! int iTag );
virtual ~wxLuaDestroyCallback();
! void ClearLuaState() { m_wxlState.UnRef(); }
wxLuaState GetwxLuaState() const { return m_wxlState; }
***************
*** 93,97 ****
// store the wxLuaState since we're added to a list of it's callbacks.
wxLuaState m_wxlState;
! wxEvtHandler *m_pHandler;
int m_id;
--- 90,94 ----
// store the wxLuaState since we're added to a list of it's callbacks.
wxLuaState m_wxlState;
! wxEvtHandler* m_pHandler;
int m_id;
Index: wxlbind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlbind.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** wxlbind.h 14 May 2006 07:48:09 -0000 1.16
--- wxlbind.h 14 May 2006 17:45:05 -0000 1.17
***************
*** 39,43 ****
// ----------------------------------------------------------------------------
! enum LuaType // The type of a Lua method
{
LuaDelete = 1, // gc routine
--- 39,43 ----
// ----------------------------------------------------------------------------
! enum LuaType // The type of a Lua method
{
LuaDelete = 1, // gc routine
***************
*** 62,66 ****
};
! // wxlua arg tags for common lua types
extern int s_wxluaarg_String;
extern int s_wxluaarg_Boolean;
--- 62,66 ----
};
! // wxlua arg tags for common lua types
extern int s_wxluaarg_String;
extern int s_wxluaarg_Boolean;
***************
*** 199,202 ****
--- 199,203 ----
void operator = (wxString *strArr) { m_strArr = strArr; }
+ operator const wxString *() const { return m_strArr; }
private:
***************
*** 215,218 ****
--- 216,220 ----
void operator = (int *intArr) { m_intArr = intArr; }
+ operator const int *() const { return m_intArr; }
private:
|
