Menu
▾
▴
[Wxlua-commit] wxLua/modules/wxlua/include wxlbind.h, 1.86, 1.87 wxlcallb.h, 1.29, 1.30 wxldefs.h, 1.46, 1.47 wxlstate.h, 1.123, 1.124 wxlua_bind.h, 1.17, 1.18
|
From: John L. <jr...@us...> - 2009-05-19 03:21:07
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/include In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv15045/wxLua/modules/wxlua/include Modified Files: wxlbind.h wxlcallb.h wxldefs.h wxlstate.h wxlua_bind.h Log Message: Do not export parts of the bindings that are only used internally. Declare them as extern within the cpp file of the binding. Index: wxlcallb.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlcallb.h,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** wxlcallb.h 17 Mar 2008 03:05:04 -0000 1.29 --- wxlcallb.h 19 May 2009 03:20:53 -0000 1.30 *************** *** 48,52 **** // If only one event Id is needed set last_id = wxID_ANY // Returns an empty string on success and the wxEvtHandler takes ownership of this, ! // otherwise an error message and you must delete this since nobody else will. virtual wxString Connect( const wxLuaState& wxlState, int lua_func_stack_idx, wxWindowID win_id, wxWindowID last_id, --- 48,52 ---- // If only one event Id is needed set last_id = wxID_ANY // Returns an empty string on success and the wxEvtHandler takes ownership of this, ! // otherwise an error message is returned and you must delete this since nobody else will. virtual wxString Connect( const wxLuaState& wxlState, int lua_func_stack_idx, wxWindowID win_id, wxWindowID last_id, *************** *** 97,101 **** // an error message in Lua. // ! // Do NOT delete this, the wxEvtHandler deletes the callback user data itself. // // The function OnAllDestroyEvents() generically handles the events and forwards them --- 97,102 ---- // an error message in Lua. // ! // Do NOT delete this, the wxEvtHandler deletes the callback user data itself ! // unless it is !Ok() since that means it wasn't attached to the window. // // The function OnAllDestroyEvents() generically handles the events and forwards them *************** *** 115,118 **** --- 116,123 ---- wxWindow* GetWindow() const { return m_window; } + // If Ok then this should be attached to a wxEVT_DESTROY callback + // else you should delete this since nobody else will. + bool Ok() const { return m_wxlState.Ok() && (m_window != NULL); } + // Get a human readable string // "wxWindowClassName(&win, id=%d)|wxLuaDestroyCallback(&callback)" Index: wxldefs.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxldefs.h,v retrieving revision 1.46 retrieving revision 1.47 diff -C2 -d -r1.46 -r1.47 *** wxldefs.h 31 Mar 2009 04:23:42 -0000 1.46 --- wxldefs.h 19 May 2009 03:20:53 -0000 1.47 *************** *** 65,69 **** //----------------------------------------------------------------------------- ! #define WXLUA_BINDING_VERSION 26 // ---------------------------------------------------------------------------- --- 65,69 ---- //----------------------------------------------------------------------------- ! #define WXLUA_BINDING_VERSION 27 // ---------------------------------------------------------------------------- Index: wxlbind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlbind.h,v retrieving revision 1.86 retrieving revision 1.87 diff -C2 -d -r1.86 -r1.87 *** wxlbind.h 14 May 2009 05:06:21 -0000 1.86 --- wxlbind.h 19 May 2009 03:20:53 -0000 1.87 *************** *** 28,32 **** // are shifted to be positive values. // The Binding wxLua types are positive integers generated automatically when ! // initialized and start at WXLUA_T_MAX+1. // *Use the function bool wxlua_iswxuserdatatype(wxl_type) if you want to // differentiate between the two. --- 28,32 ---- // are shifted to be positive values. // The Binding wxLua types are positive integers generated automatically when ! // wxLua is initialized and start at WXLUA_T_MAX+1. // *Use the function bool wxlua_iswxuserdatatype(wxl_type) if you want to // differentiate between the two. *************** *** 154,158 **** int minargs; // Min number of required args int maxargs; // Max number of args allowed ! wxLuaArgType* argtypes; // Array of wxLua types representing each argument, zero terminated. }; --- 154,158 ---- int minargs; // Min number of required args int maxargs; // Max number of args allowed ! wxLuaArgType* argtypes; // Array of wxLua types representing each argument, NULL terminated. }; Index: wxlstate.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlstate.h,v retrieving revision 1.123 retrieving revision 1.124 diff -C2 -d -r1.123 -r1.124 *** wxlstate.h 24 Mar 2009 04:15:31 -0000 1.123 --- wxlstate.h 19 May 2009 03:20:53 -0000 1.124 *************** *** 94,98 **** // Light userdata used as keys in the Lua LUA_REGISTRYINDEX table for wxLua. ! // Note that even though these keys have values, they're not used, just the memory address. // The key in the LUA_REGISTRYINDEX table that is a numerically keyed table indexed --- 94,99 ---- // Light userdata used as keys in the Lua LUA_REGISTRYINDEX table for wxLua. ! // Note that even though these keys have human readable names as values, ! // they're not used, just the memory address. // The key in the LUA_REGISTRYINDEX table that is a numerically keyed table indexed Index: wxlua_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlua_bind.h,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** wxlua_bind.h 31 Mar 2009 04:23:42 -0000 1.17 --- wxlua_bind.h 19 May 2009 03:20:53 -0000 1.18 *************** *** 17,23 **** // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 26 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 26 // --------------------------------------------------------------------------- --- 17,23 ---- // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 27 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 27 // --------------------------------------------------------------------------- *************** *** 49,57 **** extern WXDLLIMPEXP_DATA_WXLUA(int) wxluatype_wxLuaObject; - extern WXDLLIMPEXP_WXLUA wxLuaBindMethod wxLuaObject_methods[]; - extern WXDLLIMPEXP_DATA_WXLUA(int) wxLuaObject_methodCount; extern WXDLLIMPEXP_DATA_WXLUA(int) wxluatype_wxLuaState; - extern WXDLLIMPEXP_WXLUA wxLuaBindMethod wxLuaState_methods[]; - extern WXDLLIMPEXP_DATA_WXLUA(int) wxLuaState_methodCount; --- 49,53 ---- |
