From: John L. <jr...@us...> - 2007-07-26 02:51:41
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv1312/wxLua/modules/wxlua/include Modified Files: wxlbind.h wxlcallb.h Log Message: Update comments Index: wxlcallb.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlcallb.h,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** wxlcallb.h 12 Jun 2007 00:08:42 -0000 1.16 --- wxlcallb.h 26 Jul 2007 02:51:37 -0000 1.17 *************** *** 16,24 **** // ---------------------------------------------------------------------------- // wxLuaCallback - Forward events from C++ wxWidgets wxEvtHandlers to lua functions ! // // The wxLuaCallback is created with the wxLuaState, the stack index of the ! // lua function to call when an event is received, the window id ranges, and ! // the wxEventType to connect to the wxEvtHandler with this as the callback ! // user data for event. // // Do NOT delete this, the wxEvtHandler deletes the callback user data itself. --- 16,24 ---- // ---------------------------------------------------------------------------- // wxLuaCallback - Forward events from C++ wxWidgets wxEvtHandlers to lua functions ! // // The wxLuaCallback is created with the wxLuaState, the stack index of the ! // lua function to call when an event is received, the window id ranges, and ! // the wxEventType to connect to the wxEvtHandler with this as the callback ! // user data for event. // // Do NOT delete this, the wxEvtHandler deletes the callback user data itself. *************** *** 50,62 **** // Central event handler that calls CallFunction() for the actual ! // wxLuaCallback callback user data. This function is treated like a // static function that all handlers of this class will call. void EventHandler(wxEvent& event); ! // Handle the event by calling the lua function to handle the event. // The lua function will receive a single parameter, the type of event. virtual void CallFunction(wxEvent *event); ! protected: int m_routine; // ref to the lua routine to call in the wxLuaReferences registry table wxLuaState m_wxlState; // store it since we're added to a list of it's callbacks. --- 50,62 ---- // Central event handler that calls CallFunction() for the actual ! // wxLuaCallback callback user data. This function is treated like a // static function that all handlers of this class will call. void EventHandler(wxEvent& event); ! // Handle the event by calling the lua function to handle the event. // The lua function will receive a single parameter, the type of event. virtual void CallFunction(wxEvent *event); ! protected: int m_routine; // ref to the lua routine to call in the wxLuaReferences registry table wxLuaState m_wxlState; // store it since we're added to a list of it's callbacks. *************** *** 71,75 **** // ---------------------------------------------------------------------------- ! // wxLuaWinDestroyCallback - Handle the wxEVT_DESTROY event from wxWindows. // // Removes the reference to the window so lua won't delete it. --- 71,75 ---- // ---------------------------------------------------------------------------- ! // wxLuaWinDestroyCallback - Handle the wxEVT_DESTROY event from wxWindows. // // Removes the reference to the window so lua won't delete it. *************** *** 97,104 **** void EventHandler(wxWindowDestroyEvent& event); ! // Handle the event by clearing the metatable for the window virtual void OnDestroy(wxWindowDestroyEvent& event); ! protected: wxLuaState m_wxlState; // store it since we're added to a list of it's callbacks. wxEvtHandler* m_evtHandler; --- 97,104 ---- void EventHandler(wxWindowDestroyEvent& event); ! // Handle the event by clearing the metatable for the window virtual void OnDestroy(wxWindowDestroyEvent& event); ! protected: wxLuaState m_wxlState; // store it since we're added to a list of it's callbacks. wxEvtHandler* m_evtHandler; Index: wxlbind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlbind.h,v retrieving revision 1.55 retrieving revision 1.56 diff -C2 -d -r1.55 -r1.56 *** wxlbind.h 25 Jun 2007 23:04:00 -0000 1.55 --- wxlbind.h 26 Jul 2007 02:51:37 -0000 1.56 *************** *** 116,122 **** int maxargs; // total number of args allowed wxLuaArgTag* argtags; // array of lua tags representing each argument, zero terminated ! // NOTE: there may less argtags than maxargs if this is an // overloaded function since the argtags == s_wxluaargArray_None ! // but the maxargs is the maxargs of all the overloaded functions }; --- 116,122 ---- int maxargs; // total number of args allowed wxLuaArgTag* argtags; // array of lua tags representing each argument, zero terminated ! // NOTE: there may be less argtags than minargs if this is an // overloaded function since the argtags == s_wxluaargArray_None ! // but the minargs are the min of minargs of all the overloaded functions }; *************** *** 194,199 **** void *GetObject() const { return m_pObject; } ! wxLuaBindMethod *m_wxlMethod; ! void *m_pObject; }; --- 194,199 ---- void *GetObject() const { return m_pObject; } ! wxLuaBindMethod *m_wxlMethod; // Method to call for Lua's __call ! void *m_pObject; // the actual object wrapped by a Lua userdata }; *************** *** 257,265 **** private: ! wxLuaState* m_wxlState; // a pointer due to include recursion. ! int m_reference; ! wxLuaObject_Type m_alloc_flag; ! union { bool m_bool; --- 257,266 ---- private: ! wxLuaState* m_wxlState; // a pointer due to include recursion. ! int m_reference; // reference in wxLuaReferences registry table ! wxLuaObject_Type m_alloc_flag; // type of object for wxValidator interface ! ! union // object stored for wxValidator interface { bool m_bool; *************** *** 396,400 **** // Look for the base class of the input wxLuaBindClass in this binding using the // baseclassName of the input and if found, set the wxLuaBindClass::baseclass ! // member of the input. bool SetBaseClass(wxLuaBindClass *pClass); --- 397,402 ---- // Look for the base class of the input wxLuaBindClass in this binding using the // baseclassName of the input and if found, set the wxLuaBindClass::baseclass ! // member of the input. This function is called by the wxLuaState during ! // creation and should not be called afterwards. bool SetBaseClass(wxLuaBindClass *pClass); *************** *** 472,476 **** static wxLuaBindingList sm_bindingList; ! DECLARE_DYNAMIC_CLASS(wxLuaBinding) }; --- 474,478 ---- static wxLuaBindingList sm_bindingList; ! DECLARE_ABSTRACT_CLASS(wxLuaBinding) }; |