From: John L. <jr...@us...> - 2007-03-15 00:01:51
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv15657/wxLua/modules/wxbind/include Modified Files: wxbind.h Log Message: Remove wxLua_AddTrackedObject functions and just use wxLuaState::AddTrackedObject directly Remove all gc (destructor, LuaDelete) functions from the methods of a class since we can delete the objects in the single gc function in wxlbind.cpp anyway. Index: wxbind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxbind.h,v retrieving revision 1.60 retrieving revision 1.61 diff -C2 -d -r1.60 -r1.61 *** wxbind.h 13 Mar 2007 23:01:54 -0000 1.60 --- wxbind.h 15 Mar 2007 00:01:13 -0000 1.61 *************** *** 43,49 **** // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 5 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 5 // --------------------------------------------------------------------------- --- 43,49 ---- // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 6 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 6 // --------------------------------------------------------------------------- *************** *** 296,299 **** --- 296,300 ---- #include "wx/config.h" #include "wx/fileconf.h" + #include "wx/memconf.h" #endif // wxLUA_USE_wxConfig && wxUSE_CONFIG *************** *** 698,706 **** #endif // (defined(__WXMSW__) || defined(__WXMAC__)) && (wxLUA_USE_wxPrint && wxUSE_PRINTING_ARCHITECTURE) - #if (defined(__WXMSW__)) && (wxLUA_USE_wxBitmap) - extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxBitmapHandler; - extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxGDIImageHandler; - #endif // (defined(__WXMSW__)) && (wxLUA_USE_wxBitmap) - #if (defined(__WXMSW__)) && (wxLUA_USE_wxHelpController && wxUSE_HELP) extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxBestHelpController; --- 699,702 ---- *************** *** 708,715 **** #endif // (defined(__WXMSW__)) && (wxLUA_USE_wxHelpController && wxUSE_HELP) - #if (wxCHECK_VERSION(2,5,0) && defined(__WXMSW__)) && (wxLUA_USE_wxBitmap) - extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxGDIImageHandlerList; - #endif // (wxCHECK_VERSION(2,5,0) && defined(__WXMSW__)) && (wxLUA_USE_wxBitmap) - #if (wxCHECK_VERSION(2,6,0) && wxUSE_SOUND) && (wxLUA_USE_wxWave) extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxSound; --- 704,707 ---- *************** *** 1032,1035 **** --- 1024,1028 ---- extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxConfigPathChanger; extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxFileConfig; + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxMemoryConfig; #endif // wxLUA_USE_wxConfig && wxUSE_CONFIG *************** *** 1611,1621 **** #endif // (defined(__WXMSW__) || defined(__WXMAC__)) && (wxLUA_USE_wxPrint && wxUSE_PRINTING_ARCHITECTURE) - #if (defined(__WXMSW__)) && (wxLUA_USE_wxBitmap) - extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxBitmapHandler_methods[]; - extern WXDLLIMPEXP_DATA_WXBIND(int) wxBitmapHandler_methodCount; - extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxGDIImageHandler_methods[]; - extern WXDLLIMPEXP_DATA_WXBIND(int) wxGDIImageHandler_methodCount; - #endif // (defined(__WXMSW__)) && (wxLUA_USE_wxBitmap) - #if (defined(__WXMSW__)) && (wxLUA_USE_wxHelpController && wxUSE_HELP) extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxBestHelpController_methods[]; --- 1604,1607 ---- *************** *** 1625,1633 **** #endif // (defined(__WXMSW__)) && (wxLUA_USE_wxHelpController && wxUSE_HELP) - #if (wxCHECK_VERSION(2,5,0) && defined(__WXMSW__)) && (wxLUA_USE_wxBitmap) - extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxGDIImageHandlerList_methods[]; - extern WXDLLIMPEXP_DATA_WXBIND(int) wxGDIImageHandlerList_methodCount; - #endif // (wxCHECK_VERSION(2,5,0) && defined(__WXMSW__)) && (wxLUA_USE_wxBitmap) - #if (wxCHECK_VERSION(2,6,0) && wxUSE_SOUND) && (wxLUA_USE_wxWave) extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxSound_methods[]; --- 1611,1614 ---- *************** *** 2091,2094 **** --- 2072,2077 ---- extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxFileConfig_methods[]; extern WXDLLIMPEXP_DATA_WXBIND(int) wxFileConfig_methodCount; + extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxMemoryConfig_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxMemoryConfig_methodCount; #endif // wxLUA_USE_wxConfig && wxUSE_CONFIG |