From: John L. <jr...@us...> - 2009-09-27 03:14:07
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/include In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv24793/wxLua/modules/wxlua/include Modified Files: wxlbind.h wxldefs.h Log Message: Move wx/wxprec.h before __BORLANDC__ pragma hdrstop as it should be in cpp binding files. Move hook_cpp_binding_includes in genwxbind.lua to be written before any other code. Comment cleanup in some headers. Index: wxldefs.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxldefs.h,v retrieving revision 1.48 retrieving revision 1.49 diff -C2 -d -r1.48 -r1.49 *** wxldefs.h 25 Sep 2009 18:47:58 -0000 1.48 --- wxldefs.h 27 Sep 2009 03:13:55 -0000 1.49 *************** *** 57,66 **** //----------------------------------------------------------------------------- ! // This is an internal use binding generator version whos number is // incremented every time something changes that requires a regeneration // of the bindings. The check is written into the generated bindings to // give a compile time error. // If this number is incremented the variable by the same name must be updated ! // in genwxbind.lua must be updated as well. //----------------------------------------------------------------------------- --- 57,66 ---- //----------------------------------------------------------------------------- ! // This is an internal use binding generator version whose number is // incremented every time something changes that requires a regeneration // of the bindings. The check is written into the generated bindings to // give a compile time error. // If this number is incremented the variable by the same name must be updated ! // in genwxbind.lua as well. //----------------------------------------------------------------------------- *************** *** 77,84 **** // ---------------------------------------------------------------------------- ! // WXDLLIMPEXP macros // ---------------------------------------------------------------------------- - // These are our DLL macros (see the contrib libs like wxPlot) #ifdef WXMAKINGDLL_WXLUA #define WXDLLIMPEXP_WXLUA WXEXPORT --- 77,84 ---- // ---------------------------------------------------------------------------- ! // WXDLLIMPEXP macros for DLL export, import, or neither for static libs. ! // see wxWidgets include/wx/dlimpexp.h // ---------------------------------------------------------------------------- #ifdef WXMAKINGDLL_WXLUA #define WXDLLIMPEXP_WXLUA WXEXPORT Index: wxlbind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlbind.h,v retrieving revision 1.88 retrieving revision 1.89 diff -C2 -d -r1.88 -r1.89 *** wxlbind.h 25 Sep 2009 18:47:58 -0000 1.88 --- wxlbind.h 27 Sep 2009 03:13:55 -0000 1.89 *************** *** 35,39 **** // and is used as an end marker for the wxLuaArgType array that // represents function prototype argument types in the wxLuaBindCFunc struct ! // and it must always be 0. // wxLua types for Lua types --- 35,40 ---- // and is used as an end marker for the wxLuaArgType array that // represents function prototype argument types in the wxLuaBindCFunc struct ! // and it must always be 0. The Lua type LUA_TNONE starts at 1 since ! // Lua arrays start at 1. // wxLua types for Lua types *************** *** 102,108 **** // Note that we do not use the original since we may not be linked // to the binding library that defines them. ! extern WXDLLIMPEXP_DATA_WXLUA(int*) p_wxluatype_wxEvent; // wxLua type for wxEvents ! extern WXDLLIMPEXP_DATA_WXLUA(int*) p_wxluatype_wxWindow; // wxLua type for wxWindows ! extern WXDLLIMPEXP_DATA_WXLUA(int*) p_wxluatype_wxString; // wxLua type for wxStrings extern WXDLLIMPEXP_DATA_WXLUA(int*) p_wxluatype_wxArrayString; // wxLua type for wxArrayString extern WXDLLIMPEXP_DATA_WXLUA(int*) p_wxluatype_wxSortedArrayString; // wxLua type for wxSortedArrayString --- 103,109 ---- // Note that we do not use the original since we may not be linked // to the binding library that defines them. ! extern WXDLLIMPEXP_DATA_WXLUA(int*) p_wxluatype_wxEvent; // wxLua type for wxEvent ! extern WXDLLIMPEXP_DATA_WXLUA(int*) p_wxluatype_wxWindow; // wxLua type for wxWindow ! extern WXDLLIMPEXP_DATA_WXLUA(int*) p_wxluatype_wxString; // wxLua type for wxString extern WXDLLIMPEXP_DATA_WXLUA(int*) p_wxluatype_wxArrayString; // wxLua type for wxArrayString extern WXDLLIMPEXP_DATA_WXLUA(int*) p_wxluatype_wxSortedArrayString; // wxLua type for wxSortedArrayString *************** *** 215,218 **** --- 216,220 ---- const void* objPtr; // Pointer to the object, e.g. &wxDefaultPosition const void** pObjPtr; // Pointer to the object pointer, e.g. (const void **)&wxThePenList + // This is done since the object may not be created at compile time. }; *************** *** 269,276 **** // ---------------------------------------------------------------------------- ! // Redirect a Lua function call to 1 wxLuaBindCFunc from a list of overloaded functions. // The 1st upvalue must be a wxLuaBindMethod. ! int LUACALL wxlua_callOverloadedFunction(lua_State* L); ! // Redirect a Lua function call to 1 wxLuaBindCFunc from a list of overloaded functions // declared in the wxLuaBindMethod. WXDLLIMPEXP_WXLUA int LUACALL wxlua_callOverloadedFunction(lua_State* L, struct wxLuaBindMethod* wxlMethod); --- 271,278 ---- // ---------------------------------------------------------------------------- ! // Redirect a Lua function call to one wxLuaBindCFunc from a list of overloaded functions. // The 1st upvalue must be a wxLuaBindMethod. ! WXDLLIMPEXP_WXLUA int LUACALL wxlua_callOverloadedFunction(lua_State* L); ! // Redirect a Lua function call to one wxLuaBindCFunc from a list of overloaded functions // declared in the wxLuaBindMethod. WXDLLIMPEXP_WXLUA int LUACALL wxlua_callOverloadedFunction(lua_State* L, struct wxLuaBindMethod* wxlMethod); *************** *** 383,404 **** } - #define wxGridCellWorkerDummyFriend wxGridCellWorkerDummyFriend; \ - public: \ - size_t GetRef() const { return m_nRef; } - - #define wxGridCellAttrDummyFriend wxGridCellAttrDummyFriend; \ - public: \ - size_t GetRef() const { return m_nRef; } - - #include "wx/grid.h" - - // The wxGridWorker classes have protected destructors, use DecRef(). - #define wxLUA_IMPLEMENT_wxGridCellWorker_ENCAPSULATION(className, objName) \ - IMPLEMENT_ABSTRACT_CLASS(wxLua_wxObject_##objName, wxObject) \ - wxLua_wxObject_##objName::~wxLua_wxObject_##objName() \ - { \ - m_p##objName->DecRef(); \ - } - // ---------------------------------------------------------------------------- // wxLuaSmartStringArray - Wraps a "new" array of wxStrings with an automatic --- 385,388 ---- |