Menu
▾
▴
wxlua-commit — CVS commits of wxLua
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(191) |
Jul
(1) |
Aug
(2) |
Sep
|
Oct
|
Nov
(238) |
Dec
(68) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(104) |
Feb
(518) |
Mar
(302) |
Apr
(211) |
May
(311) |
Jun
(55) |
Jul
(6) |
Aug
(35) |
Sep
(76) |
Oct
(50) |
Nov
(37) |
Dec
(340) |
| 2007 |
Jan
(23) |
Feb
(107) |
Mar
(98) |
Apr
(60) |
May
(136) |
Jun
(371) |
Jul
(175) |
Aug
(74) |
Sep
(3) |
Oct
(2) |
Nov
(53) |
Dec
(129) |
| 2008 |
Jan
(337) |
Feb
(23) |
Mar
(18) |
Apr
(4) |
May
(3) |
Jun
|
Jul
|
Aug
(4) |
Sep
|
Oct
(33) |
Nov
|
Dec
(26) |
| 2009 |
Jan
(4) |
Feb
(1) |
Mar
(15) |
Apr
|
May
(35) |
Jun
(11) |
Jul
|
Aug
|
Sep
(19) |
Oct
(26) |
Nov
(11) |
Dec
(11) |
| 2010 |
Jan
(4) |
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
(8) |
Sep
|
Oct
|
Nov
(8) |
Dec
(7) |
| 2011 |
Jan
|
Feb
|
Mar
(4) |
Apr
(8) |
May
(5) |
Jun
(8) |
Jul
(1) |
Aug
|
Sep
|
Oct
(5) |
Nov
(13) |
Dec
|
|
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 ---- |
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv24793/wxLua/modules/wxbind/src Modified Files: wxadv_bind.cpp wxaui_bind.cpp wxbase_base.cpp wxbase_bind.cpp wxbase_config.cpp wxbase_data.cpp wxbase_datetime.cpp wxbase_file.cpp wxcore_appframe.cpp wxcore_bind.cpp wxcore_clipdrag.cpp wxcore_controls.cpp wxcore_core.cpp wxcore_defsutils.cpp wxcore_dialogs.cpp wxcore_event.cpp wxcore_gdi.cpp wxcore_geometry.cpp wxcore_help.cpp wxcore_image.cpp wxcore_mdi.cpp wxcore_menutool.cpp wxcore_picker.cpp wxcore_print.cpp wxcore_sizer.cpp wxcore_windows.cpp wxgl_bind.cpp wxhtml_bind.cpp wxmedia_bind.cpp wxnet_bind.cpp wxrichtext_bind.cpp wxstc_bind.cpp wxxml_bind.cpp wxxrc_bind.cpp 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: wxcore_core.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxcore_core.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** wxcore_core.cpp 24 Mar 2009 04:15:24 -0000 1.13 --- wxcore_core.cpp 27 Sep 2009 03:13:53 -0000 1.14 *************** *** 5,19 **** // --------------------------------------------------------------------------- #ifdef __BORLANDC__ #pragma hdrstop #endif - #include "wx/wxprec.h" - #ifndef WX_PRECOMP #include "wx/wx.h" #endif - #include "wxlua/include/wxlstate.h" #include "wxbind/include/wxcore_bind.h" --- 5,19 ---- // --------------------------------------------------------------------------- + + #include "wx/wxprec.h" + #ifdef __BORLANDC__ #pragma hdrstop #endif #ifndef WX_PRECOMP #include "wx/wx.h" #endif #include "wxlua/include/wxlstate.h" #include "wxbind/include/wxcore_bind.h" Index: wxcore_clipdrag.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxcore_clipdrag.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** wxcore_clipdrag.cpp 24 Mar 2009 04:15:19 -0000 1.15 --- wxcore_clipdrag.cpp 27 Sep 2009 03:13:53 -0000 1.16 *************** *** 5,19 **** // --------------------------------------------------------------------------- #ifdef __BORLANDC__ #pragma hdrstop #endif - #include "wx/wxprec.h" - #ifndef WX_PRECOMP #include "wx/wx.h" #endif - #include "wxlua/include/wxlstate.h" #include "wxbind/include/wxcore_bind.h" --- 5,19 ---- // --------------------------------------------------------------------------- + + #include "wx/wxprec.h" + #ifdef __BORLANDC__ #pragma hdrstop #endif #ifndef WX_PRECOMP #include "wx/wx.h" #endif #include "wxlua/include/wxlstate.h" #include "wxbind/include/wxcore_bind.h" Index: wxcore_event.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxcore_event.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** wxcore_event.cpp 24 Mar 2009 04:15:25 -0000 1.16 --- wxcore_event.cpp 27 Sep 2009 03:13:53 -0000 1.17 *************** *** 5,19 **** // --------------------------------------------------------------------------- #ifdef __BORLANDC__ #pragma hdrstop #endif - #include "wx/wxprec.h" - #ifndef WX_PRECOMP #include "wx/wx.h" #endif - #include "wxlua/include/wxlstate.h" #include "wxbind/include/wxcore_bind.h" --- 5,19 ---- // --------------------------------------------------------------------------- + + #include "wx/wxprec.h" + #ifdef __BORLANDC__ #pragma hdrstop #endif #ifndef WX_PRECOMP #include "wx/wx.h" #endif #include "wxlua/include/wxlstate.h" #include "wxbind/include/wxcore_bind.h" Index: wxaui_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxaui_bind.cpp,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** wxaui_bind.cpp 25 Sep 2009 18:47:57 -0000 1.19 --- wxaui_bind.cpp 27 Sep 2009 03:13:51 -0000 1.20 *************** *** 5,19 **** // --------------------------------------------------------------------------- #ifdef __BORLANDC__ #pragma hdrstop #endif - #include "wx/wxprec.h" - #ifndef WX_PRECOMP #include "wx/wx.h" #endif - #include "wxlua/include/wxlstate.h" #include "wxbind/include/wxaui_bind.h" --- 5,19 ---- // --------------------------------------------------------------------------- + + #include "wx/wxprec.h" + #ifdef __BORLANDC__ #pragma hdrstop #endif #ifndef WX_PRECOMP #include "wx/wx.h" #endif #include "wxlua/include/wxlstate.h" #include "wxbind/include/wxaui_bind.h" Index: wxcore_gdi.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxcore_gdi.cpp,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** wxcore_gdi.cpp 31 Mar 2009 04:23:42 -0000 1.22 --- wxcore_gdi.cpp 27 Sep 2009 03:13:53 -0000 1.23 *************** *** 5,19 **** // --------------------------------------------------------------------------- #ifdef __BORLANDC__ #pragma hdrstop #endif - #include "wx/wxprec.h" - #ifndef WX_PRECOMP #include "wx/wx.h" #endif - #include "wxlua/include/wxlstate.h" #include "wxbind/include/wxcore_bind.h" --- 5,19 ---- // --------------------------------------------------------------------------- + + #include "wx/wxprec.h" + #ifdef __BORLANDC__ #pragma hdrstop #endif #ifndef WX_PRECOMP #include "wx/wx.h" #endif #include "wxlua/include/wxlstate.h" #include "wxbind/include/wxcore_bind.h" Index: wxbase_data.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxbase_data.cpp,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** wxbase_data.cpp 19 May 2009 03:20:53 -0000 1.20 --- wxbase_data.cpp 27 Sep 2009 03:13:52 -0000 1.21 *************** *** 5,19 **** // --------------------------------------------------------------------------- #ifdef __BORLANDC__ #pragma hdrstop #endif - #include "wx/wxprec.h" - #ifndef WX_PRECOMP #include "wx/wx.h" #endif - #include "wxlua/include/wxlstate.h" #include "wxbind/include/wxbase_bind.h" --- 5,19 ---- // --------------------------------------------------------------------------- + + #include "wx/wxprec.h" + #ifdef __BORLANDC__ #pragma hdrstop #endif #ifndef WX_PRECOMP #include "wx/wx.h" #endif #include "wxlua/include/wxlstate.h" #include "wxbind/include/wxbase_bind.h" Index: wxbase_config.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxbase_config.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** wxbase_config.cpp 29 Jan 2008 04:22:51 -0000 1.13 --- wxbase_config.cpp 27 Sep 2009 03:13:52 -0000 1.14 *************** *** 5,19 **** // --------------------------------------------------------------------------- #ifdef __BORLANDC__ #pragma hdrstop #endif - #include "wx/wxprec.h" - #ifndef WX_PRECOMP #include "wx/wx.h" #endif - #include "wxlua/include/wxlstate.h" #include "wxbind/include/wxbase_bind.h" --- 5,19 ---- // --------------------------------------------------------------------------- + + #include "wx/wxprec.h" + #ifdef __BORLANDC__ #pragma hdrstop #endif #ifndef WX_PRECOMP #include "wx/wx.h" #endif #include "wxlua/include/wxlstate.h" #include "wxbind/include/wxbase_bind.h" Index: wxxrc_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxxrc_bind.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** wxxrc_bind.cpp 25 Sep 2009 18:47:58 -0000 1.13 --- wxxrc_bind.cpp 27 Sep 2009 03:13:55 -0000 1.14 *************** *** 5,19 **** // --------------------------------------------------------------------------- #ifdef __BORLANDC__ #pragma hdrstop #endif - #include "wx/wxprec.h" - #ifndef WX_PRECOMP #include "wx/wx.h" #endif - #include "wxlua/include/wxlstate.h" #include "wxbind/include/wxxrc_bind.h" --- 5,19 ---- // --------------------------------------------------------------------------- + + #include "wx/wxprec.h" + #ifdef __BORLANDC__ #pragma hdrstop #endif #ifndef WX_PRECOMP #include "wx/wx.h" #endif #include "wxlua/include/wxlstate.h" #include "wxbind/include/wxxrc_bind.h" Index: wxgl_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxgl_bind.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** wxgl_bind.cpp 25 Sep 2009 18:47:58 -0000 1.13 --- wxgl_bind.cpp 27 Sep 2009 03:13:55 -0000 1.14 *************** *** 5,19 **** // --------------------------------------------------------------------------- #ifdef __BORLANDC__ #pragma hdrstop #endif - #include "wx/wxprec.h" - #ifndef WX_PRECOMP #include "wx/wx.h" #endif - #include "wxlua/include/wxlstate.h" #include "wxbind/include/wxgl_bind.h" --- 5,19 ---- // --------------------------------------------------------------------------- + + #include "wx/wxprec.h" + #ifdef __BORLANDC__ #pragma hdrstop #endif #ifndef WX_PRECOMP #include "wx/wx.h" #endif #include "wxlua/include/wxlstate.h" #include "wxbind/include/wxgl_bind.h" Index: wxmedia_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxmedia_bind.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** wxmedia_bind.cpp 25 Sep 2009 18:47:58 -0000 1.14 --- wxmedia_bind.cpp 27 Sep 2009 03:13:55 -0000 1.15 *************** *** 5,19 **** // --------------------------------------------------------------------------- #ifdef __BORLANDC__ #pragma hdrstop #endif - #include "wx/wxprec.h" - #ifndef WX_PRECOMP #include "wx/wx.h" #endif - #include "wxlua/include/wxlstate.h" #include "wxbind/include/wxmedia_bind.h" --- 5,19 ---- // --------------------------------------------------------------------------- + + #include "wx/wxprec.h" + #ifdef __BORLANDC__ #pragma hdrstop #endif #ifndef WX_PRECOMP #include "wx/wx.h" #endif #include "wxlua/include/wxlstate.h" #include "wxbind/include/wxmedia_bind.h" Index: wxcore_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxcore_bind.cpp,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** wxcore_bind.cpp 25 Sep 2009 18:47:57 -0000 1.25 --- wxcore_bind.cpp 27 Sep 2009 03:13:53 -0000 1.26 *************** *** 5,19 **** // --------------------------------------------------------------------------- #ifdef __BORLANDC__ #pragma hdrstop #endif - #include "wx/wxprec.h" - #ifndef WX_PRECOMP #include "wx/wx.h" #endif - #include "wxlua/include/wxlstate.h" #include "wxbind/include/wxcore_bind.h" --- 5,19 ---- // --------------------------------------------------------------------------- + + #include "wx/wxprec.h" + #ifdef __BORLANDC__ #pragma hdrstop #endif #ifndef WX_PRECOMP #include "wx/wx.h" #endif #include "wxlua/include/wxlstate.h" #include "wxbind/include/wxcore_bind.h" Index: wxcore_controls.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxcore_controls.cpp,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** wxcore_controls.cpp 25 Sep 2009 18:47:57 -0000 1.20 --- wxcore_controls.cpp 27 Sep 2009 03:13:53 -0000 1.21 *************** *** 5,19 **** // --------------------------------------------------------------------------- #ifdef __BORLANDC__ #pragma hdrstop #endif - #include "wx/wxprec.h" - #ifndef WX_PRECOMP #include "wx/wx.h" #endif - #include "wxlua/include/wxlstate.h" #include "wxbind/include/wxcore_bind.h" --- 5,19 ---- // --------------------------------------------------------------------------- + + #include "wx/wxprec.h" + #ifdef __BORLANDC__ #pragma hdrstop #endif #ifndef WX_PRECOMP #include "wx/wx.h" #endif #include "wxlua/include/wxlstate.h" #include "wxbind/include/wxcore_bind.h" Index: wxxml_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxxml_bind.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** wxxml_bind.cpp 25 Sep 2009 18:47:58 -0000 1.14 --- wxxml_bind.cpp 27 Sep 2009 03:13:55 -0000 1.15 *************** *** 5,19 **** // --------------------------------------------------------------------------- #ifdef __BORLANDC__ #pragma hdrstop #endif - #include "wx/wxprec.h" - #ifndef WX_PRECOMP #include "wx/wx.h" #endif - #include "wxlua/include/wxlstate.h" #include "wxbind/include/wxxml_bind.h" --- 5,19 ---- // --------------------------------------------------------------------------- + + #include "wx/wxprec.h" + #ifdef __BORLANDC__ #pragma hdrstop #endif #ifndef WX_PRECOMP #include "wx/wx.h" #endif #include "wxlua/include/wxlstate.h" #include "wxbind/include/wxxml_bind.h" Index: wxcore_menutool.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxcore_menutool.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** wxcore_menutool.cpp 24 Mar 2009 04:15:29 -0000 1.15 --- wxcore_menutool.cpp 27 Sep 2009 03:13:55 -0000 1.16 *************** *** 5,19 **** // --------------------------------------------------------------------------- #ifdef __BORLANDC__ #pragma hdrstop #endif - #include "wx/wxprec.h" - #ifndef WX_PRECOMP #include "wx/wx.h" #endif - #include "wxlua/include/wxlstate.h" #include "wxbind/include/wxcore_bind.h" --- 5,19 ---- // --------------------------------------------------------------------------- + + #include "wx/wxprec.h" + #ifdef __BORLANDC__ #pragma hdrstop #endif #ifndef WX_PRECOMP #include "wx/wx.h" #endif #include "wxlua/include/wxlstate.h" #include "wxbind/include/wxcore_bind.h" Index: wxcore_picker.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxcore_picker.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** wxcore_picker.cpp 31 Mar 2009 04:23:42 -0000 1.13 --- wxcore_picker.cpp 27 Sep 2009 03:13:55 -0000 1.14 *************** *** 5,19 **** // --------------------------------------------------------------------------- #ifdef __BORLANDC__ #pragma hdrstop #endif - #include "wx/wxprec.h" - #ifndef WX_PRECOMP #include "wx/wx.h" #endif - #include "wxlua/include/wxlstate.h" #include "wxbind/include/wxcore_bind.h" --- 5,19 ---- // --------------------------------------------------------------------------- + + #include "wx/wxprec.h" + #ifdef __BORLANDC__ #pragma hdrstop #endif #ifndef WX_PRECOMP #include "wx/wx.h" #endif #include "wxlua/include/wxlstate.h" #include "wxbind/include/wxcore_bind.h" Index: wxcore_dialogs.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxcore_dialogs.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** wxcore_dialogs.cpp 29 Jan 2008 04:22:52 -0000 1.12 --- wxcore_dialogs.cpp 27 Sep 2009 03:13:53 -0000 1.13 *************** *** 5,19 **** // --------------------------------------------------------------------------- #ifdef __BORLANDC__ #pragma hdrstop #endif - #include "wx/wxprec.h" - #ifndef WX_PRECOMP #include "wx/wx.h" #endif - #include "wxlua/include/wxlstate.h" #include "wxbind/include/wxcore_bind.h" --- 5,19 ---- // --------------------------------------------------------------------------- + + #include "wx/wxprec.h" + #ifdef __BORLANDC__ #pragma hdrstop #endif #ifndef WX_PRECOMP #include "wx/wx.h" #endif #include "wxlua/include/wxlstate.h" #include "wxbind/include/wxcore_bind.h" Index: wxbase_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxbase_bind.cpp,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** wxbase_bind.cpp 25 Sep 2009 18:47:57 -0000 1.22 --- wxbase_bind.cpp 27 Sep 2009 03:13:52 -0000 1.23 *************** *** 5,19 **** // --------------------------------------------------------------------------- #ifdef __BORLANDC__ #pragma hdrstop #endif - #include "wx/wxprec.h" - #ifndef WX_PRECOMP #include "wx/wx.h" #endif - #include "wxlua/include/wxlstate.h" #include "wxbind/include/wxbase_bind.h" --- 5,19 ---- // --------------------------------------------------------------------------- + + #include "wx/wxprec.h" + #ifdef __BORLANDC__ #pragma hdrstop #endif #ifndef WX_PRECOMP #include "wx/wx.h" #endif #include "wxlua/include/wxlstate.h" #include "wxbind/include/wxbase_bind.h" Index: wxstc_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxstc_bind.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** wxstc_bind.cpp 25 Sep 2009 18:47:58 -0000 1.16 --- wxstc_bind.cpp 27 Sep 2009 03:13:55 -0000 1.17 *************** *** 5,19 **** // --------------------------------------------------------------------------- #ifdef __BORLANDC__ #pragma hdrstop #endif - #include "wx/wxprec.h" - #ifndef WX_PRECOMP #include "wx/wx.h" #endif - #include "wxlua/include/wxlstate.h" #include "wxbind/include/wxstc_bind.h" --- 5,19 ---- // --------------------------------------------------------------------------- + + #include "wx/wxprec.h" + #ifdef __BORLANDC__ #pragma hdrstop #endif #ifndef WX_PRECOMP #include "wx/wx.h" #endif #include "wxlua/include/wxlstate.h" #include "wxbind/include/wxstc_bind.h" Index: wxcore_defsutils.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxcore_defsutils.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** wxcore_defsutils.cpp 24 Mar 2009 04:15:24 -0000 1.13 --- wxcore_defsutils.cpp 27 Sep 2009 03:13:53 -0000 1.14 *************** *** 5,19 **** // --------------------------------------------------------------------------- #ifdef __BORLANDC__ #pragma hdrstop #endif - #include "wx/wxprec.h" - #ifndef WX_PRECOMP #include "wx/wx.h" #endif - #include "wxlua/include/wxlstate.h" #include "wxbind/include/wxcore_bind.h" --- 5,19 ---- // --------------------------------------------------------------------------- + + #include "wx/wxprec.h" + #ifdef __BORLANDC__ #pragma hdrstop #endif #ifndef WX_PRECOMP #include "wx/wx.h" #endif #include "wxlua/include/wxlstate.h" #include "wxbind/include/wxcore_bind.h" Index: wxbase_datetime.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxbase_datetime.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** wxbase_datetime.cpp 24 Mar 2009 04:15:15 -0000 1.14 --- wxbase_datetime.cpp 27 Sep 2009 03:13:52 -0000 1.15 *************** *** 5,19 **** // --------------------------------------------------------------------------- #ifdef __BORLANDC__ #pragma hdrstop #endif - #include "wx/wxprec.h" - #ifndef WX_PRECOMP #include "wx/wx.h" #endif - #include "wxlua/include/wxlstate.h" #include "wxbind/include/wxbase_bind.h" --- 5,19 ---- // --------------------------------------------------------------------------- + + #include "wx/wxprec.h" + #ifdef __BORLANDC__ #pragma hdrstop #endif #ifndef WX_PRECOMP #include "wx/wx.h" #endif #include "wxlua/include/wxlstate.h" #include "wxbind/include/wxbase_bind.h" Index: wxbase_file.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxbase_file.cpp,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** wxbase_file.cpp 31 Mar 2009 04:23:42 -0000 1.17 --- wxbase_file.cpp 27 Sep 2009 03:13:53 -0000 1.18 *************** *** 5,19 **** // --------------------------------------------------------------------------- #ifdef __BORLANDC__ #pragma hdrstop #endif - #include "wx/wxprec.h" - #ifndef WX_PRECOMP #include "wx/wx.h" #endif - #include "wxlua/include/wxlstate.h" #include "wxbind/include/wxbase_bind.h" --- 5,19 ---- // --------------------------------------------------------------------------- + + #include "wx/wxprec.h" + #ifdef __BORLANDC__ #pragma hdrstop #endif #ifndef WX_PRECOMP #include "wx/wx.h" #endif #include "wxlua/include/wxlstate.h" #include "wxbind/include/wxbase_bind.h" Index: wxcore_appframe.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxcore_appframe.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** wxcore_appframe.cpp 29 Jan 2008 04:22:52 -0000 1.13 --- wxcore_appframe.cpp 27 Sep 2009 03:13:53 -0000 1.14 *************** *** 5,19 **** // --------------------------------------------------------------------------- #ifdef __BORLANDC__ #pragma hdrstop #endif - #include "wx/wxprec.h" - #ifndef WX_PRECOMP #include "wx/wx.h" #endif - #include "wxlua/include/wxlstate.h" #include "wxbind/include/wxcore_bind.h" --- 5,19 ---- // --------------------------------------------------------------------------- + + #include "wx/wxprec.h" + #ifdef __BORLANDC__ #pragma hdrstop #endif #ifndef WX_PRECOMP #include "wx/wx.h" #endif #include "wxlua/include/wxlstate.h" #include "wxbind/include/wxcore_bind.h" Index: wxhtml_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxhtml_bind.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** wxhtml_bind.cpp 25 Sep 2009 18:47:58 -0000 1.16 --- wxhtml_bind.cpp 27 Sep 2009 03:13:55 -0000 1.17 *************** *** 5,19 **** // --------------------------------------------------------------------------- #ifdef __BORLANDC__ #pragma hdrstop #endif - #include "wx/wxprec.h" - #ifndef WX_PRECOMP #include "wx/wx.h" #endif - #include "wxlua/include/wxlstate.h" #include "wxbind/include/wxhtml_bind.h" --- 5,19 ---- // --------------------------------------------------------------------------- + + #include "wx/wxprec.h" + #ifdef __BORLANDC__ #pragma hdrstop #endif #ifndef WX_PRECOMP #include "wx/wx.h" #endif #include "wxlua/include/wxlstate.h" #include "wxbind/include/wxhtml_bind.h" Index: wxcore_image.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxcore_image.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** wxcore_image.cpp 31 Mar 2009 04:23:42 -0000 1.18 --- wxcore_image.cpp 27 Sep 2009 03:13:54 -0000 1.19 *************** *** 5,19 **** // --------------------------------------------------------------------------- #ifdef __BORLANDC__ #pragma hdrstop #endif - #include "wx/wxprec.h" - #ifndef WX_PRECOMP #include "wx/wx.h" #endif - #include "wxlua/include/wxlstate.h" #include "wxbind/include/wxcore_bind.h" --- 5,19 ---- // --------------------------------------------------------------------------- + + #include "wx/wxprec.h" + #ifdef __BORLANDC__ #pragma hdrstop #endif #ifndef WX_PRECOMP #include "wx/wx.h" #endif #include "wxlua/include/wxlstate.h" #include "wxbind/include/wxcore_bind.h" Index: wxbase_base.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxbase_base.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** wxbase_base.cpp 24 Mar 2009 04:15:12 -0000 1.14 --- wxbase_base.cpp 27 Sep 2009 03:13:52 -0000 1.15 *************** *** 5,19 **** // --------------------------------------------------------------------------- #ifdef __BORLANDC__ #pragma hdrstop #endif - #include "wx/wxprec.h" - #ifndef WX_PRECOMP #include "wx/wx.h" #endif - #include "wxlua/include/wxlstate.h" #include "wxbind/include/wxbase_bind.h" --- 5,19 ---- // --------------------------------------------------------------------------- + + #include "wx/wxprec.h" + #ifdef __BORLANDC__ #pragma hdrstop #endif #ifndef WX_PRECOMP #include "wx/wx.h" #endif #include "wxlua/include/wxlstate.h" #include "wxbind/include/wxbase_bind.h" Index: wxcore_print.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxcore_print.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** wxcore_print.cpp 24 Mar 2009 04:15:30 -0000 1.15 --- wxcore_print.cpp 27 Sep 2009 03:13:55 -0000 1.16 *************** *** 5,19 **** // --------------------------------------------------------------------------- #ifdef __BORLANDC__ #pragma hdrstop #endif - #include "wx/wxprec.h" - #ifndef WX_PRECOMP #include "wx/wx.h" #endif - #include "wxlua/include/wxlstate.h" #include "wxbind/include/wxcore_bind.h" --- 5,19 ---- // --------------------------------------------------------------------------- + + #include "wx/wxprec.h" + #ifdef __BORLANDC__ #pragma hdrstop #endif #ifndef WX_PRECOMP #include "wx/wx.h" #endif #include "wxlua/include/wxlstate.h" #include "wxbind/include/wxcore_bind.h" Index: wxnet_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxnet_bind.cpp,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** wxnet_bind.cpp 25 Sep 2009 18:47:58 -0000 1.17 --- wxnet_bind.cpp 27 Sep 2009 03:13:55 -0000 1.18 *************** *** 5,19 **** // --------------------------------------------------------------------------- #ifdef __BORLANDC__ #pragma hdrstop #endif - #include "wx/wxprec.h" - #ifndef WX_PRECOMP #include "wx/wx.h" #endif - #include "wxlua/include/wxlstate.h" #include "wxbind/include/wxnet_bind.h" --- 5,19 ---- // --------------------------------------------------------------------------- + + #include "wx/wxprec.h" + #ifdef __BORLANDC__ #pragma hdrstop #endif #ifndef WX_PRECOMP #include "wx/wx.h" #endif #include "wxlua/include/wxlstate.h" #include "wxbind/include/wxnet_bind.h" Index: wxcore_windows.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxcore_windows.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** wxcore_windows.cpp 31 Mar 2009 04:23:42 -0000 1.18 --- wxcore_windows.cpp 27 Sep 2009 03:13:55 -0000 1.19 *************** *** 5,19 **** // --------------------------------------------------------------------------- #ifdef __BORLANDC__ #pragma hdrstop #endif - #include "wx/wxprec.h" - #ifndef WX_PRECOMP #include "wx/wx.h" #endif - #include "wxlua/include/wxlstate.h" #include "wxbind/include/wxcore_bind.h" --- 5,19 ---- // --------------------------------------------------------------------------- + + #include "wx/wxprec.h" + #ifdef __BORLANDC__ #pragma hdrstop #endif #ifndef WX_PRECOMP #include "wx/wx.h" #endif #include "wxlua/include/wxlstate.h" #include "wxbind/include/wxcore_bind.h" Index: wxcore_sizer.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxcore_sizer.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** wxcore_sizer.cpp 24 Mar 2009 04:15:30 -0000 1.14 --- wxcore_sizer.cpp 27 Sep 2009 03:13:55 -0000 1.15 *************** *** 5,19 **** // --------------------------------------------------------------------------- #ifdef __BORLANDC__ #pragma hdrstop #endif - #include "wx/wxprec.h" - #ifndef WX_PRECOMP #include "wx/wx.h" #endif - #include "wxlua/include/wxlstate.h" #include "wxbind/include/wxcore_bind.h" --- 5,19 ---- // --------------------------------------------------------------------------- + + #include "wx/wxprec.h" + #ifdef __BORLANDC__ #pragma hdrstop #endif #ifndef WX_PRECOMP #include "wx/wx.h" #endif #include "wxlua/include/wxlstate.h" #include "wxbind/include/wxcore_bind.h" Index: wxcore_geometry.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxcore_geometry.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** wxcore_geometry.cpp 31 Oct 2008 05:25:08 -0000 1.14 --- wxcore_geometry.cpp 27 Sep 2009 03:13:54 -0000 1.15 *************** *** 5,19 **** // --------------------------------------------------------------------------- #ifdef __BORLANDC__ #pragma hdrstop #endif - #include "wx/wxprec.h" - #ifndef WX_PRECOMP #include "wx/wx.h" #endif - #include "wxlua/include/wxlstate.h" #include "wxbind/include/wxcore_bind.h" --- 5,19 ---- // --------------------------------------------------------------------------- + + #include "wx/wxprec.h" + #ifdef __BORLANDC__ #pragma hdrstop #endif #ifndef WX_PRECOMP #include "wx/wx.h" #endif #include "wxlua/include/wxlstate.h" #include "wxbind/include/wxcore_bind.h" Index: wxrichtext_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxrichtext_bind.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** wxrichtext_bind.cpp 19 May 2009 03:20:53 -0000 1.11 --- wxrichtext_bind.cpp 27 Sep 2009 03:13:55 -0000 1.12 *************** *** 5,19 **** // --------------------------------------------------------------------------- #ifdef __BORLANDC__ #pragma hdrstop #endif - #include "wx/wxprec.h" - #ifndef WX_PRECOMP #include "wx/wx.h" #endif - #include "wxlua/include/wxlstate.h" #include "wxbind/include/wxrichtext_bind.h" --- 5,19 ---- // --------------------------------------------------------------------------- + + #include "wx/wxprec.h" + #ifdef __BORLANDC__ #pragma hdrstop #endif #ifndef WX_PRECOMP #include "wx/wx.h" #endif #include "wxlua/include/wxlstate.h" #include "wxbind/include/wxrichtext_bind.h" Index: wxadv_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxadv_bind.cpp,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** wxadv_bind.cpp 25 Sep 2009 18:47:57 -0000 1.24 --- wxadv_bind.cpp 27 Sep 2009 03:13:51 -0000 1.25 *************** *** 5,19 **** // --------------------------------------------------------------------------- #ifdef __BORLANDC__ #pragma hdrstop #endif #include "wx/wxprec.h" #ifndef WX_PRECOMP #include "wx/wx.h" #endif - #include "wxlua/include/wxlstate.h" #include "wxbind/include/wxadv_bind.h" --- 5,49 ---- // --------------------------------------------------------------------------- + + #include "wx/wxprec.h" + #ifdef __BORLANDC__ #pragma hdrstop #endif + #ifndef WX_PRECOMP + #include "wx/wx.h" + #endif + + // Hack to add accessor to get the ref count + #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(); \ + } + + #include "wx/wxprec.h" + #ifdef __BORLANDC__ + #pragma hdrstop + #endif + #ifndef WX_PRECOMP #include "wx/wx.h" #endif #include "wxlua/include/wxlstate.h" #include "wxbind/include/wxadv_bind.h" Index: wxcore_help.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxcore_help.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** wxcore_help.cpp 24 Mar 2009 04:15:29 -0000 1.14 --- wxcore_help.cpp 27 Sep 2009 03:13:54 -0000 1.15 *************** *** 5,19 **** // --------------------------------------------------------------------------- #ifdef __BORLANDC__ #pragma hdrstop #endif - #include "wx/wxprec.h" - #ifndef WX_PRECOMP #include "wx/wx.h" #endif - #include "wxlua/include/wxlstate.h" #include "wxbind/include/wxcore_bind.h" --- 5,19 ---- // --------------------------------------------------------------------------- + + #include "wx/wxprec.h" + #ifdef __BORLANDC__ #pragma hdrstop #endif #ifndef WX_PRECOMP #include "wx/wx.h" #endif #include "wxlua/include/wxlstate.h" #include "wxbind/include/wxcore_bind.h" Index: wxcore_mdi.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxcore_mdi.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** wxcore_mdi.cpp 24 Mar 2009 04:15:29 -0000 1.14 --- wxcore_mdi.cpp 27 Sep 2009 03:13:54 -0000 1.15 *************** *** 5,19 **** // --------------------------------------------------------------------------- #ifdef __BORLANDC__ #pragma hdrstop #endif - #include "wx/wxprec.h" - #ifndef WX_PRECOMP #include "wx/wx.h" #endif - #include "wxlua/include/wxlstate.h" #include "wxbind/include/wxcore_bind.h" --- 5,19 ---- // --------------------------------------------------------------------------- + + #include "wx/wxprec.h" + #ifdef __BORLANDC__ #pragma hdrstop #endif #ifndef WX_PRECOMP #include "wx/wx.h" #endif #include "wxlua/include/wxlstate.h" #include "wxbind/include/wxcore_bind.h" |
|
From: John L. <jr...@us...> - 2009-09-27 03:14:03
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/src In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv24793/wxLua/modules/wxlua/src Modified Files: wxlua_bind.cpp 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: wxlua_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlua_bind.cpp,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** wxlua_bind.cpp 25 Sep 2009 18:47:58 -0000 1.33 --- wxlua_bind.cpp 27 Sep 2009 03:13:55 -0000 1.34 *************** *** 5,19 **** // --------------------------------------------------------------------------- #ifdef __BORLANDC__ #pragma hdrstop #endif - #include "wx/wxprec.h" - #ifndef WX_PRECOMP #include "wx/wx.h" #endif - #include "wxlua/include/wxlstate.h" #include "wxlua/include/wxlua_bind.h" --- 5,19 ---- // --------------------------------------------------------------------------- + + #include "wx/wxprec.h" + #ifdef __BORLANDC__ #pragma hdrstop #endif #ifndef WX_PRECOMP #include "wx/wx.h" #endif #include "wxlua/include/wxlstate.h" #include "wxlua/include/wxlua_bind.h" |
|
From: John L. <jr...@us...> - 2009-09-25 18:48:19
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/src In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv3461/wxLua/modules/wxlua/src Modified Files: wxlbind.cpp wxlcallb.cpp wxlstate.cpp wxlua_bind.cpp Log Message: Fix multiple inheritance by adding the offset to the vtable for base classes that are second or higher. Index: wxlstate.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlstate.cpp,v retrieving revision 1.182 retrieving revision 1.183 diff -C2 -d -r1.182 -r1.183 *** wxlstate.cpp 23 Jun 2009 23:08:12 -0000 1.182 --- wxlstate.cpp 25 Sep 2009 18:47:58 -0000 1.183 *************** *** 1097,1100 **** --- 1097,1149 ---- } + // Note about multiple inheritance in wxLua : + // See wxLuaBindClass::baseclass_vtable_offsets + // + // class A { int x; }; class B { int y; }; class AB : public A, public B { int z; }; + // AB ab; void *v_ab_a = (A*)&ab; void *v_ab_b = (B*)&ab; + // long int dummy = 0; + // long int AB_diff = ((long int)(B*)(AB*)&dummy) - ((long int)(A*)(AB*)&dummy); + // wxPrintf(wxT("AB*=%p, A*=%p, B*=%p, B*-A*=%d\n"), &ab, v_ab_a, v_ab_b, AB_diff); + // prints: "AB*=0x614dfc, A*=0x614dfc, B*=0x614e00, B*-A*=4" + // + // In order to call B's functions from a void* pointer to an AB object : + // 1) Ideally, we cast to an AB object and the compiler will appropriately lookup + // and handle calls to B's functions. + // 2) Cast to an AB object then to a B object where the compiler has already + // shifted the pointer and calls to B's functions are made directly. + // 3) Explicitly shift the void* pointer to the AB object to where the vtable for + // B is. We now have an object that only knows about B and what B was derived from. + // I'm sure this is frowned upon by C++ enthusiasts. + // + // Ways of doing 1 and 2 in wxLua with C++ constraints, wxLua does #3 above. + // + // 1) wxLua would duplicate all the the binding functions for second + // and higher base classes and therefore each binding function will cast the + // void* we get from Lua to exactly the object type that it is. This is best, + // but it adds bloat. + // 2) Come up with a clever way using overloaded functions, templates, + // or some sort of variant class to convert the void* pointer from Lua to + // type of object that it really is (we know by the wxLuaType integer) + // and then the binding function will cast it whatever base class it may be. + // The problem is that we really need to overload this casting function by + // return type, the function takes void* and returns ClassXYZ*, but this + // is not allowed in C++. + // 3) Store an array of the offsets in each classes' wxLuaBindClass struct + // to the second or higher base classes and automatically add this offset in + // wxluaT_getuserdatatype(). The offsets are calculated at compile time + // using the AB_diff method above. + // + // Various ways to cast a void* pointer to the second base class : + // void* v_ab = &ab; // compilier doesn't know what v_ab is anymore + // AB* ab = (AB*)v_ab; // ok since we cast right back to original type + // A* a = (A*)v_ab; // ok in GCC & MSVC since we are casting to 1st base class + // B* b = (B*)v_ab; // segfault! since B*'s vtable is +4 bytes as shown above + // B* b1 = (B*)(AB*)v_ab; // ok since compiler converts to AB* and knows that B* is shifted + // B* b2 = (B*)((long int)v_ab + AB_diff); // ok since we've shifted to B + + + // forward declaration + static int wxluaT_isderivedtype_recurser(const wxLuaBindClass *wxlClass, int base_wxl_type, int levels, int* baseclass_n); + void* LUACALL wxluaT_getuserdatatype(lua_State* L, int stack_idx, int wxl_type) { *************** *** 1103,1108 **** if (wxluatype_NULL == stack_type) return NULL; ! else if (wxluaT_isderivedtype(L, stack_type, wxl_type) >= 0) return wxlua_touserdata(L, stack_idx, false); wxlua_argerror(L, stack_idx, wxT("a '") + wxluaT_typename(L, wxl_type) + wxT("'")); --- 1152,1195 ---- if (wxluatype_NULL == stack_type) return NULL; ! ! // Note: we directly use the recurser function since we may need the wxLuaBindClass ! //int level = wxluaT_isderivedtype(L, stack_type, wxl_type); ! ! int baseclass_n = 0; ! const wxLuaBindClass* wxlClass = wxluaT_getclass(L, stack_type); ! int level = wxluaT_isderivedtype_recurser(wxlClass, wxl_type, 0, &baseclass_n); ! ! if ((level >= 0) && (baseclass_n == 0)) ! { ! // We can directly cast the void* pointer to the baseclass if baseclass_n == 0 return wxlua_touserdata(L, stack_idx, false); + } + else if (level > 0) + { + // The class on the stack is derived from a second or higher base class + // and therefore the pointer to the base class is not the same as the + // pointer to the class object on the stack. We need to shift the + // pointer by the number of bytes in wxLuaBindClass::baseclass_vtable_offsets + // so that when it is casted to the base class we don't segfault. + long int o = (long int)wxlua_touserdata(L, stack_idx, false); + + if (wxlClass->baseclass_wxluatypes) + { + int i = 0; + while (wxlClass->baseclass_wxluatypes[i]) // NULL terminated, the baseclass_vtable_offsets is not + { + if (*(wxlClass->baseclass_wxluatypes[i]) == wxl_type) + { + o += wxlClass->baseclass_vtable_offsets[i]; + break; + } + i++; + } + } + + return (void*)o; + } + + wxlua_argerror(L, stack_idx, wxT("a '") + wxluaT_typename(L, wxl_type) + wxT("'")); *************** *** 1196,1203 **** // ---------------------------------------------------------------------------- ! static int wxluaT_isderivedtype_recurser(const wxLuaBindClass *wxlClass, int base_wxl_type, int levels) { if (wxlClass != NULL) { if (*wxlClass->wxluatype == base_wxl_type) return levels; --- 1283,1291 ---- // ---------------------------------------------------------------------------- ! static int wxluaT_isderivedtype_recurser(const wxLuaBindClass *wxlClass, int base_wxl_type, int levels, int* baseclass_n) { if (wxlClass != NULL) { + // check that input isn't what we want first since this func is used in a couple places if (*wxlClass->wxluatype == base_wxl_type) return levels; *************** *** 1212,1221 **** { if (*baseClass->wxluatype == base_wxl_type) ! return levels; else { ! int ret = wxluaT_isderivedtype_recurser(baseClass, base_wxl_type, levels+1); if (ret > -1) return ret; } } --- 1300,1319 ---- { if (*baseClass->wxluatype == base_wxl_type) ! { ! if (baseclass_n) *baseclass_n = wxMax(*baseclass_n, (int)i); ! return levels+1; ! } else { ! // create a new baseclass_n since we may be going down the wrong path ! // and we do not want to change the original. ! int baseclass_n_tmp = wxMax(baseclass_n ? *baseclass_n : 0, (int)i); ! int ret = wxluaT_isderivedtype_recurser(baseClass, base_wxl_type, levels+1, &baseclass_n_tmp); if (ret > -1) + { + // now set the baseclass_n var to the tmp one + if (baseclass_n) *baseclass_n = wxMax(baseclass_n_tmp, (int)i); return ret; + } } } *************** *** 1227,1231 **** } ! int LUACALL wxluaT_isderivedtype(lua_State* L, int wxl_type, int base_wxl_type) { // couldn't possibly be derived from each other --- 1325,1329 ---- } ! int LUACALL wxluaT_isderivedtype(lua_State* L, int wxl_type, int base_wxl_type, int* baseclass_n) { // couldn't possibly be derived from each other *************** *** 1233,1237 **** return -1; ! // These two types are the same if (wxl_type == base_wxl_type) return 0; --- 1331,1335 ---- return -1; ! // These two types are the same, yes recurser also checks, but this is faster if (wxl_type == base_wxl_type) return 0; *************** *** 1239,1246 **** const wxLuaBindClass *wxlClass = wxluaT_getclass(L, wxl_type); ! return wxluaT_isderivedtype_recurser(wxlClass, base_wxl_type, 1); } ! int LUACALL wxluaT_isderivedclass(const wxLuaBindClass* wxlClass, const wxLuaBindClass* base_wxlClass) { // Ok if either is NULL to allow blindly calling this --- 1337,1346 ---- const wxLuaBindClass *wxlClass = wxluaT_getclass(L, wxl_type); ! if (baseclass_n != NULL) *baseclass_n = 0; ! ! return wxluaT_isderivedtype_recurser(wxlClass, base_wxl_type, 0, baseclass_n); } ! int LUACALL wxluaT_isderivedclass(const wxLuaBindClass* wxlClass, const wxLuaBindClass* base_wxlClass, int* baseclass_n) { // Ok if either is NULL to allow blindly calling this *************** *** 1252,1256 **** return 0; ! return wxluaT_isderivedtype_recurser(wxlClass, *base_wxlClass->wxluatype, 1); } --- 1352,1358 ---- return 0; ! if (baseclass_n != NULL) *baseclass_n = 0; ! ! return wxluaT_isderivedtype_recurser(wxlClass, *base_wxlClass->wxluatype, 1, baseclass_n); } *************** *** 2913,2920 **** } ! int wxLuaState::IsDerivedType(int wxl_type, int base_wxl_type) const { wxCHECK_MSG(Ok(), -1, wxT("Invalid wxLuaState")); ! return wxluaT_isderivedtype(M_WXLSTATEDATA->m_lua_State, wxl_type, base_wxl_type); } --- 3015,3022 ---- } ! int wxLuaState::IsDerivedType(int wxl_type, int base_wxl_type, int* baseclass_n) const { wxCHECK_MSG(Ok(), -1, wxT("Invalid wxLuaState")); ! return wxluaT_isderivedtype(M_WXLSTATEDATA->m_lua_State, wxl_type, base_wxl_type, baseclass_n); } Index: wxlbind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlbind.cpp,v retrieving revision 1.123 retrieving revision 1.124 diff -C2 -d -r1.123 -r1.124 *** wxlbind.cpp 19 May 2009 03:20:53 -0000 1.123 --- wxlbind.cpp 25 Sep 2009 18:47:58 -0000 1.124 *************** *** 30,35 **** wxLuaArgType g_wxluaargtypeArray_None[1] = {0}; - wxLuaBindNumber g_wxluanumberArray_None[1] = {{0, 0}}; int wxluatype_TNONE = WXLUA_TNONE; int wxluatype_TNIL = WXLUA_TNIL; --- 30,35 ---- wxLuaArgType g_wxluaargtypeArray_None[1] = {0}; + int wxluatype_TUNKNOWN = WXLUA_TUNKNOWN; int wxluatype_TNONE = WXLUA_TNONE; int wxluatype_TNIL = WXLUA_TNIL; *************** *** 48,60 **** wxLuaBindClass wxLuaBindClass_NULL = ! { "NULL", NULL, 0, NULL, &wxluatype_NULL, NULL, NULL, g_wxluanumberArray_None, 0, }; ! static int wxluatype_dummy = WXLUA_TUNKNOWN; ! int* p_wxluatype_wxEvent = &wxluatype_dummy; ! int* p_wxluatype_wxWindow = &wxluatype_dummy; ! int* p_wxluatype_wxString = &wxluatype_dummy; ! int* p_wxluatype_wxArrayString = &wxluatype_dummy; ! int* p_wxluatype_wxSortedArrayString = &wxluatype_dummy; ! int* p_wxluatype_wxArrayInt = &wxluatype_dummy; //----------------------------------------------------------------------------- --- 48,59 ---- wxLuaBindClass wxLuaBindClass_NULL = ! { "NULL", NULL, 0, NULL, &wxluatype_NULL, NULL, NULL, NULL, NULL, NULL, 0, }; ! int* p_wxluatype_wxEvent = &wxluatype_TUNKNOWN; ! int* p_wxluatype_wxWindow = &wxluatype_TUNKNOWN; ! int* p_wxluatype_wxString = &wxluatype_TUNKNOWN; ! int* p_wxluatype_wxArrayString = &wxluatype_TUNKNOWN; ! int* p_wxluatype_wxSortedArrayString = &wxluatype_TUNKNOWN; ! int* p_wxluatype_wxArrayInt = &wxluatype_TUNKNOWN; //----------------------------------------------------------------------------- Index: wxlcallb.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlcallb.cpp,v retrieving revision 1.59 retrieving revision 1.60 diff -C2 -d -r1.59 -r1.60 *** wxlcallb.cpp 19 May 2009 03:20:53 -0000 1.59 --- wxlcallb.cpp 25 Sep 2009 18:47:58 -0000 1.60 *************** *** 131,135 **** wxLuaState wxlState(m_wxlState); ! int event_wxl_type = WXLUA_TUNKNOWN; // If !m_wxlBindEvent, we would have errored in Connect(), but don't crash... --- 131,136 ---- wxLuaState wxlState(m_wxlState); ! // initialize to the generic wxluatype_wxEvent ! int event_wxl_type = *p_wxluatype_wxEvent; // inits to wxluatype_TUNKNOWN == WXLUA_TUNKNOWN // If !m_wxlBindEvent, we would have errored in Connect(), but don't crash... *************** *** 138,142 **** event_wxl_type = *m_wxlBindEvent->wxluatype; ! // These wxEventTypes can be wxScrollEvents or wxSpinEvents // wxEVT_SCROLL_LINEUP, wxEVT_SCROLL_LINEDOWN, wxEVT_SCROLL_THUMBTRACK --- 139,143 ---- event_wxl_type = *m_wxlBindEvent->wxluatype; ! // These wxEventTypes can be wxScrollEvents or wxSpinEvents - FIXME this could be cleaner // wxEVT_SCROLL_LINEUP, wxEVT_SCROLL_LINEDOWN, wxEVT_SCROLL_THUMBTRACK *************** *** 151,156 **** } } - else - event_wxl_type = *p_wxluatype_wxEvent; // get the generic wxluatype_wxEvent // Should know our event type, but error out in case we don't --- 152,155 ---- Index: wxlua_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlua_bind.cpp,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** wxlua_bind.cpp 19 May 2009 03:20:53 -0000 1.32 --- wxlua_bind.cpp 25 Sep 2009 18:47:58 -0000 1.33 *************** *** 1225,1230 **** static wxLuaBindClass classList[] = { ! { wxluaclassname_wxLuaObject, wxLuaObject_methods, wxLuaObject_methodCount, CLASSINFO(wxLuaObject), &wxluatype_wxLuaObject, wxluabaseclassnames_wxLuaObject, wxluabaseclassbinds_wxLuaObject, g_wxluanumberArray_None, 0, }, ! { wxluaclassname_wxLuaState, wxLuaState_methods, wxLuaState_methodCount, CLASSINFO(wxLuaState), &wxluatype_wxLuaState, wxluabaseclassnames_wxLuaState, wxluabaseclassbinds_wxLuaState, g_wxluanumberArray_None, 0, }, { 0, 0, 0, 0, 0, 0, 0 }, --- 1225,1230 ---- static wxLuaBindClass classList[] = { ! { wxluaclassname_wxLuaObject, wxLuaObject_methods, wxLuaObject_methodCount, CLASSINFO(wxLuaObject), &wxluatype_wxLuaObject, wxluabaseclassnames_wxLuaObject, wxluabaseclassbinds_wxLuaObject, NULL, NULL, NULL, 0, }, ! { wxluaclassname_wxLuaState, wxLuaState_methods, wxLuaState_methodCount, CLASSINFO(wxLuaState), &wxluatype_wxLuaState, wxluabaseclassnames_wxLuaState, wxluabaseclassbinds_wxLuaState, NULL, NULL, NULL, 0, }, { 0, 0, 0, 0, 0, 0, 0 }, |
|
From: John L. <jr...@us...> - 2009-09-25 18:48:18
|
Update of /cvsroot/wxlua/wxLua/samples In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv3461/wxLua/samples Modified Files: controls.wx.lua Log Message: Fix multiple inheritance by adding the offset to the vtable for base classes that are second or higher. Index: controls.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/controls.wx.lua,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** controls.wx.lua 24 Jan 2008 00:18:19 -0000 1.18 --- controls.wx.lua 25 Sep 2009 18:47:58 -0000 1.19 *************** *** 369,378 **** s = s.."\n\t"..evtClassName.." - "..wxEvent_GetFuncs[evtClassName](event) end ! evtClassName = wxCLASS_TableByName[evtClassName].baseclassName end -- for debugging, this means we need to add it to the wxEvent_GetFuncs table if evtClassName ~= "wxObject" then ! print("Unhandled wxEventXXX type in OnEvent:", evtClassName) end --- 369,378 ---- s = s.."\n\t"..evtClassName.." - "..wxEvent_GetFuncs[evtClassName](event) end ! evtClassName = wxCLASS_TableByName[evtClassName].baseclassNames[1] end -- for debugging, this means we need to add it to the wxEvent_GetFuncs table if evtClassName ~= "wxObject" then ! print("Unhandled wxEventXXX type in OnEvent:", evtClassName, evtTypeStr) end *************** *** 860,864 **** wx.wxTR_HAS_BUTTONS+wx.wxTR_MULTIPLE) control:SetImageList(imageList) ! local item = control:AddRoot("Root Note", 0) control:AppendItem(item, "Item 1", 1) control:AppendItem(item, "Item 2") --- 860,864 ---- wx.wxTR_HAS_BUTTONS+wx.wxTR_MULTIPLE) control:SetImageList(imageList) ! local item = control:AddRoot("Root Node", 0) control:AppendItem(item, "Item 1", 1) control:AppendItem(item, "Item 2") |
|
From: John L. <jr...@us...> - 2009-09-25 18:48:17
|
Update of /cvsroot/wxlua/wxLua/docs In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv3461/wxLua/docs Modified Files: changelog.txt Log Message: Fix multiple inheritance by adding the offset to the vtable for base classes that are second or higher. Index: changelog.txt =================================================================== RCS file: /cvsroot/wxlua/wxLua/docs/changelog.txt,v retrieving revision 1.72 retrieving revision 1.73 diff -C2 -d -r1.72 -r1.73 *** changelog.txt 29 Jun 2009 03:22:46 -0000 1.72 --- changelog.txt 25 Sep 2009 18:47:57 -0000 1.73 *************** *** 6,9 **** --- 6,12 ---- - Fixed crash in error handler for wxLua functions. + - Fixed multiple inheritance by adding the offset to the vtable + of second or higher base classes. It has been tested in GCC and + MSVC. See note in wxlstate.cpp above wxluaT_getuserdatatype(). version 2.8.10.0 (released 05/25/2009) |
|
From: John L. <jr...@us...> - 2009-09-25 18:48:14
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv3461/wxLua/modules/wxbind/src Modified Files: wxadv_bind.cpp wxaui_bind.cpp wxbase_bind.cpp wxcore_bind.cpp wxcore_controls.cpp wxgl_bind.cpp wxhtml_bind.cpp wxmedia_bind.cpp wxnet_bind.cpp wxstc_bind.cpp wxxml_bind.cpp wxxrc_bind.cpp Log Message: Fix multiple inheritance by adding the offset to the vtable for base classes that are second or higher. Index: wxaui_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxaui_bind.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** wxaui_bind.cpp 24 May 2009 03:19:59 -0000 1.18 --- wxaui_bind.cpp 25 Sep 2009 18:47:57 -0000 1.19 *************** *** 9066,9091 **** { #if wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI ! { wxluaclassname_wxAuiDefaultDockArt, wxAuiDefaultDockArt_methods, wxAuiDefaultDockArt_methodCount, NULL, &wxluatype_wxAuiDefaultDockArt, wxluabaseclassnames_wxAuiDefaultDockArt, wxluabaseclassbinds_wxAuiDefaultDockArt, g_wxluanumberArray_None, 0, }, ! { wxluaclassname_wxAuiDefaultTabArt, wxAuiDefaultTabArt_methods, wxAuiDefaultTabArt_methodCount, NULL, &wxluatype_wxAuiDefaultTabArt, wxluabaseclassnames_wxAuiDefaultTabArt, wxluabaseclassbinds_wxAuiDefaultTabArt, g_wxluanumberArray_None, 0, }, ! { wxluaclassname_wxAuiDockArt, wxAuiDockArt_methods, wxAuiDockArt_methodCount, NULL, &wxluatype_wxAuiDockArt, NULL, NULL, g_wxluanumberArray_None, 0, }, ! { wxluaclassname_wxAuiDockInfo, wxAuiDockInfo_methods, wxAuiDockInfo_methodCount, NULL, &wxluatype_wxAuiDockInfo, NULL, NULL, g_wxluanumberArray_None, 0, }, ! { wxluaclassname_wxAuiDockUIPart, wxAuiDockUIPart_methods, wxAuiDockUIPart_methodCount, NULL, &wxluatype_wxAuiDockUIPart, NULL, NULL, wxAuiDockUIPart_enums, wxAuiDockUIPart_enumCount, }, ! { wxluaclassname_wxAuiFloatingFrame, wxAuiFloatingFrame_methods, wxAuiFloatingFrame_methodCount, CLASSINFO(wxAuiFloatingFrame), &wxluatype_wxAuiFloatingFrame, wxluabaseclassnames_wxAuiFloatingFrame, wxluabaseclassbinds_wxAuiFloatingFrame, g_wxluanumberArray_None, 0, }, ! { wxluaclassname_wxAuiMDIChildFrame, wxAuiMDIChildFrame_methods, wxAuiMDIChildFrame_methodCount, CLASSINFO(wxAuiMDIChildFrame), &wxluatype_wxAuiMDIChildFrame, wxluabaseclassnames_wxAuiMDIChildFrame, wxluabaseclassbinds_wxAuiMDIChildFrame, g_wxluanumberArray_None, 0, }, ! { wxluaclassname_wxAuiMDIClientWindow, wxAuiMDIClientWindow_methods, wxAuiMDIClientWindow_methodCount, CLASSINFO(wxAuiMDIClientWindow), &wxluatype_wxAuiMDIClientWindow, wxluabaseclassnames_wxAuiMDIClientWindow, wxluabaseclassbinds_wxAuiMDIClientWindow, g_wxluanumberArray_None, 0, }, ! { wxluaclassname_wxAuiMDIParentFrame, wxAuiMDIParentFrame_methods, wxAuiMDIParentFrame_methodCount, CLASSINFO(wxAuiMDIParentFrame), &wxluatype_wxAuiMDIParentFrame, wxluabaseclassnames_wxAuiMDIParentFrame, wxluabaseclassbinds_wxAuiMDIParentFrame, g_wxluanumberArray_None, 0, }, ! { wxluaclassname_wxAuiManager, wxAuiManager_methods, wxAuiManager_methodCount, CLASSINFO(wxAuiManager), &wxluatype_wxAuiManager, wxluabaseclassnames_wxAuiManager, wxluabaseclassbinds_wxAuiManager, g_wxluanumberArray_None, 0, }, ! { wxluaclassname_wxAuiManagerEvent, wxAuiManagerEvent_methods, wxAuiManagerEvent_methodCount, CLASSINFO(wxAuiManagerEvent), &wxluatype_wxAuiManagerEvent, wxluabaseclassnames_wxAuiManagerEvent, wxluabaseclassbinds_wxAuiManagerEvent, g_wxluanumberArray_None, 0, }, ! { wxluaclassname_wxAuiNotebook, wxAuiNotebook_methods, wxAuiNotebook_methodCount, CLASSINFO(wxAuiNotebook), &wxluatype_wxAuiNotebook, wxluabaseclassnames_wxAuiNotebook, wxluabaseclassbinds_wxAuiNotebook, g_wxluanumberArray_None, 0, }, ! { wxluaclassname_wxAuiNotebookEvent, wxAuiNotebookEvent_methods, wxAuiNotebookEvent_methodCount, CLASSINFO(wxAuiNotebookEvent), &wxluatype_wxAuiNotebookEvent, wxluabaseclassnames_wxAuiNotebookEvent, wxluabaseclassbinds_wxAuiNotebookEvent, g_wxluanumberArray_None, 0, }, ! { wxluaclassname_wxAuiNotebookPage, wxAuiNotebookPage_methods, wxAuiNotebookPage_methodCount, NULL, &wxluatype_wxAuiNotebookPage, NULL, NULL, g_wxluanumberArray_None, 0, }, ! { wxluaclassname_wxAuiNotebookPageArray, wxAuiNotebookPageArray_methods, wxAuiNotebookPageArray_methodCount, NULL, &wxluatype_wxAuiNotebookPageArray, NULL, NULL, g_wxluanumberArray_None, 0, }, ! { wxluaclassname_wxAuiPaneButton, wxAuiPaneButton_methods, wxAuiPaneButton_methodCount, NULL, &wxluatype_wxAuiPaneButton, NULL, NULL, g_wxluanumberArray_None, 0, }, ! { wxluaclassname_wxAuiPaneInfo, wxAuiPaneInfo_methods, wxAuiPaneInfo_methodCount, NULL, &wxluatype_wxAuiPaneInfo, NULL, NULL, wxAuiPaneInfo_enums, wxAuiPaneInfo_enumCount, }, ! { wxluaclassname_wxAuiPaneInfoArray, wxAuiPaneInfoArray_methods, wxAuiPaneInfoArray_methodCount, NULL, &wxluatype_wxAuiPaneInfoArray, NULL, NULL, g_wxluanumberArray_None, 0, }, ! { wxluaclassname_wxAuiSimpleTabArt, wxAuiSimpleTabArt_methods, wxAuiSimpleTabArt_methodCount, NULL, &wxluatype_wxAuiSimpleTabArt, wxluabaseclassnames_wxAuiSimpleTabArt, wxluabaseclassbinds_wxAuiSimpleTabArt, g_wxluanumberArray_None, 0, }, ! { wxluaclassname_wxAuiTabArt, wxAuiTabArt_methods, wxAuiTabArt_methodCount, NULL, &wxluatype_wxAuiTabArt, NULL, NULL, g_wxluanumberArray_None, 0, }, ! { wxluaclassname_wxAuiTabContainerButton, wxAuiTabContainerButton_methods, wxAuiTabContainerButton_methodCount, NULL, &wxluatype_wxAuiTabContainerButton, NULL, NULL, g_wxluanumberArray_None, 0, }, ! { wxluaclassname_wxAuiTabCtrl, wxAuiTabCtrl_methods, wxAuiTabCtrl_methodCount, CLASSINFO(wxAuiTabCtrl), &wxluatype_wxAuiTabCtrl, wxluabaseclassnames_wxAuiTabCtrl, wxluabaseclassbinds_wxAuiTabCtrl, g_wxluanumberArray_None, 0, }, #endif // wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI --- 9066,9091 ---- { #if wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI ! { wxluaclassname_wxAuiDefaultDockArt, wxAuiDefaultDockArt_methods, wxAuiDefaultDockArt_methodCount, NULL, &wxluatype_wxAuiDefaultDockArt, wxluabaseclassnames_wxAuiDefaultDockArt, wxluabaseclassbinds_wxAuiDefaultDockArt, NULL, NULL, NULL, 0, }, ! { wxluaclassname_wxAuiDefaultTabArt, wxAuiDefaultTabArt_methods, wxAuiDefaultTabArt_methodCount, NULL, &wxluatype_wxAuiDefaultTabArt, wxluabaseclassnames_wxAuiDefaultTabArt, wxluabaseclassbinds_wxAuiDefaultTabArt, NULL, NULL, NULL, 0, }, ! { wxluaclassname_wxAuiDockArt, wxAuiDockArt_methods, wxAuiDockArt_methodCount, NULL, &wxluatype_wxAuiDockArt, NULL, NULL, NULL, NULL, NULL, 0, }, ! { wxluaclassname_wxAuiDockInfo, wxAuiDockInfo_methods, wxAuiDockInfo_methodCount, NULL, &wxluatype_wxAuiDockInfo, NULL, NULL, NULL, NULL, NULL, 0, }, ! { wxluaclassname_wxAuiDockUIPart, wxAuiDockUIPart_methods, wxAuiDockUIPart_methodCount, NULL, &wxluatype_wxAuiDockUIPart, NULL, NULL, NULL, NULL, wxAuiDockUIPart_enums, wxAuiDockUIPart_enumCount, }, ! { wxluaclassname_wxAuiFloatingFrame, wxAuiFloatingFrame_methods, wxAuiFloatingFrame_methodCount, CLASSINFO(wxAuiFloatingFrame), &wxluatype_wxAuiFloatingFrame, wxluabaseclassnames_wxAuiFloatingFrame, wxluabaseclassbinds_wxAuiFloatingFrame, NULL, NULL, NULL, 0, }, ! { wxluaclassname_wxAuiMDIChildFrame, wxAuiMDIChildFrame_methods, wxAuiMDIChildFrame_methodCount, CLASSINFO(wxAuiMDIChildFrame), &wxluatype_wxAuiMDIChildFrame, wxluabaseclassnames_wxAuiMDIChildFrame, wxluabaseclassbinds_wxAuiMDIChildFrame, NULL, NULL, NULL, 0, }, ! { wxluaclassname_wxAuiMDIClientWindow, wxAuiMDIClientWindow_methods, wxAuiMDIClientWindow_methodCount, CLASSINFO(wxAuiMDIClientWindow), &wxluatype_wxAuiMDIClientWindow, wxluabaseclassnames_wxAuiMDIClientWindow, wxluabaseclassbinds_wxAuiMDIClientWindow, NULL, NULL, NULL, 0, }, ! { wxluaclassname_wxAuiMDIParentFrame, wxAuiMDIParentFrame_methods, wxAuiMDIParentFrame_methodCount, CLASSINFO(wxAuiMDIParentFrame), &wxluatype_wxAuiMDIParentFrame, wxluabaseclassnames_wxAuiMDIParentFrame, wxluabaseclassbinds_wxAuiMDIParentFrame, NULL, NULL, NULL, 0, }, ! { wxluaclassname_wxAuiManager, wxAuiManager_methods, wxAuiManager_methodCount, CLASSINFO(wxAuiManager), &wxluatype_wxAuiManager, wxluabaseclassnames_wxAuiManager, wxluabaseclassbinds_wxAuiManager, NULL, NULL, NULL, 0, }, ! { wxluaclassname_wxAuiManagerEvent, wxAuiManagerEvent_methods, wxAuiManagerEvent_methodCount, CLASSINFO(wxAuiManagerEvent), &wxluatype_wxAuiManagerEvent, wxluabaseclassnames_wxAuiManagerEvent, wxluabaseclassbinds_wxAuiManagerEvent, NULL, NULL, NULL, 0, }, ! { wxluaclassname_wxAuiNotebook, wxAuiNotebook_methods, wxAuiNotebook_methodCount, CLASSINFO(wxAuiNotebook), &wxluatype_wxAuiNotebook, wxluabaseclassnames_wxAuiNotebook, wxluabaseclassbinds_wxAuiNotebook, NULL, NULL, NULL, 0, }, ! { wxluaclassname_wxAuiNotebookEvent, wxAuiNotebookEvent_methods, wxAuiNotebookEvent_methodCount, CLASSINFO(wxAuiNotebookEvent), &wxluatype_wxAuiNotebookEvent, wxluabaseclassnames_wxAuiNotebookEvent, wxluabaseclassbinds_wxAuiNotebookEvent, NULL, NULL, NULL, 0, }, ! { wxluaclassname_wxAuiNotebookPage, wxAuiNotebookPage_methods, wxAuiNotebookPage_methodCount, NULL, &wxluatype_wxAuiNotebookPage, NULL, NULL, NULL, NULL, NULL, 0, }, ! { wxluaclassname_wxAuiNotebookPageArray, wxAuiNotebookPageArray_methods, wxAuiNotebookPageArray_methodCount, NULL, &wxluatype_wxAuiNotebookPageArray, NULL, NULL, NULL, NULL, NULL, 0, }, ! { wxluaclassname_wxAuiPaneButton, wxAuiPaneButton_methods, wxAuiPaneButton_methodCount, NULL, &wxluatype_wxAuiPaneButton, NULL, NULL, NULL, NULL, NULL, 0, }, ! { wxluaclassname_wxAuiPaneInfo, wxAuiPaneInfo_methods, wxAuiPaneInfo_methodCount, NULL, &wxluatype_wxAuiPaneInfo, NULL, NULL, NULL, NULL, wxAuiPaneInfo_enums, wxAuiPaneInfo_enumCount, }, ! { wxluaclassname_wxAuiPaneInfoArray, wxAuiPaneInfoArray_methods, wxAuiPaneInfoArray_methodCount, NULL, &wxluatype_wxAuiPaneInfoArray, NULL, NULL, NULL, NULL, NULL, 0, }, ! { wxluaclassname_wxAuiSimpleTabArt, wxAuiSimpleTabArt_methods, wxAuiSimpleTabArt_methodCount, NULL, &wxluatype_wxAuiSimpleTabArt, wxluabaseclassnames_wxAuiSimpleTabArt, wxluabaseclassbinds_wxAuiSimpleTabArt, NULL, NULL, NULL, 0, }, ! { wxluaclassname_wxAuiTabArt, wxAuiTabArt_methods, wxAuiTabArt_methodCount, NULL, &wxluatype_wxAuiTabArt, NULL, NULL, NULL, NULL, NULL, 0, }, ! { wxluaclassname_wxAuiTabContainerButton, wxAuiTabContainerButton_methods, wxAuiTabContainerButton_methodCount, NULL, &wxluatype_wxAuiTabContainerButton, NULL, NULL, NULL, NULL, NULL, 0, }, ! { wxluaclassname_wxAuiTabCtrl, wxAuiTabCtrl_methods, wxAuiTabCtrl_methodCount, CLASSINFO(wxAuiTabCtrl), &wxluatype_wxAuiTabCtrl, wxluabaseclassnames_wxAuiTabCtrl, wxluabaseclassbinds_wxAuiTabCtrl, NULL, NULL, NULL, 0, }, #endif // wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI Index: wxxrc_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxxrc_bind.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** wxxrc_bind.cpp 19 May 2009 03:20:53 -0000 1.12 --- wxxrc_bind.cpp 25 Sep 2009 18:47:58 -0000 1.13 *************** *** 789,793 **** { #if wxLUA_USE_wxXRC && wxUSE_XRC ! { wxluaclassname_wxXmlResource, wxXmlResource_methods, wxXmlResource_methodCount, NULL, &wxluatype_wxXmlResource, wxluabaseclassnames_wxXmlResource, wxluabaseclassbinds_wxXmlResource, g_wxluanumberArray_None, 0, }, #endif // wxLUA_USE_wxXRC && wxUSE_XRC --- 789,793 ---- { #if wxLUA_USE_wxXRC && wxUSE_XRC ! { wxluaclassname_wxXmlResource, wxXmlResource_methods, wxXmlResource_methodCount, NULL, &wxluatype_wxXmlResource, wxluabaseclassnames_wxXmlResource, wxluabaseclassbinds_wxXmlResource, NULL, NULL, NULL, 0, }, #endif // wxLUA_USE_wxXRC && wxUSE_XRC Index: wxgl_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxgl_bind.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** wxgl_bind.cpp 19 May 2009 03:20:53 -0000 1.12 --- wxgl_bind.cpp 25 Sep 2009 18:47:58 -0000 1.13 *************** *** 726,731 **** { #if wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS ! { wxluaclassname_wxGLCanvas, wxGLCanvas_methods, wxGLCanvas_methodCount, CLASSINFO(wxGLCanvas), &wxluatype_wxGLCanvas, wxluabaseclassnames_wxGLCanvas, wxluabaseclassbinds_wxGLCanvas, g_wxluanumberArray_None, 0, }, ! { wxluaclassname_wxGLContext, wxGLContext_methods, wxGLContext_methodCount, CLASSINFO(wxGLContext), &wxluatype_wxGLContext, wxluabaseclassnames_wxGLContext, wxluabaseclassbinds_wxGLContext, g_wxluanumberArray_None, 0, }, #endif // wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS --- 726,731 ---- { #if wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS ! { wxluaclassname_wxGLCanvas, wxGLCanvas_methods, wxGLCanvas_methodCount, CLASSINFO(wxGLCanvas), &wxluatype_wxGLCanvas, wxluabaseclassnames_wxGLCanvas, wxluabaseclassbinds_wxGLCanvas, NULL, NULL, NULL, 0, }, ! { wxluaclassname_wxGLContext, wxGLContext_methods, wxGLContext_methodCount, CLASSINFO(wxGLContext), &wxluatype_wxGLContext, wxluabaseclassnames_wxGLContext, wxluabaseclassbinds_wxGLContext, NULL, NULL, NULL, 0, }, #endif // wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS Index: wxmedia_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxmedia_bind.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** wxmedia_bind.cpp 19 May 2009 03:20:53 -0000 1.13 --- wxmedia_bind.cpp 25 Sep 2009 18:47:58 -0000 1.14 *************** *** 757,762 **** { #if wxLUA_USE_wxMediaCtrl && wxUSE_MEDIACTRL ! { wxluaclassname_wxMediaCtrl, wxMediaCtrl_methods, wxMediaCtrl_methodCount, CLASSINFO(wxMediaCtrl), &wxluatype_wxMediaCtrl, wxluabaseclassnames_wxMediaCtrl, wxluabaseclassbinds_wxMediaCtrl, g_wxluanumberArray_None, 0, }, ! { wxluaclassname_wxMediaEvent, wxMediaEvent_methods, wxMediaEvent_methodCount, CLASSINFO(wxMediaEvent), &wxluatype_wxMediaEvent, wxluabaseclassnames_wxMediaEvent, wxluabaseclassbinds_wxMediaEvent, g_wxluanumberArray_None, 0, }, #endif // wxLUA_USE_wxMediaCtrl && wxUSE_MEDIACTRL --- 757,762 ---- { #if wxLUA_USE_wxMediaCtrl && wxUSE_MEDIACTRL ! { wxluaclassname_wxMediaCtrl, wxMediaCtrl_methods, wxMediaCtrl_methodCount, CLASSINFO(wxMediaCtrl), &wxluatype_wxMediaCtrl, wxluabaseclassnames_wxMediaCtrl, wxluabaseclassbinds_wxMediaCtrl, NULL, NULL, NULL, 0, }, ! { wxluaclassname_wxMediaEvent, wxMediaEvent_methods, wxMediaEvent_methodCount, CLASSINFO(wxMediaEvent), &wxluatype_wxMediaEvent, wxluabaseclassnames_wxMediaEvent, wxluabaseclassbinds_wxMediaEvent, NULL, NULL, NULL, 0, }, #endif // wxLUA_USE_wxMediaCtrl && wxUSE_MEDIACTRL Index: wxcore_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxcore_bind.cpp,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** wxcore_bind.cpp 24 May 2009 03:19:59 -0000 1.24 --- wxcore_bind.cpp 25 Sep 2009 18:47:57 -0000 1.25 *************** *** 4309,4312 **** --- 4309,4314 ---- static const char* wxluaclassname_wxIndividualLayoutConstraint = "wxIndividualLayoutConstraint"; static const char* wxluaclassname_wxInitDialogEvent = "wxInitDialogEvent"; + static const char* wxluaclassname_wxItemContainer = "wxItemContainer"; + static const char* wxluaclassname_wxItemContainerImmutable = "wxItemContainerImmutable"; static const char* wxluaclassname_wxJPEGHandler = "wxJPEGHandler"; static const char* wxluaclassname_wxKeyEvent = "wxKeyEvent"; *************** *** 4509,4514 **** static const char* wxluabaseclassnames_wxBrush[] = { wxluaclassname_wxGDIObject, NULL }; [...1859 lines suppressed...] ! { wxluaclassname_wxWindow, wxWindow_methods, wxWindow_methodCount, CLASSINFO(wxWindow), &wxluatype_wxWindow, wxluabaseclassnames_wxWindow, wxluabaseclassbinds_wxWindow, NULL, NULL, NULL, 0, }, ! { wxluaclassname_wxWindowCreateEvent, wxWindowCreateEvent_methods, wxWindowCreateEvent_methodCount, CLASSINFO(wxWindowCreateEvent), &wxluatype_wxWindowCreateEvent, wxluabaseclassnames_wxWindowCreateEvent, wxluabaseclassbinds_wxWindowCreateEvent, NULL, NULL, NULL, 0, }, #if wxLUA_USE_wxDC ! { wxluaclassname_wxWindowDC, wxWindowDC_methods, wxWindowDC_methodCount, CLASSINFO(wxWindowDC), &wxluatype_wxWindowDC, wxluabaseclassnames_wxWindowDC, wxluabaseclassbinds_wxWindowDC, NULL, NULL, NULL, 0, }, #endif // wxLUA_USE_wxDC ! { wxluaclassname_wxWindowDestroyEvent, wxWindowDestroyEvent_methods, wxWindowDestroyEvent_methodCount, CLASSINFO(wxWindowDestroyEvent), &wxluatype_wxWindowDestroyEvent, wxluabaseclassnames_wxWindowDestroyEvent, wxluabaseclassbinds_wxWindowDestroyEvent, NULL, NULL, NULL, 0, }, ! { wxluaclassname_wxWindowDisabler, wxWindowDisabler_methods, wxWindowDisabler_methodCount, NULL, &wxluatype_wxWindowDisabler, NULL, NULL, NULL, NULL, NULL, 0, }, #if wxLUA_USE_wxWindowList && !wxUSE_STL ! { wxluaclassname_wxWindowList, wxWindowList_methods, wxWindowList_methodCount, NULL, &wxluatype_wxWindowList, wxluabaseclassnames_wxWindowList, wxluabaseclassbinds_wxWindowList, NULL, NULL, NULL, 0, }, #endif // wxLUA_USE_wxWindowList && !wxUSE_STL ! { wxluaclassname_wxWindowUpdateLocker, wxWindowUpdateLocker_methods, wxWindowUpdateLocker_methodCount, NULL, &wxluatype_wxWindowUpdateLocker, NULL, NULL, NULL, NULL, NULL, 0, }, #if wxLUA_USE_wxImage && wxUSE_IMAGE ! { wxluaclassname_wxXPMHandler, wxXPMHandler_methods, wxXPMHandler_methodCount, CLASSINFO(wxXPMHandler), &wxluatype_wxXPMHandler, wxluabaseclassnames_wxXPMHandler, wxluabaseclassbinds_wxXPMHandler, NULL, NULL, NULL, 0, }, #endif // wxLUA_USE_wxImage && wxUSE_IMAGE Index: wxcore_controls.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxcore_controls.cpp,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** wxcore_controls.cpp 31 Mar 2009 04:23:42 -0000 1.19 --- wxcore_controls.cpp 25 Sep 2009 18:47:57 -0000 1.20 *************** *** 969,989 **** #if (wxLUA_USE_wxChoice || wxLUA_USE_wxComboBox || wxLUA_USE_wxListBox ) && wxUSE_CONTROLS // --------------------------------------------------------------------------- ! // Bind class wxControlWithItems // --------------------------------------------------------------------------- ! // Lua MetaTable Tag for Class 'wxControlWithItems' ! int wxluatype_wxControlWithItems = WXLUA_TUNKNOWN; #if (wxLUA_USE_wxArrayString) && ((wxLUA_USE_wxChoice || wxLUA_USE_wxComboBox || wxLUA_USE_wxListBox ) && wxUSE_CONTROLS) ! static wxLuaArgType s_wxluatypeArray_wxLua_wxControlWithItems_Append3[] = { &wxluatype_wxControlWithItems, &wxluatype_wxArrayString, NULL }; [...1077 lines suppressed...] + // get this + wxChoice * self = (wxChoice *)wxluaT_getuserdatatype(L, 1, wxluatype_wxChoice); + // call Command + self->Command(*event); + + return 0; + } + + #if (((wxLUA_USE_wxValidator && wxUSE_VALIDATORS) && (wxLUA_USE_wxChoice && wxUSE_CHOICE)) && (wxLUA_USE_wxArrayString)) && (wxLUA_USE_wxPointSizeRect) static wxLuaArgType s_wxluatypeArray_wxLua_wxChoice_Create[] = { &wxluatype_wxChoice, &wxluatype_wxWindow, &wxluatype_TNUMBER, &wxluatype_wxPoint, &wxluatype_wxSize, &wxluatype_wxArrayString, &wxluatype_TNUMBER, &wxluatype_wxValidator, &wxluatype_TSTRING, NULL }; *************** *** 1605,1608 **** --- 1742,1747 ---- // Map Lua Class Methods to C Binding Functions wxLuaBindMethod wxChoice_methods[] = { + { "Command", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxChoice_Command, 1, NULL }, + #if (((wxLUA_USE_wxValidator && wxUSE_VALIDATORS) && (wxLUA_USE_wxChoice && wxUSE_CHOICE)) && (wxLUA_USE_wxArrayString)) && (wxLUA_USE_wxPointSizeRect) { "Create", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxChoice_Create, 1, NULL }, Index: wxxml_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxxml_bind.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** wxxml_bind.cpp 19 May 2009 03:20:53 -0000 1.13 --- wxxml_bind.cpp 25 Sep 2009 18:47:58 -0000 1.14 *************** *** 1138,1144 **** { #if wxLUA_USE_wxXML && wxUSE_XML ! { wxluaclassname_wxXmlDocument, wxXmlDocument_methods, wxXmlDocument_methodCount, CLASSINFO(wxXmlDocument), &wxluatype_wxXmlDocument, wxluabaseclassnames_wxXmlDocument, wxluabaseclassbinds_wxXmlDocument, g_wxluanumberArray_None, 0, }, ! { wxluaclassname_wxXmlNode, wxXmlNode_methods, wxXmlNode_methodCount, NULL, &wxluatype_wxXmlNode, NULL, NULL, g_wxluanumberArray_None, 0, }, ! { wxluaclassname_wxXmlProperty, wxXmlProperty_methods, wxXmlProperty_methodCount, NULL, &wxluatype_wxXmlProperty, NULL, NULL, g_wxluanumberArray_None, 0, }, #endif // wxLUA_USE_wxXML && wxUSE_XML --- 1138,1144 ---- { #if wxLUA_USE_wxXML && wxUSE_XML ! { wxluaclassname_wxXmlDocument, wxXmlDocument_methods, wxXmlDocument_methodCount, CLASSINFO(wxXmlDocument), &wxluatype_wxXmlDocument, wxluabaseclassnames_wxXmlDocument, wxluabaseclassbinds_wxXmlDocument, NULL, NULL, NULL, 0, }, ! { wxluaclassname_wxXmlNode, wxXmlNode_methods, wxXmlNode_methodCount, NULL, &wxluatype_wxXmlNode, NULL, NULL, NULL, NULL, NULL, 0, }, ! { wxluaclassname_wxXmlProperty, wxXmlProperty_methods, wxXmlProperty_methodCount, NULL, &wxluatype_wxXmlProperty, NULL, NULL, NULL, NULL, NULL, 0, }, #endif // wxLUA_USE_wxXML && wxUSE_XML Index: wxbase_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxbase_bind.cpp,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** wxbase_bind.cpp 24 May 2009 03:19:59 -0000 1.21 --- wxbase_bind.cpp 25 Sep 2009 18:47:57 -0000 1.22 *************** *** 2271,2276 **** static const char* wxluabaseclassnames_wxLogChain[] = { wxluaclassname_wxLog, NULL }; static wxLuaBindClass* wxluabaseclassbinds_wxLogChain[] = { NULL }; - static const char* wxluabaseclassnames_wxLogNull[] = { wxluaclassname_wxLog, NULL }; - static wxLuaBindClass* wxluabaseclassbinds_wxLogNull[] = { NULL }; static const char* wxluabaseclassnames_wxLogPassThrough[] = { wxluaclassname_wxLogChain, NULL }; static wxLuaBindClass* wxluabaseclassbinds_wxLogPassThrough[] = { NULL }; --- 2271,2274 ---- *************** *** 2528,2733 **** { #if (wxUSE_STREAMS) && (wxUSE_FILESYSTEM) ! { wxluaclassname_wxArchiveFSHandler, wxArchiveFSHandler_methods, wxArchiveFSHandler_methodCount, CLASSINFO(wxArchiveFSHandler), &wxluatype_wxArchiveFSHandler, wxluabaseclassnames_wxArchiveFSHandler, wxluabaseclassbinds_wxArchiveFSHandler, g_wxluanumberArray_None, 0, }, #endif // (wxUSE_STREAMS) && (wxUSE_FILESYSTEM) #if wxLUA_USE_wxArrayInt ! { wxluaclassname_wxArrayInt, wxArrayInt_methods, wxArrayInt_methodCount, NULL, &wxluatype_wxArrayInt, NULL, NULL, g_wxluanumberArray_None, 0, }, #endif // wxLUA_USE_wxArrayInt #if wxLUA_USE_wxArrayString ! { wxluaclassname_wxArrayString, wxArrayString_methods, wxArrayString_methodCount, NULL, &wxluatype_wxArrayString, NULL, NULL, g_wxluanumberArray_None, 0, }, #endif // wxLUA_USE_wxArrayString #if wxLUA_USE_wxClassInfo ! { wxluaclassname_wxClassInfo, wxClassInfo_methods, wxClassInfo_methodCount, NULL, &wxluatype_wxClassInfo, NULL, NULL, g_wxluanumberArray_None, 0, }, #endif // wxLUA_USE_wxClassInfo ! { wxluaclassname_wxClientData, wxClientData_methods, wxClientData_methodCount, NULL, &wxluatype_wxClientData, NULL, NULL, g_wxluanumberArray_None, 0, }, ! { wxluaclassname_wxClientDataContainer, wxClientDataContainer_methods, wxClientDataContainer_methodCount, NULL, &wxluatype_wxClientDataContainer, NULL, NULL, g_wxluanumberArray_None, 0, }, #if wxLUA_USE_wxConfig && wxUSE_CONFIG ! { wxluaclassname_wxConfig, wxConfig_methods, wxConfig_methodCount, NULL, &wxluatype_wxConfig, wxluabaseclassnames_wxConfig, wxluabaseclassbinds_wxConfig, g_wxluanumberArray_None, 0, }, ! { wxluaclassname_wxConfigBase, wxConfigBase_methods, wxConfigBase_methodCount, NULL, &wxluatype_wxConfigBase, NULL, NULL, wxConfigBase_enums, wxConfigBase_enumCount, }, ! { wxluaclassname_wxConfigPathChanger, wxConfigPathChanger_methods, wxConfigPathChanger_methodCount, NULL, &wxluatype_wxConfigPathChanger, NULL, NULL, g_wxluanumberArray_None, 0, }, #endif // wxLUA_USE_wxConfig && wxUSE_CONFIG #if wxLUA_USE_wxCriticalSection && wxUSE_THREADS ! { wxluaclassname_wxCriticalSection, wxCriticalSection_methods, wxCriticalSection_methodCount, NULL, &wxluatype_wxCriticalSection, NULL, NULL, g_wxluanumberArray_None, 0, }, #endif // wxLUA_USE_wxCriticalSection && wxUSE_THREADS #if wxLUA_USE_wxCriticalSectionLocker ! { wxluaclassname_wxCriticalSectionLocker, wxCriticalSectionLocker_methods, wxCriticalSectionLocker_methodCount, NULL, &wxluatype_wxCriticalSectionLocker, NULL, NULL, g_wxluanumberArray_None, 0, }, #endif // wxLUA_USE_wxCriticalSectionLocker #if wxUSE_STREAMS ! { wxluaclassname_wxDataInputStream, wxDataInputStream_methods, wxDataInputStream_methodCount, NULL, &wxluatype_wxDataInputStream, NULL, NULL, g_wxluanumberArray_None, 0, }, ! { wxluaclassname_wxDataOutputStream, wxDataOutputStream_methods, wxDataOutputStream_methodCount, NULL, &wxluatype_wxDataOutputStream, NULL, NULL, g_wxluanumberArray_None, 0, }, #endif // wxUSE_STREAMS #if wxLUA_USE_wxDateSpan && wxUSE_DATETIME ! { wxluaclassname_wxDateSpan, wxDateSpan_methods, wxDateSpan_methodCount, NULL, &wxluatype_wxDateSpan, NULL, NULL, g_wxluanumberArray_None, 0, }, #endif // wxLUA_USE_wxDateSpan && wxUSE_DATETIME #if wxLUA_USE_wxDateTime && wxUSE_DATETIME ! { wxluaclassname_wxDateTime, wxDateTime_methods, wxDateTime_methodCount, NULL, &wxluatype_wxDateTime, NULL, NULL, wxDateTime_enums, wxDateTime_enumCount, }, ! { wxluaclassname_wxDateTimeArray, wxDateTimeArray_methods, wxDateTimeArray_methodCount, NULL, &wxluatype_wxDateTimeArray, NULL, NULL, g_wxluanumberArray_None, 0, }, #endif // wxLUA_USE_wxDateTime && wxUSE_DATETIME #if wxLUA_USE_wxDateTimeHolidayAuthority && wxUSE_DATETIME ! { wxluaclassname_wxDateTimeHolidayAuthority, wxDateTimeHolidayAuthority_methods, wxDateTimeHolidayAuthority_methodCount, NULL, &wxluatype_wxDateTimeHolidayAuthority, NULL, NULL, g_wxluanumberArray_None, 0, }, ! { wxluaclassname_wxDateTimeWorkDays, wxDateTimeWorkDays_methods, wxDateTimeWorkDays_methodCount, NULL, &wxluatype_wxDateTimeWorkDays, wxluabaseclassnames_wxDateTimeWorkDays, wxluabaseclassbinds_wxDateTimeWorkDays, g_wxluanumberArray_None, 0, }, #endif // wxLUA_USE_wxDateTimeHolidayAuthority && wxUSE_DATETIME #if wxLUA_USE_wxDir ! { wxluaclassname_wxDir, wxDir_methods, wxDir_methodCount, NULL, &wxluatype_wxDir, NULL, NULL, g_wxluanumberArray_None, 0, }, #endif // wxLUA_USE_wxDir ! { wxluaclassname_wxDynamicLibrary, wxDynamicLibrary_methods, wxDynamicLibrary_methodCount, NULL, &wxluatype_wxDynamicLibrary, NULL, NULL, g_wxluanumberArray_None, 0, }, ! { wxluaclassname_wxDynamicLibraryDetails, wxDynamicLibraryDetails_methods, wxDynamicLibraryDetails_methodCount, NULL, &wxluatype_wxDynamicLibraryDetails, NULL, NULL, g_wxluanumberArray_None, 0, }, ! { wxluaclassname_wxDynamicLibraryDetailsArray, wxDynamicLibraryDetailsArray_methods, wxDynamicLibraryDetailsArray_methodCount, NULL, &wxluatype_wxDynamicLibraryDetailsArray, NULL, NULL, g_wxluanumberArray_None, 0, }, #if (wxUSE_STREAMS) && (wxUSE_FILESYSTEM) ! { wxluaclassname_wxFSFile, wxFSFile_methods, wxFSFile_methodCount, CLASSINFO(wxFSFile), &wxluatype_wxFSFile, wxluabaseclassnames_wxFSFile, wxluabaseclassbinds_wxFSFile, g_wxluanumberArray_None, 0, }, #endif // (wxUSE_STREAMS) && (wxUSE_FILESYSTEM) #if wxLUA_USE_wxFile && wxUSE_FILE ! { wxluaclassname_wxFile, wxFile_methods, wxFile_methodCount, NULL, &wxluatype_wxFile, NULL, NULL, wxFile_enums, wxFile_enumCount, }, #endif // wxLUA_USE_wxFile && wxUSE_FILE #if wxLUA_USE_wxConfig && wxUSE_CONFIG ! { wxluaclassname_wxFileConfig, wxFileConfig_methods, wxFileConfig_methodCount, NULL, &wxluatype_wxFileConfig, wxluabaseclassnames_wxFileConfig, wxluabaseclassbinds_wxFileConfig, g_wxluanumberArray_None, 0, }, #endif // wxLUA_USE_wxConfig && wxUSE_CONFIG #if wxUSE_STREAMS ! { wxluaclassname_wxFileInputStream, wxFileInputStream_methods, wxFileInputStream_methodCount, NULL, &wxluatype_wxFileInputStream, wxluabaseclassnames_wxFileInputStream, wxluabaseclassbinds_wxFileInputStream, g_wxluanumberArray_None, 0, }, #endif // wxUSE_STREAMS #if wxLUA_USE_wxFileName ! { wxluaclassname_wxFileName, wxFileName_methods, wxFileName_methodCount, NULL, &wxluatype_wxFileName, NULL, NULL, g_wxluanumberArray_None, 0, }, #endif // wxLUA_USE_wxFileName #if wxUSE_STREAMS ! { wxluaclassname_wxFileOutputStream, wxFileOutputStream_methods, wxFileOutputStream_methodCount, NULL, &wxluatype_wxFileOutputStream, wxluabaseclassnames_wxFileOutputStream, wxluabaseclassbinds_wxFileOutputStream, g_wxluanumberArray_None, 0, }, #endif // wxUSE_STREAMS #if (wxUSE_STREAMS) && (wxUSE_FILESYSTEM) ! { wxluaclassname_wxFileSystem, wxFileSystem_methods, wxFileSystem_methodCount, CLASSINFO(wxFileSystem), &wxluatype_wxFileSystem, wxluabaseclassnames_wxFileSystem, wxluabaseclassbinds_wxFileSystem, g_wxluanumberArray_None, 0, }, ! { wxluaclassname_wxFileSystemHandler, wxFileSystemHandler_methods, wxFileSystemHandler_methodCount, CLASSINFO(wxFileSystemHandler), &wxluatype_wxFileSystemHandler, wxluabaseclassnames_wxFileSystemHandler, wxluabaseclassbinds_wxFileSystemHandler, g_wxluanumberArray_None, 0, }, #endif // (wxUSE_STREAMS) && (wxUSE_FILESYSTEM) ! { wxluaclassname_wxFileType, wxFileType_methods, wxFileType_methodCount, NULL, &wxluatype_wxFileType, NULL, NULL, g_wxluanumberArray_None, 0, }, ! { wxluaclassname_wxFileTypeInfo, wxFileTypeInfo_methods, wxFileTypeInfo_methodCount, NULL, &wxluatype_wxFileTypeInfo, NULL, NULL, g_wxluanumberArray_None, 0, }, ! { wxluaclassname_wxFileType_MessageParameters, wxFileType_MessageParameters_methods, wxFileType_MessageParameters_methodCount, NULL, &wxluatype_wxFileType_MessageParameters, NULL, NULL, g_wxluanumberArray_None, 0, }, #if (wxUSE_STREAMS) && (wxUSE_FILESYSTEM) ! { wxluaclassname_wxFilterFSHandler, wxFilterFSHandler_methods, wxFilterFSHandler_methodCount, CLASSINFO(wxFilterFSHandler), &wxluatype_wxFilterFSHandler, wxluabaseclassnames_wxFilterFSHandler, wxluabaseclassbinds_wxFilterFSHandler, g_wxluanumberArray_None, 0, }, #endif // (wxUSE_STREAMS) && (wxUSE_FILESYSTEM) ! { wxluaclassname_wxIconLocation, wxIconLocation_methods, wxIconLocation_methodCount, NULL, &wxluatype_wxIconLocation, NULL, NULL, g_wxluanumberArray_None, 0, }, #if wxUSE_STREAMS ! { wxluaclassname_wxInputStream, wxInputStream_methods, wxInputStream_methodCount, NULL, &wxluatype_wxInputStream, wxluabaseclassnames_wxInputStream, wxluabaseclassbinds_wxInputStream, g_wxluanumberArray_None, 0, }, #endif // wxUSE_STREAMS #if (wxUSE_STREAMS) && (wxUSE_FILESYSTEM) && (wxUSE_FS_INET && wxUSE_SOCKETS) ! { wxluaclassname_wxInternetFSHandler, wxInternetFSHandler_methods, wxInternetFSHandler_methodCount, CLASSINFO(wxInternetFSHandler), &wxluatype_wxInternetFSHandler, wxluabaseclassnames_wxInternetFSHandler, wxluabaseclassbinds_wxInternetFSHandler, g_wxluanumberArray_None, 0, }, #endif // (wxUSE_STREAMS) && (wxUSE_FILESYSTEM) && (wxUSE_FS_INET && wxUSE_SOCKETS) #if wxUSE_INTL ! { wxluaclassname_wxLanguageInfo, wxLanguageInfo_methods, wxLanguageInfo_methodCount, NULL, &wxluatype_wxLanguageInfo, NULL, NULL, g_wxluanumberArray_None, 0, }, #endif // wxUSE_INTL #if wxLUA_USE_wxList && !wxUSE_STL ! { wxluaclassname_wxList, wxList_methods, wxList_methodCount, CLASSINFO(wxList), &wxluatype_wxList, wxluabaseclassnames_wxList, wxluabaseclassbinds_wxList, g_wxluanumberArray_None, 0, }, #endif // wxLUA_USE_wxList && !wxUSE_STL #if (wxUSE_STREAMS) && (wxUSE_FILESYSTEM) ! { wxluaclassname_wxLocalFSHandler, wxLocalFSHandler_methods, wxLocalFSHandler_methodCount, CLASSINFO(wxLocalFSHandler), &wxluatype_wxLocalFSHandler, wxluabaseclassnames_wxLocalFSHandler, wxluabaseclassbinds_wxLocalFSHandler, g_wxluanumberArray_None, 0, }, #endif // (wxUSE_STREAMS) && (wxUSE_FILESYSTEM) #if wxUSE_INTL ! { wxluaclassname_wxLocale, wxLocale_methods, wxLocale_methodCount, NULL, &wxluatype_wxLocale, NULL, NULL, g_wxluanumberArray_None, 0, }, #endif // wxUSE_INTL #if wxLUA_USE_wxLog && wxUSE_LOG ! { wxluaclassname_wxLog, wxLog_methods, wxLog_methodCount, NULL, &wxluatype_wxLog, NULL, NULL, g_wxluanumberArray_None, 0, }, ! { wxluaclassname_wxLogBuffer, wxLogBuffer_methods, wxLogBuffer_methodCount, NULL, &wxluatype_wxLogBuffer, wxluabaseclassnames_wxLogBuffer, wxluabaseclassbinds_wxLogBuffer, g_wxluanumberArray_None, 0, }, ! { wxluaclassname_wxLogChain, wxLogChain_methods, wxLogChain_methodCount, NULL, &wxluatype_wxLogChain, wxluabaseclassnames_wxLogChain, wxluabaseclassbinds_wxLogChain, g_wxluanumberArray_None, 0, }, ! { wxluaclassname_wxLogNull, wxLogNull_methods, wxLogNull_methodCount, NULL, &wxluatype_wxLogNull, wxluabaseclassnames_wxLogNull, wxluabaseclassbinds_wxLogNull, g_wxluanumberArray_None, 0, }, ! { wxluaclassname_wxLogPassThrough, wxLogPassThrough_methods, wxLogPassThrough_methodCount, NULL, &wxluatype_wxLogPassThrough, wxluabaseclassnames_wxLogPassThrough, wxluabaseclassbinds_wxLogPassThrough, g_wxluanumberArray_None, 0, }, #endif // wxLUA_USE_wxLog && wxUSE_LOG #if wxUSE_LONGLONG ! { wxluaclassname_wxLongLong, wxLongLong_methods, wxLongLong_methodCount, NULL, &wxluatype_wxLongLong, NULL, NULL, g_wxluanumberArray_None, 0, }, #endif // wxUSE_LONGLONG #if wxLUA_USE_wxConfig && wxUSE_CONFIG ! { wxluaclassname_wxMemoryConfig, wxMemoryConfig_methods, wxMemoryConfig_methodCount, NULL, &wxluatype_wxMemoryConfig, wxluabaseclassnames_wxMemoryConfig, wxluabaseclassbinds_wxMemoryConfig, g_wxluanumberArray_None, 0, }, #endif // wxLUA_USE_wxConfig && wxUSE_CONFIG #if wxUSE_STREAMS ! { wxluaclassname_wxMemoryInputStream, wxMemoryInputStream_methods, wxMemoryInputStream_methodCount, NULL, &wxluatype_wxMemoryInputStream, wxluabaseclassnames_wxMemoryInputStream, wxluabaseclassbinds_wxMemoryInputStream, g_wxluanumberArray_None, 0, }, #endif // wxUSE_STREAMS ! { wxluaclassname_wxMimeTypesManager, wxMimeTypesManager_methods, wxMimeTypesManager_methodCount, NULL, &wxluatype_wxMimeTypesManager, NULL, NULL, g_wxluanumberArray_None, 0, }, #if wxLUA_USE_wxList && !wxUSE_STL ! { wxluaclassname_wxNode, wxNode_methods, wxNode_methodCount, NULL, &wxluatype_wxNode, NULL, NULL, g_wxluanumberArray_None, 0, }, #endif // wxLUA_USE_wxList && !wxUSE_STL #if wxLUA_USE_wxObject ! { wxluaclassname_wxObject, wxObject_methods, wxObject_methodCount, CLASSINFO(wxObject), &wxluatype_wxObject, NULL, NULL, g_wxluanumberArray_None, 0, }, ! { wxluaclassname_wxObjectRefData, wxObjectRefData_methods, wxObjectRefData_methodCount, NULL, &wxluatype_wxObjectRefData, NULL, NULL, g_wxluanumberArray_None, 0, }, #endif // wxLUA_USE_wxObject #if wxUSE_STREAMS ! { wxluaclassname_wxOutputStream, wxOutputStream_methods, wxOutputStream_methodCount, NULL, &wxluatype_wxOutputStream, wxluabaseclassnames_wxOutputStream, wxluabaseclassbinds_wxOutputStream, g_wxluanumberArray_None, 0, }, #endif // wxUSE_STREAMS ! { wxluaclassname_wxPathList, wxPathList_methods, wxPathList_methodCount, NULL, &wxluatype_wxPathList, wxluabaseclassnames_wxPathList, wxluabaseclassbinds_wxPathList, g_wxluanumberArray_None, 0, }, ! { wxluaclassname_wxPlatformInfo, wxPlatformInfo_methods, wxPlatformInfo_methodCount, NULL, &wxluatype_wxPlatformInfo, NULL, NULL, g_wxluanumberArray_None, 0, }, #if wxLUA_USE_wxRegEx && wxUSE_REGEX ! { wxluaclassname_wxRegEx, wxRegEx_methods, wxRegEx_methodCount, NULL, &wxluatype_wxRegEx, NULL, NULL, g_wxluanumberArray_None, 0, }, #endif // wxLUA_USE_wxRegEx && wxUSE_REGEX #if wxUSE_SNGLINST_CHECKER ! { wxluaclassname_wxSingleInstanceChecker, wxSingleInstanceChecker_methods, wxSingleInstanceChecker_methodCount, NULL, &wxluatype_wxSingleInstanceChecker, NULL, NULL, g_wxluanumberArray_None, 0, }, #endif // wxUSE_SNGLINST_CHECKER #if wxLUA_USE_wxArrayString ! { wxluaclassname_wxSortedArrayString, wxSortedArrayString_methods, wxSortedArrayString_methodCount, NULL, &wxluatype_wxSortedArrayString, wxluabaseclassnames_wxSortedArrayString, wxluabaseclassbinds_wxSortedArrayString, g_wxluanumberArray_None, 0, }, #endif // wxLUA_USE_wxArrayString #if wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxStandardPaths ! { wxluaclassname_wxStandardPaths, wxStandardPaths_methods, wxStandardPaths_methodCount, NULL, &wxluatype_wxStandardPaths, NULL, NULL, wxStandardPaths_enums, wxStandardPaths_enumCount, }, #endif // wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxStandardPaths #if wxLUA_USE_wxStopWatch && wxUSE_STOPWATCH ! { wxluaclassname_wxStopWatch, wxStopWatch_methods, wxStopWatch_methodCount, NULL, &wxluatype_wxStopWatch, NULL, NULL, g_wxluanumberArray_None, 0, }, #endif // wxLUA_USE_wxStopWatch && wxUSE_STOPWATCH #if wxUSE_STREAMS ! { wxluaclassname_wxStreamBase, wxStreamBase_methods, wxStreamBase_methodCount, NULL, &wxluatype_wxStreamBase, NULL, NULL, g_wxluanumberArray_None, 0, }, #endif // wxUSE_STREAMS ! { wxluaclassname_wxString, wxString_methods, wxString_methodCount, NULL, &wxluatype_wxString, NULL, NULL, g_wxluanumberArray_None, 0, }, ! { wxluaclassname_wxStringClientData, wxStringClientData_methods, wxStringClientData_methodCount, NULL, &wxluatype_wxStringClientData, wxluabaseclassnames_wxStringClientData, wxluabaseclassbinds_wxStringClientData, g_wxluanumberArray_None, 0, }, ! { wxluaclassname_wxStringTokenizer, wxStringTokenizer_methods, wxStringTokenizer_methodCount, NULL, &wxluatype_wxStringTokenizer, wxluabaseclassnames_wxStringTokenizer, wxluabaseclassbinds_wxStringTokenizer, g_wxluanumberArray_None, 0, }, #if wxLUA_USE_wxSystemOptions ! { wxluaclassname_wxSystemOptions, wxSystemOptions_methods, wxSystemOptions_methodCount, NULL, &wxluatype_wxSystemOptions, wxluabaseclassnames_wxSystemOptions, wxluabaseclassbinds_wxSystemOptions, g_wxluanumberArray_None, 0, }, #endif // wxLUA_USE_wxSystemOptions #if wxLUA_USE_wxFile && wxUSE_FILE ! { wxluaclassname_wxTempFile, wxTempFile_methods, wxTempFile_methodCount, NULL, &wxluatype_wxTempFile, NULL, NULL, g_wxluanumberArray_None, 0, }, #endif // wxLUA_USE_wxFile && wxUSE_FILE #if wxLUA_USE_wxTimeSpan && wxUSE_DATETIME ! { wxluaclassname_wxTimeSpan, wxTimeSpan_methods, wxTimeSpan_methodCount, NULL, &wxluatype_wxTimeSpan, NULL, NULL, g_wxluanumberArray_None, 0, }, #endif // wxLUA_USE_wxTimeSpan && wxUSE_DATETIME #if wxUSE_LONGLONG ! { wxluaclassname_wxULongLong, wxULongLong_methods, wxULongLong_methodCount, NULL, &wxluatype_wxULongLong, NULL, NULL, g_wxluanumberArray_None, 0, }, #endif // wxUSE_LONGLONG --- 2526,2731 ---- { #if (wxUSE_STREAMS) && (wxUSE_FILESYSTEM) ! { wxluaclassname_wxArchiveFSHandler, wxArchiveFSHandler_methods, wxArchiveFSHandler_methodCount, CLASSINFO(wxArchiveFSHandler), &wxluatype_wxArchiveFSHandler, wxluabaseclassnames_wxArchiveFSHandler, wxluabaseclassbinds_wxArchiveFSHandler, NULL, NULL, NULL, 0, }, #endif // (wxUSE_STREAMS) && (wxUSE_FILESYSTEM) #if wxLUA_USE_wxArrayInt ! { wxluaclassname_wxArrayInt, wxArrayInt_methods, wxArrayInt_methodCount, NULL, &wxluatype_wxArrayInt, NULL, NULL, NULL, NULL, NULL, 0, }, #endif // wxLUA_USE_wxArrayInt #if wxLUA_USE_wxArrayString ! { wxluaclassname_wxArrayString, wxArrayString_methods, wxArrayString_methodCount, NULL, &wxluatype_wxArrayString, NULL, NULL, NULL, NULL, NULL, 0, }, #endif // wxLUA_USE_wxArrayString #if wxLUA_USE_wxClassInfo ! { wxluaclassname_wxClassInfo, wxClassInfo_methods, wxClassInfo_methodCount, NULL, &wxluatype_wxClassInfo, NULL, NULL, NULL, NULL, NULL, 0, }, #endif // wxLUA_USE_wxClassInfo ! { wxluaclassname_wxClientData, wxClientData_methods, wxClientData_methodCount, NULL, &wxluatype_wxClientData, NULL, NULL, NULL, NULL, NULL, 0, }, ! { wxluaclassname_wxClientDataContainer, wxClientDataContainer_methods, wxClientDataContainer_methodCount, NULL, &wxluatype_wxClientDataContainer, NULL, NULL, NULL, NULL, NULL, 0, }, #if wxLUA_USE_wxConfig && wxUSE_CONFIG ! { wxluaclassname_wxConfig, wxConfig_methods, wxConfig_methodCount, NULL, &wxluatype_wxConfig, wxluabaseclassnames_wxConfig, wxluabaseclassbinds_wxConfig, NULL, NULL, NULL, 0, }, ! { wxluaclassname_wxConfigBase, wxConfigBase_methods, wxConfigBase_methodCount, NULL, &wxluatype_wxConfigBase, NULL, NULL, NULL, NULL, wxConfigBase_enums, wxConfigBase_enumCount, }, ! { wxluaclassname_wxConfigPathChanger, wxConfigPathChanger_methods, wxConfigPathChanger_methodCount, NULL, &wxluatype_wxConfigPathChanger, NULL, NULL, NULL, NULL, NULL, 0, }, #endif // wxLUA_USE_wxConfig && wxUSE_CONFIG #if wxLUA_USE_wxCriticalSection && wxUSE_THREADS ! { wxluaclassname_wxCriticalSection, wxCriticalSection_methods, wxCriticalSection_methodCount, NULL, &wxluatype_wxCriticalSection, NULL, NULL, NULL, NULL, NULL, 0, }, #endif // wxLUA_USE_wxCriticalSection && wxUSE_THREADS #if wxLUA_USE_wxCriticalSectionLocker ! { wxluaclassname_wxCriticalSectionLocker, wxCriticalSectionLocker_methods, wxCriticalSectionLocker_methodCount, NULL, &wxluatype_wxCriticalSectionLocker, NULL, NULL, NULL, NULL, NULL, 0, }, #endif // wxLUA_USE_wxCriticalSectionLocker #if wxUSE_STREAMS ! { wxluaclassname_wxDataInputStream, wxDataInputStream_methods, wxDataInputStream_methodCount, NULL, &wxluatype_wxDataInputStream, NULL, NULL, NULL, NULL, NULL, 0, }, ! { wxluaclassname_wxDataOutputStream, wxDataOutputStream_methods, wxDataOutputStream_methodCount, NULL, &wxluatype_wxDataOutputStream, NULL, NULL, NULL, NULL, NULL, 0, }, #endif // wxUSE_STREAMS #if wxLUA_USE_wxDateSpan && wxUSE_DATETIME ! { wxluaclassname_wxDateSpan, wxDateSpan_methods, wxDateSpan_methodCount, NULL, &wxluatype_wxDateSpan, NULL, NULL, NULL, NULL, NULL, 0, }, #endif // wxLUA_USE_wxDateSpan && wxUSE_DATETIME #if wxLUA_USE_wxDateTime && wxUSE_DATETIME ! { wxluaclassname_wxDateTime, wxDateTime_methods, wxDateTime_methodCount, NULL, &wxluatype_wxDateTime, NULL, NULL, NULL, NULL, wxDateTime_enums, wxDateTime_enumCount, }, ! { wxluaclassname_wxDateTimeArray, wxDateTimeArray_methods, wxDateTimeArray_methodCount, NULL, &wxluatype_wxDateTimeArray, NULL, NULL, NULL, NULL, NULL, 0, }, #endif // wxLUA_USE_wxDateTime && wxUSE_DATETIME #if wxLUA_USE_wxDateTimeHolidayAuthority && wxUSE_DATETIME ! { wxluaclassname_wxDateTimeHolidayAuthority, wxDateTimeHolidayAuthority_methods, wxDateTimeHolidayAuthority_methodCount, NULL, &wxluatype_wxDateTimeHolidayAuthority, NULL, NULL, NULL, NULL, NULL, 0, }, ! { wxluaclassname_wxDateTimeWorkDays, wxDateTimeWorkDays_methods, wxDateTimeWorkDays_methodCount, NULL, &wxluatype_wxDateTimeWorkDays, wxluabaseclassnames_wxDateTimeWorkDays, wxluabaseclassbinds_wxDateTimeWorkDays, NULL, NULL, NULL, 0, }, #endif // wxLUA_USE_wxDateTimeHolidayAuthority && wxUSE_DATETIME #if wxLUA_USE_wxDir ! { wxluaclassname_wxDir, wxDir_methods, wxDir_methodCount, NULL, &wxluatype_wxDir, NULL, NULL, NULL, NULL, NULL, 0, }, #endif // wxLUA_USE_wxDir ! { wxluaclassname_wxDynamicLibrary, wxDynamicLibrary_methods, wxDynamicLibrary_methodCount, NULL, &wxluatype_wxDynamicLibrary, NULL, NULL, NULL, NULL, NULL, 0, }, ! { wxluaclassname_wxDynamicLibraryDetails, wxDynamicLibraryDetails_methods, wxDynamicLibraryDetails_methodCount, NULL, &wxluatype_wxDynamicLibraryDetails, NULL, NULL, NULL, NULL, NULL, 0, }, ! { wxluaclassname_wxDynamicLibraryDetailsArray, wxDynamicLibraryDetailsArray_methods, wxDynamicLibraryDetailsArray_methodCount, NULL, &wxluatype_wxDynamicLibraryDetailsArray, NULL, NULL, NULL, NULL, NULL, 0, }, #if (wxUSE_STREAMS) && (wxUSE_FILESYSTEM) ! { wxluaclassname_wxFSFile, wxFSFile_methods, wxFSFile_methodCount, CLASSINFO(wxFSFile), &wxluatype_wxFSFile, wxluabaseclassnames_wxFSFile, wxluabaseclassbinds_wxFSFile, NULL, NULL, NULL, 0, }, #endif // (wxUSE_STREAMS) && (wxUSE_FILESYSTEM) #if wxLUA_USE_wxFile && wxUSE_FILE ! { wxluaclassname_wxFile, wxFile_methods, wxFile_methodCount, NULL, &wxluatype_wxFile, NULL, NULL, NULL, NULL, wxFile_enums, wxFile_enumCount, }, #endif // wxLUA_USE_wxFile && wxUSE_FILE #if wxLUA_USE_wxConfig && wxUSE_CONFIG ! { wxluaclassname_wxFileConfig, wxFileConfig_methods, wxFileConfig_methodCount, NULL, &wxluatype_wxFileConfig, wxluabaseclassnames_wxFileConfig, wxluabaseclassbinds_wxFileConfig, NULL, NULL, NULL, 0, }, #endif // wxLUA_USE_wxConfig && wxUSE_CONFIG #if wxUSE_STREAMS ! { wxluaclassname_wxFileInputStream, wxFileInputStream_methods, wxFileInputStream_methodCount, NULL, &wxluatype_wxFileInputStream, wxluabaseclassnames_wxFileInputStream, wxluabaseclassbinds_wxFileInputStream, NULL, NULL, NULL, 0, }, #endif // wxUSE_STREAMS #if wxLUA_USE_wxFileName ! { wxluaclassname_wxFileName, wxFileName_methods, wxFileName_methodCount, NULL, &wxluatype_wxFileName, NULL, NULL, NULL, NULL, NULL, 0, }, #endif // wxLUA_USE_wxFileName #if wxUSE_STREAMS ! { wxluaclassname_wxFileOutputStream, wxFileOutputStream_methods, wxFileOutputStream_methodCount, NULL, &wxluatype_wxFileOutputStream, wxluabaseclassnames_wxFileOutputStream, wxluabaseclassbinds_wxFileOutputStream, NULL, NULL, NULL, 0, }, #endif // wxUSE_STREAMS #if (wxUSE_STREAMS) && (wxUSE_FILESYSTEM) ! { wxluaclassname_wxFileSystem, wxFileSystem_methods, wxFileSystem_methodCount, CLASSINFO(wxFileSystem), &wxluatype_wxFileSystem, wxluabaseclassnames_wxFileSystem, wxluabaseclassbinds_wxFileSystem, NULL, NULL, NULL, 0, }, ! { wxluaclassname_wxFileSystemHandler, wxFileSystemHandler_methods, wxFileSystemHandler_methodCount, CLASSINFO(wxFileSystemHandler), &wxluatype_wxFileSystemHandler, wxluabaseclassnames_wxFileSystemHandler, wxluabaseclassbinds_wxFileSystemHandler, NULL, NULL, NULL, 0, }, #endif // (wxUSE_STREAMS) && (wxUSE_FILESYSTEM) ! { wxluaclassname_wxFileType, wxFileType_methods, wxFileType_methodCount, NULL, &wxluatype_wxFileType, NULL, NULL, NULL, NULL, NULL, 0, }, ! { wxluaclassname_wxFileTypeInfo, wxFileTypeInfo_methods, wxFileTypeInfo_methodCount, NULL, &wxluatype_wxFileTypeInfo, NULL, NULL, NULL, NULL, NULL, 0, }, ! { wxluaclassname_wxFileType_MessageParameters, wxFileType_MessageParameters_methods, wxFileType_MessageParameters_methodCount, NULL, &wxluatype_wxFileType_MessageParameters, NULL, NULL, NULL, NULL, NULL, 0, }, #if (wxUSE_STREAMS) && (wxUSE_FILESYSTEM) ! { wxluaclassname_wxFilterFSHandler, wxFilterFSHandler_methods, wxFilterFSHandler_methodCount, CLASSINFO(wxFilterFSHandler), &wxluatype_wxFilterFSHandler, wxluabaseclassnames_wxFilterFSHandler, wxluabaseclassbinds_wxFilterFSHandler, NULL, NULL, NULL, 0, }, #endif // (wxUSE_STREAMS) && (wxUSE_FILESYSTEM) ! { wxluaclassname_wxIconLocation, wxIconLocation_methods, wxIconLocation_methodCount, NULL, &wxluatype_wxIconLocation, NULL, NULL, NULL, NULL, NULL, 0, }, #if wxUSE_STREAMS ! { wxluaclassname_wxInputStream, wxInputStream_methods, wxInputStream_methodCount, NULL, &wxluatype_wxInputStream, wxluabaseclassnames_wxInputStream, wxluabaseclassbinds_wxInputStream, NULL, NULL, NULL, 0, }, #endif // wxUSE_STREAMS #if (wxUSE_STREAMS) && (wxUSE_FILESYSTEM) && (wxUSE_FS_INET && wxUSE_SOCKETS) ! { wxluaclassname_wxInternetFSHandler, wxInternetFSHandler_methods, wxInternetFSHandler_methodCount, CLASSINFO(wxInternetFSHandler), &wxluatype_wxInternetFSHandler, wxluabaseclassnames_wxInternetFSHandler, wxluabaseclassbinds_wxInternetFSHandler, NULL, NULL, NULL, 0, }, #endif // (wxUSE_STREAMS) && (wxUSE_FILESYSTEM) && (wxUSE_FS_INET && wxUSE_SOCKETS) #if wxUSE_INTL ! { wxluaclassname_wxLanguageInfo, wxLanguageInfo_methods, wxLanguageInfo_methodCount, NULL, &wxluatype_wxLanguageInfo, NULL, NULL, NULL, NULL, NULL, 0, }, #endif // wxUSE_INTL #if wxLUA_USE_wxList && !wxUSE_STL ! { wxluaclassname_wxList, wxList_methods, wxList_methodCount, CLASSINFO(wxList), &wxluatype_wxList, wxluabaseclassnames_wxList, wxluabaseclassbinds_wxList, NULL, NULL, NULL, 0, }, #endif // wxLUA_USE_wxList && !wxUSE_STL #if (wxUSE_STREAMS) && (wxUSE_FILESYSTEM) ! { wxluaclassname_wxLocalFSHandler, wxLocalFSHandler_methods, wxLocalFSHandler_methodCount, CLASSINFO(wxLocalFSHandler), &wxluatype_wxLocalFSHandler, wxluabaseclassnames_wxLocalFSHandler, wxluabaseclassbinds_wxLocalFSHandler, NULL, NULL, NULL, 0, }, #endif // (wxUSE_STREAMS) && (wxUSE_FILESYSTEM) #if wxUSE_INTL ! { wxluaclassname_wxLocale, wxLocale_methods, wxLocale_methodCount, NULL, &wxluatype_wxLocale, NULL, NULL, NULL, NULL, NULL, 0, }, #endif // wxUSE_INTL #if wxLUA_USE_wxLog && wxUSE_LOG ! { wxluaclassname_wxLog, wxLog_methods, wxLog_methodCount, NULL, &wxluatype_wxLog, NULL, NULL, NULL, NULL, NULL, 0, }, ! { wxluaclassname_wxLogBuffer, wxLogBuffer_methods, wxLogBuffer_methodCount, NULL, &wxluatype_wxLogBuffer, wxluabaseclassnames_wxLogBuffer, wxluabaseclassbinds_wxLogBuffer, NULL, NULL, NULL, 0, }, ! { wxluaclassname_wxLogChain, wxLogChain_methods, wxLogChain_methodCount, NULL, &wxluatype_wxLogChain, wxluabaseclassnames_wxLogChain, wxluabaseclassbinds_wxLogChain, NULL, NULL, NULL, 0, }, ! { wxluaclassname_wxLogNull, wxLogNull_methods, wxLogNull_methodCount, NULL, &wxluatype_wxLogNull, NULL, NULL, NULL, NULL, NULL, 0, }, ! { wxluaclassname_wxLogPassThrough, wxLogPassThrough_methods, wxLogPassThrough_methodCount, NULL, &wxluatype_wxLogPassThrough, wxluabaseclassnames_wxLogPassThrough, wxluabaseclassbinds_wxLogPassThrough, NULL, NULL, NULL, 0, }, #endif // wxLUA_USE_wxLog && wxUSE_LOG #if wxUSE_LONGLONG ! { wxluaclassname_wxLongLong, wxLongLong_methods, wxLongLong_methodCount, NULL, &wxluatype_wxLongLong, NULL, NULL, NULL, NULL, NULL, 0, }, #endif // wxUSE_LONGLONG #if wxLUA_USE_wxConfig && wxUSE_CONFIG ! { wxluaclassname_wxMemoryConfig, wxMemoryConfig_methods, wxMemoryConfig_methodCount, NULL, &wxluatype_wxMemoryConfig, wxluabaseclassnames_wxMemoryConfig, wxluabaseclassbinds_wxMemoryConfig, NULL, NULL, NULL, 0, }, #endif // wxLUA_USE_wxConfig && wxUSE_CONFIG #if wxUSE_STREAMS ! { wxluaclassname_wxMemoryInputStream, wxMemoryInputStream_methods, wxMemoryInputStream_methodCount, NULL, &wxluatype_wxMemoryInputStream, wxluabaseclassnames_wxMemoryInputStream, wxluabaseclassbinds_wxMemoryInputStream, NULL, NULL, NULL, 0, }, #endif // wxUSE_STREAMS ! { wxluaclassname_wxMimeTypesManager, wxMimeTypesManager_methods, wxMimeTypesManager_methodCount, NULL, &wxluatype_wxMimeTypesManager, NULL, NULL, NULL, NULL, NULL, 0, }, #if wxLUA_USE_wxList && !wxUSE_STL ! { wxluaclassname_wxNode, wxNode_methods, wxNode_methodCount, NULL, &wxluatype_wxNode, NULL, NULL, NULL, NULL, NULL, 0, }, #endif // wxLUA_USE_wxList && !wxUSE_STL #if wxLUA_USE_wxObject ! { wxluaclassname_wxObject, wxObject_methods, wxObject_methodCount, CLASSINFO(wxObject), &wxluatype_wxObject, NULL, NULL, NULL, NULL, NULL, 0, }, ! { wxluaclassname_wxObjectRefData, wxObjectRefData_methods, wxObjectRefData_methodCount, NULL, &wxluatype_wxObjectRefData, NULL, NULL, NULL, NULL, NULL, 0, }, #endif // wxLUA_USE_wxObject #if wxUSE_STREAMS ! { wxluaclassname_wxOutputStream, wxOutputStream_methods, wxOutputStream_methodCount, NULL, &wxluatype_wxOutputStream, wxluabaseclassnames_wxOutputStream, wxluabaseclassbinds_wxOutputStream, NULL, NULL, NULL, 0, }, #endif // wxUSE_STREAMS ! { wxluaclassname_wxPathList, wxPathList_methods, wxPathList_methodCount, NULL, &wxluatype_wxPathList, wxluabaseclassnames_wxPathList, wxluabaseclassbinds_wxPathList, NULL, NULL, NULL, 0, }, ! { wxluaclassname_wxPlatformInfo, wxPlatformInfo_methods, wxPlatformInfo_methodCount, NULL, &wxluatype_wxPlatformInfo, NULL, NULL, NULL, NULL, NULL, 0, }, #if wxLUA_USE_wxRegEx && wxUSE_REGEX ! { wxluaclassname_wxRegEx, wxRegEx_methods, wxRegEx_methodCount, NULL, &wxluatype_wxRegEx, NULL, NULL, NULL, NULL, NULL, 0, }, #endif // wxLUA_USE_wxRegEx && wxUSE_REGEX #if wxUSE_SNGLINST_CHECKER ! { wxluaclassname_wxSingleInstanceChecker, wxSingleInstanceChecker_methods, wxSingleInstanceChecker_methodCount, NULL, &wxluatype_wxSingleInstanceChecker, NULL, NULL, NULL, NULL, NULL, 0, }, #endif // wxUSE_SNGLINST_CHECKER #if wxLUA_USE_wxArrayString ! { wxluaclassname_wxSortedArrayString, wxSortedArrayString_methods, wxSortedArrayString_methodCount, NULL, &wxluatype_wxSortedArrayString, wxluabaseclassnames_wxSortedArrayString, wxluabaseclassbinds_wxSortedArrayString, NULL, NULL, NULL, 0, }, #endif // wxLUA_USE_wxArrayString #if wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxStandardPaths ! { wxluaclassname_wxStandardPaths, wxStandardPaths_methods, wxStandardPaths_methodCount, NULL, &wxluatype_wxStandardPaths, NULL, NULL, NULL, NULL, wxStandardPaths_enums, wxStandardPaths_enumCount, }, #endif // wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxStandardPaths #if wxLUA_USE_wxStopWatch && wxUSE_STOPWATCH ! { wxluaclassname_wxStopWatch, wxStopWatch_methods, wxStopWatch_methodCount, NULL, &wxluatype_wxStopWatch, NULL, NULL, NULL, NULL, NULL, 0, }, #endif // wxLUA_USE_wxStopWatch && wxUSE_STOPWATCH #if wxUSE_STREAMS ! { wxluaclassname_wxStreamBase, wxStreamBase_methods, wxStreamBase_methodCount, NULL, &wxluatype_wxStreamBase, NULL, NULL, NULL, NULL, NULL, 0, }, #endif // wxUSE_STREAMS ! { wxluaclassname_wxString, wxString_methods, wxString_methodCount, NULL, &wxluatype_wxString, NULL, NULL, NULL, NULL, NULL, 0, }, ! { wxluaclassname_wxStringClientData, wxStringClientData_methods, wxStringClientData_methodCount, NULL, &wxluatype_wxStringClientData, wxluabaseclassnames_wxStringClientData, wxluabaseclassbinds_wxStringClientData, NULL, NULL, NULL, 0, }, ! { wxluaclassname_wxStringTokenizer, wxStringTokenizer_methods, wxStringTokenizer_methodCount, NULL, &wxluatype_wxStringTokenizer, wxluabaseclassnames_wxStringTokenizer, wxluabaseclassbinds_wxStringTokenizer, NULL, NULL, NULL, 0, }, #if wxLUA_USE_wxSystemOptions ! { wxluaclassname_wxSystemOptions, wxSystemOptions_methods, wxSystemOptions_methodCount, NULL, &wxluatype_wxSystemOptions, wxluabaseclassnames_wxSystemOptions, wxluabaseclassbinds_wxSystemOptions, NULL, NULL, NULL, 0, }, #endif // wxLUA_USE_wxSystemOptions #if wxLUA_USE_wxFile && wxUSE_FILE ! { wxluaclassname_wxTempFile, wxTempFile_methods, wxTempFile_methodCount, NULL, &wxluatype_wxTempFile, NULL, NULL, NULL, NULL, NULL, 0, }, #endif // wxLUA_USE_wxFile && wxUSE_FILE #if wxLUA_USE_wxTimeSpan && wxUSE_DATETIME ! { wxluaclassname_wxTimeSpan, wxTimeSpan_methods, wxTimeSpan_methodCount, NULL, &wxluatype_wxTimeSpan, NULL, NULL, NULL, NULL, NULL, 0, }, #endif // wxLUA_USE_wxTimeSpan && wxUSE_DATETIME #if wxUSE_LONGLONG ! { wxluaclassname_wxULongLong, wxULongLong_methods, wxULongLong_methodCount, NULL, &wxluatype_wxULongLong, NULL, NULL, NULL, NULL, NULL, 0, }, #endif // wxUSE_LONGLONG Index: wxstc_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxstc_bind.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** wxstc_bind.cpp 19 May 2009 03:20:53 -0000 1.15 --- wxstc_bind.cpp 25 Sep 2009 18:47:58 -0000 1.16 *************** *** 10255,10260 **** static wxLuaBindClass classList[] = { ! { wxluaclassname_wxStyledTextCtrl, wxStyledTextCtrl_methods, wxStyledTextCtrl_methodCount, CLASSINFO(wxStyledTextCtrl), &wxluatype_wxStyledTextCtrl, wxluabaseclassnames_wxStyledTextCtrl, wxluabaseclassbinds_wxStyledTextCtrl, g_wxluanumberArray_None, 0, }, ! { wxluaclassname_wxStyledTextEvent, wxStyledTextEvent_methods, wxStyledTextEvent_methodCount, CLASSINFO(wxStyledTextEvent), &wxluatype_wxStyledTextEvent, wxluabaseclassnames_wxStyledTextEvent, wxluabaseclassbinds_wxStyledTextEvent, g_wxluanumberArray_None, 0, }, { 0, 0, 0, 0, 0, 0, 0 }, --- 10255,10260 ---- static wxLuaBindClass classList[] = { ! { wxluaclassname_wxStyledTextCtrl, wxStyledTextCtrl_methods, wxStyledTextCtrl_methodCount, CLASSINFO(wxStyledTextCtrl), &wxluatype_wxStyledTextCtrl, wxluabaseclassnames_wxStyledTextCtrl, wxluabaseclassbinds_wxStyledTextCtrl, NULL, NULL, NULL, 0, }, ! { wxluaclassname_wxStyledTextEvent, wxStyledTextEvent_methods, wxStyledTextEvent_methodCount, CLASSINFO(wxStyledTextEvent), &wxluatype_wxStyledTextEvent, wxluabaseclassnames_wxStyledTextEvent, wxluabaseclassbinds_wxStyledTextEvent, NULL, NULL, NULL, 0, }, { 0, 0, 0, 0, 0, 0, 0 }, Index: wxhtml_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxhtml_bind.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** wxhtml_bind.cpp 24 May 2009 03:19:59 -0000 1.15 --- wxhtml_bind.cpp 25 Sep 2009 18:47:58 -0000 1.16 *************** *** 4978,5025 **** { #if wxLUA_USE_wxHTML && wxUSE_HTML ! { wxluaclassname_wxHtmlCell, wxHtmlCell_methods, wxHtmlCell_methodCount, CLASSINFO(wxHtmlCell), &wxluatype_wxHtmlCell, wxluabaseclassnames_wxHtmlCell, wxluabaseclassbinds_wxHtmlCell, g_wxluanumberArray_None, 0, }, #endif // wxLUA_USE_wxHTML && wxUSE_HTML #if (wxLUA_USE_wxHTML && wxUSE_HTML) && (wxCHECK_VERSION(2,8,0)) ! { wxluaclassname_wxHtmlCellEvent, wxHtmlCellEvent_methods, wxHtmlCellEvent_methodCount, CLASSINFO(wxHtmlCellEvent), &wxluatype_wxHtmlCellEvent, wxluabaseclassnames_wxHtmlCellEvent, wxluabaseclassbinds_wxHtmlCellEvent, g_wxluanumberArray_None, 0, }, ! { wxluaclassname_wxHtmlColourCell, wxHtmlColourCell_methods, wxHtmlColourCell_methodCount, CLASSINFO(wxHtmlColourCell), &wxluatype_wxHtmlColourCell, wxluabaseclassnames_wxHtmlColourCell, wxluabaseclassbinds_wxHtmlColourCell, g_wxluanumberArray_None, 0, }, #endif // (wxLUA_USE_wxHTML && wxUSE_HTML) && (wxCHECK_VERSION(2,8,0)) #if wxLUA_USE_wxHTML && wxUSE_HTML ! { wxluaclassname_wxHtmlContainerCell, wxHtmlContainerCell_methods, wxHtmlContainerCell_methodCount, CLASSINFO(wxHtmlContainerCell), &wxluatype_wxHtmlContainerCell, wxluabaseclassnames_wxHtmlContainerCell, wxluabaseclassbinds_wxHtmlContainerCell, g_wxluanumberArray_None, 0, }, ! { wxluaclassname_wxHtmlDCRenderer, wxHtmlDCRenderer_methods, wxHtmlDCRenderer_methodCount, NULL, &wxluatype_wxHtmlDCRenderer, wxluabaseclassnames_wxHtmlDCRenderer, wxluabaseclassbinds_wxHtmlDCRenderer, g_wxluanumberArray_None, 0, }, ! { wxluaclassname_wxHtmlEasyPrinting, wxHtmlEasyPrinting_methods, wxHtmlEasyPrinting_methodCount, NULL, &wxluatype_wxHtmlEasyPrinting, wxluabaseclassnames_wxHtmlEasyPrinting, wxluabaseclassbinds_wxHtmlEasyPrinting, g_wxluanumberArray_None, 0, }, #endif // wxLUA_USE_wxHTML && wxUSE_HTML #if (wxLUA_USE_wxHTML && wxUSE_HTML) && (wxCHECK_VERSION(2,8,0)) ! { wxluaclassname_wxHtmlFontCell, wxHtmlFontCell_method... [truncated message content] |
|
From: John L. <jr...@us...> - 2009-09-25 18:48:14
|
Update of /cvsroot/wxlua/wxLua/bindings In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv3461/wxLua/bindings Modified Files: genwxbind.lua Log Message: Fix multiple inheritance by adding the offset to the vtable for base classes that are second or higher. Index: genwxbind.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.lua,v retrieving revision 1.181 retrieving revision 1.182 diff -C2 -d -r1.181 -r1.182 *** genwxbind.lua 24 May 2009 03:19:59 -0000 1.181 --- genwxbind.lua 25 Sep 2009 18:47:57 -0000 1.182 *************** *** 18,25 **** -- --------------------------------------------------------------------------- ! WXLUA_BINDING_VERSION = 27 -- Used to verify that the bindings are updated -- This must match modules/wxlua/include/wxldefs.h -- otherwise a compile time error will be generated. bindingKeywordTable = {} -- Binding keywords used by the generator %XXX skipBindingKeywordTable = {} -- Binding keywords to skip and not handle (for testing?) --- 18,28 ---- -- --------------------------------------------------------------------------- ! WXLUA_BINDING_VERSION = 28 -- Used to verify that the bindings are updated -- This must match modules/wxlua/include/wxldefs.h -- otherwise a compile time error will be generated. + -- Test the interface files by casting the object to the baseclasses, use only temporarily for debugging + testInheritanceByCasting = false + bindingKeywordTable = {} -- Binding keywords used by the generator %XXX skipBindingKeywordTable = {} -- Binding keywords to skip and not handle (for testing?) *************** *** 3787,3790 **** --- 3790,3801 ---- table.insert(codeList, " "..memberTypeWithAttrib.." returns = new "..parseObject.Name.."("..argList..");\n") + -- Test the interface files by casting the object to the baseclasses + if testInheritanceByCasting then + local BaseClasses = dataTypeTable[parseObject.Name].BaseClasses + for i = 1, #(BaseClasses or {}) do + table.insert(codeList, " "..BaseClasses[i].."* returns_"..BaseClasses[i].." = dynamic_cast<"..BaseClasses[i].."*>(returns);\n") + end + end + if parseObject["%gc_this"] or (parseObject["%delete"] and (not parseObject["%ungc_this"])) then CommentBindingTable(codeList, " // add to tracked memory list\n") *************** *** 3833,3836 **** --- 3844,3855 ---- end + -- Test the interface files by casting the object to the baseclasses + if testInheritanceByCasting then + local BaseClasses = dataTypeTable[parseObject.Name].BaseClasses + for i = 1, #(BaseClasses or {}) do + table.insert(codeList, " "..BaseClasses[i].."* self_"..BaseClasses[i].." = dynamic_cast<"..BaseClasses[i].."*>(self);\n") + end + end + requiredParamCount = requiredParamCount + 1 paramCount = paramCount + 1 *************** *** 4025,4029 **** -- Figure out if we really need to have member enums for the class ! local enumArrayName = "g_wxluanumberArray_None" local enumArrayCountName = 0 local ExternEnumDeclaration = "" --- 4044,4048 ---- -- Figure out if we really need to have member enums for the class ! local enumArrayName = "NULL" local enumArrayCountName = 0 local ExternEnumDeclaration = "" *************** *** 4069,4077 **** --- 4088,4143 ---- local baseclassNames = "NULL" local baseclassBinds = "NULL" + local baseclassVtableOffsets = nil + local baseclassTypes = nil + local baseclassVtableOffsets_name = "NULL" + local baseclassTypes_name = "NULL" + if dataTypeTable[parseObject.Name].BaseClasses then baseclassNames = "wxluabaseclassnames_"..MakeVar(parseObject.Name) baseclassBinds = "wxluabaseclassbinds_"..MakeVar(parseObject.Name) + + + local a = {parseObject.Name} + local base_diff_table = {} + local base_type_table = {} + local has_multiple_base_classes = false + + local function iter_baseclasses(name, level) + if dataTypeTable[name].BaseClasses then + for i = 1, #dataTypeTable[name].BaseClasses do + if #dataTypeTable[name].BaseClasses > 1 then + has_multiple_base_classes = true + end + -- only increment level since the rest of this branch is from a second or higher base class + if i > 1 then + level = 2 + end + + a[#a+1] = dataTypeTable[name].BaseClasses[i] + + -- only store the ptr_diffs to higher base classes, the 1st level is always 0 + if level > 1 then + local ptr_diff = "((long int)("..dataTypeTable[name].BaseClasses[i].."*)("..parseObject.Name.."*)&wxluatype_TNONE) - ((long int)("..parseObject.Name.."*)&wxluatype_TNONE)" + base_diff_table[#base_diff_table+1] = ptr_diff + base_type_table[#base_type_table+1] = "&wxluatype_"..dataTypeTable[name].BaseClasses[i] + end + + iter_baseclasses(dataTypeTable[name].BaseClasses[i], level) + end + end + end + + iter_baseclasses(parseObject.Name, 1) + if has_multiple_base_classes then + baseclassVtableOffsets = "{ "..table.concat(base_diff_table, ", ").." };" + baseclassTypes = "{ "..table.concat(base_type_table, ", ")..", NULL };" + baseclassVtableOffsets_name = "wxluabaseclass_vtable_offsets_"..MakeClassVar(parseObject.Name) + baseclassTypes_name = "wxluabaseclass_wxluatypes_"..MakeClassVar(parseObject.Name) + print(table.concat(a, " ")) + end + end + local classinfo = "NULL" if not parseObject["%noclassinfo"] then *************** *** 4141,4149 **** ..baseclassNames..", " ..baseclassBinds..", " ..enumArrayName..", " ..enumArrayCountName..", " .."}, \n", ! BaseClasses = dataTypeTable[parseObject.Name].BaseClasses, ! Condition = classcondition } --- 4207,4219 ---- ..baseclassNames..", " ..baseclassBinds..", " + ..baseclassTypes_name..", " + ..baseclassVtableOffsets_name..", " ..enumArrayName..", " ..enumArrayCountName..", " .."}, \n", ! BaseClasses = dataTypeTable[parseObject.Name].BaseClasses, ! BaseClassTypes = baseclassTypes, ! BaseClassVtableOffsets = baseclassVtableOffsets, ! Condition = classcondition } *************** *** 4475,4478 **** --- 4545,4553 ---- table.insert(fileData, s.." NULL };\n") table.insert(fileData, "static wxLuaBindClass* wxluabaseclassbinds_"..sortedBindings[n][i].LuaName.."[] = { "..string.sub(string.rep("NULL, ", bc_n), 1, -3).." };\n") + + if sortedBindings[n][i].BaseClassVtableOffsets then + table.insert(fileData, "static wxLuaArgType wxluabaseclass_wxluatypes_"..sortedBindings[n][i].LuaName.."[] = "..sortedBindings[n][i].BaseClassTypes.."\n") + table.insert(fileData, "static int wxluabaseclass_vtable_offsets_"..sortedBindings[n][i].LuaName.."[] = "..sortedBindings[n][i].BaseClassVtableOffsets.."\n") + end end end |
|
From: John L. <jr...@us...> - 2009-09-25 18:48:12
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/include In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv3461/wxLua/modules/wxlua/include Modified Files: wxlbind.h wxldefs.h wxlstate.h wxlua_bind.h Log Message: Fix multiple inheritance by adding the offset to the vtable for base classes that are second or higher. Index: wxldefs.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxldefs.h,v retrieving revision 1.47 retrieving revision 1.48 diff -C2 -d -r1.47 -r1.48 *** wxldefs.h 19 May 2009 03:20:53 -0000 1.47 --- wxldefs.h 25 Sep 2009 18:47:58 -0000 1.48 *************** *** 65,69 **** //----------------------------------------------------------------------------- ! #define WXLUA_BINDING_VERSION 27 // ---------------------------------------------------------------------------- --- 65,69 ---- //----------------------------------------------------------------------------- ! #define WXLUA_BINDING_VERSION 28 // ---------------------------------------------------------------------------- Index: wxlbind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlbind.h,v retrieving revision 1.87 retrieving revision 1.88 diff -C2 -d -r1.87 -r1.88 *** wxlbind.h 19 May 2009 03:20:53 -0000 1.87 --- wxlbind.h 25 Sep 2009 18:47:58 -0000 1.88 *************** *** 79,82 **** --- 79,83 ---- // Lua types. The binding generator uses these and generates new ones for // classes and structs as specified in the bindings. + extern WXDLLIMPEXP_DATA_WXLUA(int) wxluatype_TUNKNOWN; extern WXDLLIMPEXP_DATA_WXLUA(int) wxluatype_TNONE; extern WXDLLIMPEXP_DATA_WXLUA(int) wxluatype_TNIL; *************** *** 98,102 **** extern WXDLLIMPEXP_DATA_WXLUA(wxLuaBindClass) wxLuaBindClass_NULL; // for NULL pointer ! // Copies of wxLua types that are used very often. // Note that we do not use the original since we may not be linked // to the binding library that defines them. --- 99,103 ---- extern WXDLLIMPEXP_DATA_WXLUA(wxLuaBindClass) wxLuaBindClass_NULL; // for NULL pointer ! // Copies of wxLua types that are used very often, point to wxluatype_TUNKNOWN if unset. // Note that we do not use the original since we may not be linked // to the binding library that defines them. *************** *** 153,157 **** int method_type; // enum wxLuaMethod_Type flags for this function 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. }; --- 154,158 ---- int method_type; // enum wxLuaMethod_Type flags for this function int minargs; // Min number of required args ! int maxargs; // Max number of args allowed, equal to length of argtypes array wxLuaArgType* argtypes; // Array of wxLua types representing each argument, NULL terminated. }; *************** *** 182,187 **** }; - extern WXDLLIMPEXP_DATA_WXLUA(wxLuaBindNumber) g_wxluanumberArray_None[1]; // = {{0,0}} - // ---------------------------------------------------------------------------- // wxLuaBindString - Defines a wxWidgets wxChar* string for wxLua --- 183,186 ---- *************** *** 240,243 **** --- 239,248 ---- // library or module with the base class is not loaded. + wxLuaArgType* baseclass_wxluatypes; // NULL terminated array of wxLua types for the base classes + // that are from second or higher base classes + int* baseclass_vtable_offsets; // Array of pointer offsets of the second or higher + // base classes from the root class. + // See note above wxluaT_getuserdatatype() + wxLuaBindNumber* enums; // Class member enums or NULL if none int enums_n; // number of enums Index: wxlstate.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlstate.h,v retrieving revision 1.124 retrieving revision 1.125 diff -C2 -d -r1.124 -r1.125 *** wxlstate.h 19 May 2009 03:20:53 -0000 1.124 --- wxlstate.h 25 Sep 2009 18:47:58 -0000 1.125 *************** *** 441,449 **** // Is a class with the wxl_type equal to or derived from a class with the base_wxl_type. ! // 0 means same class, +1 means base is parent, +2 base is grandparent, ... // returns -1 if the wxLua type is not derived from the base type. ! WXDLLIMPEXP_WXLUA int LUACALL wxluaT_isderivedtype(lua_State* L, int wxl_type, int base_wxl_type); // Same as above, but works directly with the wxLuaBindClasses. ! WXDLLIMPEXP_WXLUA int LUACALL wxluaT_isderivedclass(const wxLuaBindClass* wxlClass, const wxLuaBindClass* base_wxlClass); // Verify if the luatype = lua_type(L, stack_idx) is valid for the // wxl_type which is one of the predefined WXLUA_TXXX or s_wxluaarg_XXX types. --- 441,453 ---- // Is a class with the wxl_type equal to or derived from a class with the base_wxl_type. ! // Optional input baseclass_n is set to the highest multiple baseclass level, where ! // 0 means that inheritance from wxl_type to base_wxl_type is always the first ! // base class, a 1 or higher means that wxl_type is derived from the second or higher ! // base class somewhere along the inheritance chain. ! // return of 0 means same class, +1 means base is parent, +2 base is grandparent, ... // returns -1 if the wxLua type is not derived from the base type. ! WXDLLIMPEXP_WXLUA int LUACALL wxluaT_isderivedtype(lua_State* L, int wxl_type, int base_wxl_type, int* baseclass_n = NULL); // Same as above, but works directly with the wxLuaBindClasses. ! WXDLLIMPEXP_WXLUA int LUACALL wxluaT_isderivedclass(const wxLuaBindClass* wxlClass, const wxLuaBindClass* base_wxlClass, int* baseclass_n = NULL); // Verify if the luatype = lua_type(L, stack_idx) is valid for the // wxl_type which is one of the predefined WXLUA_TXXX or s_wxluaarg_XXX types. *************** *** 910,914 **** const wxLuaBindClass* GetBindClass(const wxLuaBindCFunc* wxlCFunc) const; // See wxluaT_isderivedtype(). ! int IsDerivedType(int wxl_type, int base_wxl_type) const; // Get wxLuaBindEvent for given wxEventType (wxEvent::GetEventType()) by finding // the matching wxLuaBindEvent::eventType. --- 914,918 ---- const wxLuaBindClass* GetBindClass(const wxLuaBindCFunc* wxlCFunc) const; // See wxluaT_isderivedtype(). ! int IsDerivedType(int wxl_type, int base_wxl_type, int* baseclass_n) const; // Get wxLuaBindEvent for given wxEventType (wxEvent::GetEventType()) by finding // the matching wxLuaBindEvent::eventType. Index: wxlua_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlua_bind.h,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** wxlua_bind.h 19 May 2009 03:20:53 -0000 1.18 --- wxlua_bind.h 25 Sep 2009 18:47:58 -0000 1.19 *************** *** 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 // --------------------------------------------------------------------------- --- 17,23 ---- // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 28 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 28 // --------------------------------------------------------------------------- |
|
From: John L. <jr...@us...> - 2009-09-25 18:48:09
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/include In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv3461/wxLua/modules/wxbind/include Modified Files: wxadv_bind.h wxaui_bind.h wxbase_bind.h wxcore_bind.h wxgl_bind.h wxhtml_bind.h wxmedia_bind.h wxnet_bind.h wxrichtext_bind.h wxstc_bind.h wxxml_bind.h wxxrc_bind.h Log Message: Fix multiple inheritance by adding the offset to the vtable for base classes that are second or higher. Index: wxadv_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxadv_bind.h,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** wxadv_bind.h 19 May 2009 03:20:53 -0000 1.19 --- wxadv_bind.h 25 Sep 2009 18:47:57 -0000 1.20 *************** *** 20,26 **** // 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 // --------------------------------------------------------------------------- --- 20,26 ---- // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 28 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 28 // --------------------------------------------------------------------------- Index: wxcore_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxcore_bind.h,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** wxcore_bind.h 19 May 2009 03:20:53 -0000 1.20 --- wxcore_bind.h 25 Sep 2009 18:47:57 -0000 1.21 *************** *** 20,26 **** // 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 // --------------------------------------------------------------------------- --- 20,26 ---- // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 28 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 28 // --------------------------------------------------------------------------- *************** *** 136,139 **** --- 136,140 ---- #include "wx/control.h" + #include "wx/ctrlsub.h" #include "wx/defs.h" #include "wx/effects.h" *************** *** 540,544 **** #if (wxLUA_USE_wxChoice || wxLUA_USE_wxComboBox || wxLUA_USE_wxListBox ) && wxUSE_CONTROLS ! extern WXDLLIMPEXP_DATA_BINDWXCORE(int) wxluatype_wxControlWithItems; #endif // (wxLUA_USE_wxChoice || wxLUA_USE_wxComboBox || wxLUA_USE_wxListBox ) && wxUSE_CONTROLS --- 541,546 ---- #if (wxLUA_USE_wxChoice || wxLUA_USE_wxComboBox || wxLUA_USE_wxListBox ) && wxUSE_CONTROLS ! extern WXDLLIMPEXP_DATA_BINDWXCORE(int) wxluatype_wxItemContainer; ! extern WXDLLIMPEXP_DATA_BINDWXCORE(int) wxluatype_wxItemContainerImmutable; #endif // (wxLUA_USE_wxChoice || wxLUA_USE_wxComboBox || wxLUA_USE_wxListBox ) && wxUSE_CONTROLS *************** *** 701,704 **** --- 703,707 ---- extern WXDLLIMPEXP_DATA_BINDWXCORE(int) wxluatype_wxContextMenuEvent; extern WXDLLIMPEXP_DATA_BINDWXCORE(int) wxluatype_wxControl; + extern WXDLLIMPEXP_DATA_BINDWXCORE(int) wxluatype_wxControlWithItems; extern WXDLLIMPEXP_DATA_BINDWXCORE(int) wxluatype_wxDisplayChangedEvent; extern WXDLLIMPEXP_DATA_BINDWXCORE(int) wxluatype_wxEffects; Index: wxrichtext_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxrichtext_bind.h,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** wxrichtext_bind.h 19 May 2009 03:20:53 -0000 1.17 --- wxrichtext_bind.h 25 Sep 2009 18:47:57 -0000 1.18 *************** *** 20,26 **** // 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 // --------------------------------------------------------------------------- --- 20,26 ---- // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 28 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 28 // --------------------------------------------------------------------------- Index: wxxrc_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxxrc_bind.h,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** wxxrc_bind.h 19 May 2009 03:20:53 -0000 1.17 --- wxxrc_bind.h 25 Sep 2009 18:47:57 -0000 1.18 *************** *** 20,26 **** // 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 // --------------------------------------------------------------------------- --- 20,26 ---- // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 28 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 28 // --------------------------------------------------------------------------- Index: wxnet_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxnet_bind.h,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** wxnet_bind.h 19 May 2009 03:20:53 -0000 1.17 --- wxnet_bind.h 25 Sep 2009 18:47:57 -0000 1.18 *************** *** 20,26 **** // 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 // --------------------------------------------------------------------------- --- 20,26 ---- // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 28 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 28 // --------------------------------------------------------------------------- Index: wxbase_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxbase_bind.h,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** wxbase_bind.h 19 May 2009 03:20:53 -0000 1.18 --- wxbase_bind.h 25 Sep 2009 18:47:57 -0000 1.19 *************** *** 19,25 **** // 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 // --------------------------------------------------------------------------- --- 19,25 ---- // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 28 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 28 // --------------------------------------------------------------------------- Index: wxmedia_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxmedia_bind.h,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** wxmedia_bind.h 19 May 2009 03:20:53 -0000 1.17 --- wxmedia_bind.h 25 Sep 2009 18:47:57 -0000 1.18 *************** *** 21,27 **** // 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 // --------------------------------------------------------------------------- --- 21,27 ---- // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 28 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 28 // --------------------------------------------------------------------------- Index: wxgl_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxgl_bind.h,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** wxgl_bind.h 19 May 2009 03:20:53 -0000 1.17 --- wxgl_bind.h 25 Sep 2009 18:47:57 -0000 1.18 *************** *** 20,26 **** // 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 // --------------------------------------------------------------------------- --- 20,26 ---- // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 28 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 28 // --------------------------------------------------------------------------- Index: wxstc_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxstc_bind.h,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** wxstc_bind.h 19 May 2009 03:20:53 -0000 1.17 --- wxstc_bind.h 25 Sep 2009 18:47:57 -0000 1.18 *************** *** 20,26 **** // 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 // --------------------------------------------------------------------------- --- 20,26 ---- // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 28 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 28 // --------------------------------------------------------------------------- Index: wxaui_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxaui_bind.h,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** wxaui_bind.h 19 May 2009 03:20:53 -0000 1.18 --- wxaui_bind.h 25 Sep 2009 18:47:57 -0000 1.19 *************** *** 20,26 **** // 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 // --------------------------------------------------------------------------- --- 20,26 ---- // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 28 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 28 // --------------------------------------------------------------------------- Index: wxhtml_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxhtml_bind.h,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** wxhtml_bind.h 19 May 2009 03:20:53 -0000 1.18 --- wxhtml_bind.h 25 Sep 2009 18:47:57 -0000 1.19 *************** *** 20,26 **** // 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 // --------------------------------------------------------------------------- --- 20,26 ---- // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 28 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 28 // --------------------------------------------------------------------------- Index: wxxml_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxxml_bind.h,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** wxxml_bind.h 19 May 2009 03:20:53 -0000 1.17 --- wxxml_bind.h 25 Sep 2009 18:47:57 -0000 1.18 *************** *** 20,26 **** // 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 // --------------------------------------------------------------------------- --- 20,26 ---- // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 28 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 28 // --------------------------------------------------------------------------- |
|
From: John L. <jr...@us...> - 2009-09-25 18:48:09
|
Update of /cvsroot/wxlua/wxLua/apps/wxluacan/src In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv3461/wxLua/apps/wxluacan/src Modified Files: wxluacan_bind.cpp wxluacan_bind.h Log Message: Fix multiple inheritance by adding the offset to the vtable for base classes that are second or higher. Index: wxluacan_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/wxluacan_bind.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** wxluacan_bind.h 19 May 2009 03:20:53 -0000 1.6 --- wxluacan_bind.h 25 Sep 2009 18:47:57 -0000 1.7 *************** *** 18,24 **** // 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 // --------------------------------------------------------------------------- --- 18,24 ---- // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 28 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 28 // --------------------------------------------------------------------------- Index: wxluacan_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/wxluacan_bind.cpp,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** wxluacan_bind.cpp 19 May 2009 03:20:53 -0000 1.36 --- wxluacan_bind.cpp 25 Sep 2009 18:47:57 -0000 1.37 *************** *** 692,702 **** static wxLuaBindClass classList[] = { ! { wxluaclassname_wxlCan, wxlCan_methods, wxlCan_methodCount, NULL, &wxluatype_wxlCan, wxluabaseclassnames_wxlCan, wxluabaseclassbinds_wxlCan, g_wxluanumberArray_None, 0, }, ! { wxluaclassname_wxlCanObj, wxlCanObj_methods, wxlCanObj_methodCount, NULL, &wxluatype_wxlCanObj, wxluabaseclassnames_wxlCanObj, wxluabaseclassbinds_wxlCanObj, g_wxluanumberArray_None, 0, }, ! { wxluaclassname_wxlCanObjAddScript, wxlCanObjAddScript_methods, wxlCanObjAddScript_methodCount, NULL, &wxluatype_wxlCanObjAddScript, wxluabaseclassnames_wxlCanObjAddScript, wxluabaseclassbinds_wxlCanObjAddScript, g_wxluanumberArray_None, 0, }, ! { wxluaclassname_wxlCanObjCircle, wxlCanObjCircle_methods, wxlCanObjCircle_methodCount, NULL, &wxluatype_wxlCanObjCircle, wxluabaseclassnames_wxlCanObjCircle, wxluabaseclassbinds_wxlCanObjCircle, g_wxluanumberArray_None, 0, }, ! { wxluaclassname_wxlCanObjRect, wxlCanObjRect_methods, wxlCanObjRect_methodCount, NULL, &wxluatype_wxlCanObjRect, wxluabaseclassnames_wxlCanObjRect, wxluabaseclassbinds_wxlCanObjRect, g_wxluanumberArray_None, 0, }, ! { wxluaclassname_wxlCanObjScript, wxlCanObjScript_methods, wxlCanObjScript_methodCount, NULL, &wxluatype_wxlCanObjScript, wxluabaseclassnames_wxlCanObjScript, wxluabaseclassbinds_wxlCanObjScript, g_wxluanumberArray_None, 0, }, ! { wxluaclassname_wxlLuaCanCmd, wxlLuaCanCmd_methods, wxlLuaCanCmd_methodCount, NULL, &wxluatype_wxlLuaCanCmd, wxluabaseclassnames_wxlLuaCanCmd, wxluabaseclassbinds_wxlLuaCanCmd, g_wxluanumberArray_None, 0, }, { 0, 0, 0, 0, 0, 0, 0 }, --- 692,702 ---- static wxLuaBindClass classList[] = { ! { wxluaclassname_wxlCan, wxlCan_methods, wxlCan_methodCount, NULL, &wxluatype_wxlCan, wxluabaseclassnames_wxlCan, wxluabaseclassbinds_wxlCan, NULL, NULL, NULL, 0, }, ! { wxluaclassname_wxlCanObj, wxlCanObj_methods, wxlCanObj_methodCount, NULL, &wxluatype_wxlCanObj, wxluabaseclassnames_wxlCanObj, wxluabaseclassbinds_wxlCanObj, NULL, NULL, NULL, 0, }, ! { wxluaclassname_wxlCanObjAddScript, wxlCanObjAddScript_methods, wxlCanObjAddScript_methodCount, NULL, &wxluatype_wxlCanObjAddScript, wxluabaseclassnames_wxlCanObjAddScript, wxluabaseclassbinds_wxlCanObjAddScript, NULL, NULL, NULL, 0, }, ! { wxluaclassname_wxlCanObjCircle, wxlCanObjCircle_methods, wxlCanObjCircle_methodCount, NULL, &wxluatype_wxlCanObjCircle, wxluabaseclassnames_wxlCanObjCircle, wxluabaseclassbinds_wxlCanObjCircle, NULL, NULL, NULL, 0, }, ! { wxluaclassname_wxlCanObjRect, wxlCanObjRect_methods, wxlCanObjRect_methodCount, NULL, &wxluatype_wxlCanObjRect, wxluabaseclassnames_wxlCanObjRect, wxluabaseclassbinds_wxlCanObjRect, NULL, NULL, NULL, 0, }, ! { wxluaclassname_wxlCanObjScript, wxlCanObjScript_methods, wxlCanObjScript_methodCount, NULL, &wxluatype_wxlCanObjScript, wxluabaseclassnames_wxlCanObjScript, wxluabaseclassbinds_wxlCanObjScript, NULL, NULL, NULL, 0, }, ! { wxluaclassname_wxlLuaCanCmd, wxlLuaCanCmd_methods, wxlLuaCanCmd_methodCount, NULL, &wxluatype_wxlLuaCanCmd, wxluabaseclassnames_wxlLuaCanCmd, wxluabaseclassbinds_wxlLuaCanCmd, NULL, NULL, NULL, 0, }, { 0, 0, 0, 0, 0, 0, 0 }, |
|
From: John L. <jr...@us...> - 2009-09-25 18:48:09
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv3461/wxLua/bindings/wxwidgets Modified Files: wx_datatypes.lua wxbase_base.i wxbase_data.i wxcore_controls.i wxcore_gdi.i Log Message: Fix multiple inheritance by adding the offset to the vtable for base classes that are second or higher. Index: wxcore_gdi.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxcore_gdi.i,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** wxcore_gdi.i 29 Oct 2008 04:44:33 -0000 1.7 --- wxcore_gdi.i 25 Sep 2009 18:47:57 -0000 1.8 *************** *** 658,662 **** %if wxLUA_USE_wxPenList ! %class %noclassinfo wxPenList, wxList %define_pointer wxThePenList --- 658,662 ---- %if wxLUA_USE_wxPenList ! %class %noclassinfo wxPenList //, wxList - it's not really derived from a wxList %define_pointer wxThePenList *************** *** 666,672 **** wxPen* FindOrCreatePen(const wxColour& colour, int width, int style) - // Use the wxList methods, see also wxNode - //void AddPen(wxPen *pen) internal use for wxWidgets - //void RemovePen(wxPen *pen) %endclass --- 666,669 ---- *************** *** 717,721 **** %if wxLUA_USE_wxBrushList ! %class %noclassinfo wxBrushList, wxList %define_pointer wxTheBrushList --- 714,718 ---- %if wxLUA_USE_wxBrushList ! %class %noclassinfo wxBrushList //, wxList - it's not really derived from it %define_pointer wxTheBrushList *************** *** 728,731 **** --- 725,729 ---- //void AddBrush(wxBrush *brush) internal use for wxWidgets //void RemoveBrush(wxBrush *brush) + %endclass Index: wxbase_base.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxbase_base.i,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** wxbase_base.i 22 Oct 2008 05:31:45 -0000 1.4 --- wxbase_base.i 25 Sep 2009 18:47:57 -0000 1.5 *************** *** 443,447 **** // wxLogNull ! %class %delete %noclassinfo %encapsulate wxLogNull, wxLog // NOTE: ALWAYS delete() this when done since Lua's gc may not delete it soon enough wxLogNull() --- 443,447 ---- // wxLogNull ! %class %delete %noclassinfo %encapsulate wxLogNull // NOTE: this is not derived from wxLog // NOTE: ALWAYS delete() this when done since Lua's gc may not delete it soon enough wxLogNull() Index: wxbase_data.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxbase_data.i,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** wxbase_data.i 29 Oct 2008 04:44:33 -0000 1.3 --- wxbase_data.i 25 Sep 2009 18:47:57 -0000 1.4 *************** *** 215,219 **** // To convert wxObject* GetData() to another type use wxObject::DynamicCast ! // See wxPenList, wxBrushList, wxMenuItemList, wxWindowList // Example: How to use a wxWindowList --- 215,219 ---- // To convert wxObject* GetData() to another type use wxObject::DynamicCast ! // See wxMenuItemList, wxWindowList // Example: How to use a wxWindowList Index: wx_datatypes.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wx_datatypes.lua,v retrieving revision 1.102 retrieving revision 1.103 diff -C2 -d -r1.102 -r1.103 *** wx_datatypes.lua 29 Jun 2009 03:22:46 -0000 1.102 --- wx_datatypes.lua 25 Sep 2009 18:47:57 -0000 1.103 *************** *** 648,654 **** }, wxBrushList = { - BaseClasses = { - [1] = "wxList", - }, Condition = "(wxLUA_USE_wxColourPenBrush) && (wxLUA_USE_wxBrushList)", IsNumber = false, --- 648,651 ---- *************** *** 967,971 **** wxComboBox = { BaseClasses = { ! [1] = "wxControlWithItems", }, Condition = "wxLUA_USE_wxComboBox && wxUSE_COMBOBOX", --- 964,969 ---- wxComboBox = { BaseClasses = { ! [1] = "wxControl", ! [2] = "wxItemContainer", }, Condition = "wxLUA_USE_wxComboBox && wxUSE_COMBOBOX", *************** *** 1067,1072 **** BaseClasses = { [1] = "wxControl", }, - Condition = "(wxLUA_USE_wxChoice || wxLUA_USE_wxComboBox || wxLUA_USE_wxListBox ) && wxUSE_CONTROLS", IsNumber = false, Name = "wxControlWithItems", --- 1065,1070 ---- BaseClasses = { [1] = "wxControl", + [2] = "wxItemContainer", }, IsNumber = false, Name = "wxControlWithItems", *************** *** 2706,2709 **** --- 2704,2722 ---- ValueType = "class", }, + wxItemContainer = { + BaseClasses = { + [1] = "wxItemContainerImmutable", + }, + Condition = "(wxLUA_USE_wxChoice || wxLUA_USE_wxComboBox || wxLUA_USE_wxListBox ) && wxUSE_CONTROLS", + IsNumber = false, + Name = "wxItemContainer", + ValueType = "class", + }, + wxItemContainerImmutable = { + Condition = "(wxLUA_USE_wxChoice || wxLUA_USE_wxComboBox || wxLUA_USE_wxListBox ) && wxUSE_CONTROLS", + IsNumber = false, + Name = "wxItemContainerImmutable", + ValueType = "class", + }, wxItemKind = { Condition = "wxLUA_USE_wxMenu && wxUSE_MENUS", *************** *** 2982,2988 **** wxLogNull = { ["%encapsulate"] = true, - BaseClasses = { - [1] = "wxLog", - }, Condition = "wxLUA_USE_wxLog && wxUSE_LOG", IsNumber = false, --- 2995,2998 ---- *************** *** 3585,3591 **** }, wxPenList = { - BaseClasses = { - [1] = "wxList", - }, Condition = "(wxLUA_USE_wxColourPenBrush) && (wxLUA_USE_wxPenList)", IsNumber = false, --- 3595,3598 ---- Index: wxcore_controls.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxcore_controls.i,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** wxcore_controls.i 4 Dec 2008 05:12:38 -0000 1.8 --- wxcore_controls.i 25 Sep 2009 18:47:57 -0000 1.9 *************** *** 118,122 **** // --------------------------------------------------------------------------- ! // wxControlWithItems %if (wxLUA_USE_wxChoice|wxLUA_USE_wxComboBox|wxLUA_USE_wxListBox) && wxUSE_CONTROLS --- 118,122 ---- // --------------------------------------------------------------------------- ! // wxItemContainerImmutable %if (wxLUA_USE_wxChoice|wxLUA_USE_wxComboBox|wxLUA_USE_wxListBox) && wxUSE_CONTROLS *************** *** 124,157 **** %include "wx/ctrlsub.h" ! %class wxControlWithItems, wxControl ! // no constructor, this is just a base class ! int Append(const wxString& item) ! int Append(const wxString& item, voidptr_long number) // C++ is (void *clientData) You can put a number here ! int Append(const wxString& item, wxClientData *clientData) ! void Append(const wxArrayString& strings) ! void Clear() ! void Delete(unsigned int n) ! int FindString(const wxString& string) ! // C++ Func: void* GetClientData(unsigned int n) const ! voidptr_long GetClientData(unsigned int n) const // C++ returns (void *) You get a number here ! wxClientData* GetClientObject(unsigned int n) const ! %rename GetStringClientObject wxStringClientData* GetClientObject(unsigned int n) const ! int GetCount() const ! int GetSelection() const ! wxString GetString(unsigned int n) const wxString GetStringSelection() const ! int Insert(const wxString& item, int pos) ! int Insert(const wxString& item, unsigned int pos, voidptr_long number) // C++ is (void *clientData) You can put a number here ! int Insert(const wxString& item, unsigned int pos, wxClientData *clientData) ! bool IsEmpty() const ! // int Number() const // obsolete since 2.2 use GetCount() void Select(int n) void SetClientData(unsigned int n, voidptr_long number) // C++ is (void *clientData) You can put a number here ! void SetClientObject(unsigned int n, wxClientData *data) ! void SetSelection(unsigned int n) ! void SetString(unsigned int n, const wxString& string) ! bool SetStringSelection(const wxString& string) %endclass --- 124,196 ---- %include "wx/ctrlsub.h" ! %class %noclassinfo wxItemContainerImmutable ! // no constructor, used only as a base class ! virtual unsigned int GetCount() const ! virtual bool IsEmpty() const ! virtual wxString GetString(unsigned int n) // = 0; ! wxArrayString GetStrings() const ! virtual void SetString(unsigned int n, const wxString& s) // = 0; ! ! virtual int FindString(const wxString& s, bool bCase = false) const ! ! virtual void SetSelection(int n) //= 0; ! virtual int GetSelection() const //= 0; ! ! bool SetStringSelection(const wxString& s) wxString GetStringSelection() const ! void Select(int n) + + %endclass + + // --------------------------------------------------------------------------- + // wxItemContainer + + %include "wx/ctrlsub.h" + + %class %noclassinfo wxItemContainer, wxItemContainerImmutable + // no constructor, used only as base class + + int Append(const wxString& item) + int Append(const wxString& item, voidptr_long number) // C++ is (void *clientData) You can put a number here + int Append(const wxString& item, wxClientData *clientData) + + void AppendString( const wxString& item) + + void Append(const wxArrayString& strings); + + int Insert(const wxString& item, unsigned int pos) + int Insert(const wxString& item, unsigned int pos, voidptr_long number) // C++ is (void *clientData) You can put a number here + int Insert(const wxString& item, unsigned int pos, wxClientData *clientData); + + virtual void Clear() //= 0; + virtual void Delete(unsigned int n) //= 0; + + void SetClientData(unsigned int n, voidptr_long number) // C++ is (void *clientData) You can put a number here ! voidptr_long GetClientData(unsigned int n) const // C++ returns (void *) You get a number here ! ! void SetClientObject(unsigned int n, wxClientData* clientData) ! wxClientData* GetClientObject(unsigned int n) const ! ! bool HasClientObjectData() const ! bool HasClientUntypedData() const ! ! %endclass ! ! %endif ! ! // --------------------------------------------------------------------------- ! // wxControlWithItems ! ! %include "wx/ctrlsub.h" ! ! %class wxControlWithItems, wxControl, wxItemContainer ! // no constructor, this is just a base class ! ! virtual bool ShouldInheritColours() const ! %endclass *************** *** 173,176 **** --- 212,217 ---- //int GetColumns() const // Motif only but returns 1 otherwise //void SetColumns(int n = 1) + + void Command(wxCommandEvent& event) %endclass *************** *** 189,193 **** %define wxCB_SORT ! %class wxComboBox, wxControlWithItems wxComboBox() wxComboBox(wxWindow* parent, wxWindowID id, const wxString& value = "", const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxArrayString& choices = wxLuaNullSmartwxArrayString, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxComboBox") --- 230,234 ---- %define wxCB_SORT ! %class wxComboBox, wxControl, wxItemContainer wxComboBox() wxComboBox(wxWindow* parent, wxWindowID id, const wxString& value = "", const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxArrayString& choices = wxLuaNullSmartwxArrayString, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxComboBox") |
|
From: John L. <jr...@us...> - 2009-09-25 18:48:09
|
Update of /cvsroot/wxlua/wxLua/modules/wxluasocket/include In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv3461/wxLua/modules/wxluasocket/include Modified Files: wxluasocket_bind.h Log Message: Fix multiple inheritance by adding the offset to the vtable for base classes that are second or higher. Index: wxluasocket_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/include/wxluasocket_bind.h,v retrieving revision 1.39 retrieving revision 1.40 diff -C2 -d -r1.39 -r1.40 *** wxluasocket_bind.h 19 May 2009 03:20:53 -0000 1.39 --- wxluasocket_bind.h 25 Sep 2009 18:47:58 -0000 1.40 *************** *** 20,26 **** // 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 // --------------------------------------------------------------------------- --- 20,26 ---- // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 28 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 28 // --------------------------------------------------------------------------- |
|
From: John L. <jr...@us...> - 2009-09-25 18:48:07
|
Update of /cvsroot/wxlua/wxLua/modules/wxluasocket/src In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv3461/wxLua/modules/wxluasocket/src Modified Files: wxluasocket_bind.cpp Log Message: Fix multiple inheritance by adding the offset to the vtable for base classes that are second or higher. Index: wxluasocket_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxluasocket_bind.cpp,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** wxluasocket_bind.cpp 19 May 2009 03:20:53 -0000 1.34 --- wxluasocket_bind.cpp 25 Sep 2009 18:47:58 -0000 1.35 *************** *** 631,636 **** static wxLuaBindClass classList[] = { ! { wxluaclassname_wxLuaDebuggerEvent, wxLuaDebuggerEvent_methods, wxLuaDebuggerEvent_methodCount, CLASSINFO(wxLuaDebuggerEvent), &wxluatype_wxLuaDebuggerEvent, wxluabaseclassnames_wxLuaDebuggerEvent, wxluabaseclassbinds_wxLuaDebuggerEvent, g_wxluanumberArray_None, 0, }, ! { wxluaclassname_wxLuaDebuggerServer, wxLuaDebuggerServer_methods, wxLuaDebuggerServer_methodCount, CLASSINFO(wxLuaDebuggerServer), &wxluatype_wxLuaDebuggerServer, wxluabaseclassnames_wxLuaDebuggerServer, wxluabaseclassbinds_wxLuaDebuggerServer, g_wxluanumberArray_None, 0, }, { 0, 0, 0, 0, 0, 0, 0 }, --- 631,636 ---- static wxLuaBindClass classList[] = { ! { wxluaclassname_wxLuaDebuggerEvent, wxLuaDebuggerEvent_methods, wxLuaDebuggerEvent_methodCount, CLASSINFO(wxLuaDebuggerEvent), &wxluatype_wxLuaDebuggerEvent, wxluabaseclassnames_wxLuaDebuggerEvent, wxluabaseclassbinds_wxLuaDebuggerEvent, NULL, NULL, NULL, 0, }, ! { wxluaclassname_wxLuaDebuggerServer, wxLuaDebuggerServer_methods, wxLuaDebuggerServer_methodCount, CLASSINFO(wxLuaDebuggerServer), &wxluatype_wxLuaDebuggerServer, wxluabaseclassnames_wxLuaDebuggerServer, wxluabaseclassbinds_wxLuaDebuggerServer, NULL, NULL, NULL, 0, }, { 0, 0, 0, 0, 0, 0, 0 }, |
|
From: John L. <jr...@us...> - 2009-06-29 03:22:49
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv11505/wxLua/bindings/wxwidgets Modified Files: wx_datatypes.lua wxadv_adv.i Log Message: Add methods for wxBitmapComboBox and fix inheritance. Index: wxadv_adv.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxadv_adv.i,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** wxadv_adv.i 20 May 2009 04:43:41 -0000 1.5 --- wxadv_adv.i 29 Jun 2009 03:22:46 -0000 1.6 *************** *** 144,148 **** %include "wx/bmpcbox.h" ! %class wxBitmapComboBox //, wxControlWithItems wxBitmapComboBox() //wxBitmapComboBox(wxWindow* parent, wxWindowID id, const wxString& value = "", const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, int n = 0, const wxString choices[] = NULL, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "comboBox") --- 144,148 ---- %include "wx/bmpcbox.h" ! %class wxBitmapComboBox, wxControl wxBitmapComboBox() //wxBitmapComboBox(wxWindow* parent, wxWindowID id, const wxString& value = "", const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, int n = 0, const wxString choices[] = NULL, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "comboBox") *************** *** 151,167 **** bool Create(wxWindow* parent, wxWindowID id, const wxString& value, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxArrayString& choices = wxLuaNullSmartwxArrayString, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxBitmapComboBox") ! int Append(const wxString& item, const wxBitmap& bitmap = wxNullBitmap) ! int Append(const wxString& item, const wxBitmap& bitmap, voidptr_long data ) // C++ is (void *clientData) You can put a number here ! int Append(const wxString& item, const wxBitmap& bitmap, wxClientData *clientData) wxSize GetBitmapSize() const ! wxBitmap GetItemBitmap(unsigned int n) const ! int Insert(const wxString& item, const wxBitmap& bitmap, unsigned int pos) ! int Insert(const wxString& item, const wxBitmap& bitmap, unsigned int pos, voidptr_long data ) // C++ is (void *clientData) You can put a number here ! int Insert(const wxString& item, const wxBitmap& bitmap, unsigned int pos, wxClientData *clientData) void SetItemBitmap(unsigned int n, const wxBitmap& bitmap) %endclass --- 151,185 ---- bool Create(wxWindow* parent, wxWindowID id, const wxString& value, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxArrayString& choices = wxLuaNullSmartwxArrayString, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxBitmapComboBox") ! int Append(const wxString& item, const wxBitmap& bitmap = wxNullBitmap) ! int Append(const wxString& item, const wxBitmap& bitmap, voidptr_long data ) // C++ is (void *clientData) You can put a number here ! int Append(const wxString& item, const wxBitmap& bitmap, wxClientData *clientData) wxSize GetBitmapSize() const ! wxBitmap GetItemBitmap(unsigned int n) const ! int Insert(const wxString& item, const wxBitmap& bitmap, unsigned int pos) ! int Insert(const wxString& item, const wxBitmap& bitmap, unsigned int pos, voidptr_long data ) // C++ is (void *clientData) You can put a number here ! int Insert(const wxString& item, const wxBitmap& bitmap, unsigned int pos, wxClientData *clientData) void SetItemBitmap(unsigned int n, const wxBitmap& bitmap) + void Clear() + void Delete(unsigned int n) + unsigned int GetCount() const + wxString GetString(unsigned int n) const + void SetString(unsigned int n, const wxString& s) + int FindString(const wxString& s, bool bCase = false) const + void Select(int n) + int GetSelection() const + //void GetSelection(long* from, long* to) const + void SetSelection(int n) + //void SetSelection(long from, long to) + //int GetWidestItemWidth() + //int GetWidestItem() + + void SetValue(const wxString& value) + void SetString(unsigned int n, const wxString& s) + bool SetStringSelection(const wxString& s) + %endclass Index: wx_datatypes.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wx_datatypes.lua,v retrieving revision 1.101 retrieving revision 1.102 diff -C2 -d -r1.101 -r1.102 *** wx_datatypes.lua 20 May 2009 04:43:41 -0000 1.101 --- wx_datatypes.lua 29 Jun 2009 03:22:46 -0000 1.102 *************** *** 583,586 **** --- 583,589 ---- }, wxBitmapComboBox = { + BaseClasses = { + [1] = "wxControl", + }, Condition = "wxLUA_USE_wxBitmapComboBox && wxUSE_BITMAPCOMBOBOX", IsNumber = false, |
|
From: John L. <jr...@us...> - 2009-06-29 03:22:49
|
Update of /cvsroot/wxlua/wxLua/docs In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv11505/wxLua/docs Modified Files: changelog.txt Log Message: Add methods for wxBitmapComboBox and fix inheritance. Index: changelog.txt =================================================================== RCS file: /cvsroot/wxlua/wxLua/docs/changelog.txt,v retrieving revision 1.71 retrieving revision 1.72 diff -C2 -d -r1.71 -r1.72 *** changelog.txt 24 May 2009 22:37:53 -0000 1.71 --- changelog.txt 29 Jun 2009 03:22:46 -0000 1.72 *************** *** 2,5 **** --- 2,10 ---- =============== + version + -------------------------------------------------------------------- + + - Fixed crash in error handler for wxLua functions. + version 2.8.10.0 (released 05/25/2009) -------------------------------------------------------------------- |
|
From: John L. <jr...@us...> - 2009-06-29 03:22:49
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv11505/wxLua/modules/wxbind/src Modified Files: wxadv_bind.cpp Log Message: Add methods for wxBitmapComboBox and fix inheritance. Index: wxadv_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxadv_bind.cpp,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** wxadv_bind.cpp 24 May 2009 03:19:59 -0000 1.22 --- wxadv_bind.cpp 29 Jun 2009 03:22:46 -0000 1.23 *************** *** 1399,1403 **** static int LUACALL wxLua_wxBitmapComboBox_Append2(lua_State *L); // // static wxLuaBindCFunc s_wxluafunc_wxLua_wxBitmapComboBox_Append2[1] = {{ wxLua_wxBitmapComboBox_Append2, WXLUAMETHOD_METHOD, 4, 4, s_wxluatypeArray_wxLua_wxBitmapComboBox_Append2 }}; ! // int Append(const wxString& item, const wxBitmap& bitmap, wxClientData *clientData) static int LUACALL wxLua_wxBitmapComboBox_Append2(lua_State *L) { --- 1399,1403 ---- static int LUACALL wxLua_wxBitmapComboBox_Append2(lua_State *L); // // static wxLuaBindCFunc s_wxluafunc_wxLua_wxBitmapComboBox_Append2[1] = {{ wxLua_wxBitmapComboBox_Append2, WXLUAMETHOD_METHOD, 4, 4, s_wxluatypeArray_wxLua_wxBitmapComboBox_Append2 }}; ! // int Append(const wxString& item, const wxBitmap& bitmap, wxClientData *clientData) static int LUACALL wxLua_wxBitmapComboBox_Append2(lua_State *L) { *************** *** 1421,1425 **** static int LUACALL wxLua_wxBitmapComboBox_Append1(lua_State *L); // // static wxLuaBindCFunc s_wxluafunc_wxLua_wxBitmapComboBox_Append1[1] = {{ wxLua_wxBitmapComboBox_Append1, WXLUAMETHOD_METHOD, 4, 4, s_wxluatypeArray_wxLua_wxBitmapComboBox_Append1 }}; ! // int Append(const wxString& item, const wxBitmap& bitmap, voidptr_long data ) // C++ is (void *clientData) You can put a number here static int LUACALL wxLua_wxBitmapComboBox_Append1(lua_State *L) { --- 1421,1425 ---- static int LUACALL wxLua_wxBitmapComboBox_Append1(lua_State *L); // // static wxLuaBindCFunc s_wxluafunc_wxLua_wxBitmapComboBox_Append1[1] = {{ wxLua_wxBitmapComboBox_Append1, WXLUAMETHOD_METHOD, 4, 4, s_wxluatypeArray_wxLua_wxBitmapComboBox_Append1 }}; ! // int Append(const wxString& item, const wxBitmap& bitmap, voidptr_long data ) // C++ is (void *clientData) You can put a number here static int LUACALL wxLua_wxBitmapComboBox_Append1(lua_State *L) { *************** *** 1443,1447 **** static int LUACALL wxLua_wxBitmapComboBox_Append(lua_State *L); // // static wxLuaBindCFunc s_wxluafunc_wxLua_wxBitmapComboBox_Append[1] = {{ wxLua_wxBitmapComboBox_Append, WXLUAMETHOD_METHOD, 2, 3, s_wxluatypeArray_wxLua_wxBitmapComboBox_Append }}; ! // int Append(const wxString& item, const wxBitmap& bitmap = wxNullBitmap) static int LUACALL wxLua_wxBitmapComboBox_Append(lua_State *L) { --- 1443,1447 ---- static int LUACALL wxLua_wxBitmapComboBox_Append(lua_State *L); // // static wxLuaBindCFunc s_wxluafunc_wxLua_wxBitmapComboBox_Append[1] = {{ wxLua_wxBitmapComboBox_Append, WXLUAMETHOD_METHOD, 2, 3, s_wxluatypeArray_wxLua_wxBitmapComboBox_Append }}; ! // int Append(const wxString& item, const wxBitmap& bitmap = wxNullBitmap) static int LUACALL wxLua_wxBitmapComboBox_Append(lua_State *L) { *************** *** 1464,1467 **** --- 1464,1482 ---- #endif // (wxLUA_USE_wxBitmapComboBox && wxUSE_BITMAPCOMBOBOX) && (wxLUA_USE_wxBitmap) + static wxLuaArgType s_wxluatypeArray_wxLua_wxBitmapComboBox_Clear[] = { &wxluatype_wxBitmapComboBox, NULL }; + static int LUACALL wxLua_wxBitmapComboBox_Clear(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxBitmapComboBox_Clear[1] = {{ wxLua_wxBitmapComboBox_Clear, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxBitmapComboBox_Clear }}; + // void Clear() + static int LUACALL wxLua_wxBitmapComboBox_Clear(lua_State *L) + { + // get this + wxBitmapComboBox * self = (wxBitmapComboBox *)wxluaT_getuserdatatype(L, 1, wxluatype_wxBitmapComboBox); + // call Clear + self->Clear(); + + return 0; + } + + #if (((wxLUA_USE_wxBitmapComboBox && wxUSE_BITMAPCOMBOBOX) && (wxLUA_USE_wxArrayString)) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS)) && (wxLUA_USE_wxPointSizeRect) static wxLuaArgType s_wxluatypeArray_wxLua_wxBitmapComboBox_Create[] = { &wxluatype_wxBitmapComboBox, &wxluatype_wxWindow, &wxluatype_TNUMBER, &wxluatype_TSTRING, &wxluatype_wxPoint, &wxluatype_wxSize, &wxluatype_wxArrayString, &wxluatype_TNUMBER, &wxluatype_wxValidator, &wxluatype_TSTRING, NULL }; *************** *** 1503,1506 **** --- 1518,1560 ---- #endif // (((wxLUA_USE_wxBitmapComboBox && wxUSE_BITMAPCOMBOBOX) && (wxLUA_USE_wxArrayString)) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS)) && (wxLUA_USE_wxPointSizeRect) + static wxLuaArgType s_wxluatypeArray_wxLua_wxBitmapComboBox_Delete[] = { &wxluatype_wxBitmapComboBox, &wxluatype_TINTEGER, NULL }; + static int LUACALL wxLua_wxBitmapComboBox_Delete(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxBitmapComboBox_Delete[1] = {{ wxLua_wxBitmapComboBox_Delete, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxBitmapComboBox_Delete }}; + // void Delete(unsigned int n) + static int LUACALL wxLua_wxBitmapComboBox_Delete(lua_State *L) + { + // unsigned int n + unsigned int n = (unsigned int)wxlua_getuintegertype(L, 2); + // get this + wxBitmapComboBox * self = (wxBitmapComboBox *)wxluaT_getuserdatatype(L, 1, wxluatype_wxBitmapComboBox); + // call Delete + self->Delete(n); + + return 0; + } + + static wxLuaArgType s_wxluatypeArray_wxLua_wxBitmapComboBox_FindString[] = { &wxluatype_wxBitmapComboBox, &wxluatype_TSTRING, &wxluatype_TBOOLEAN, NULL }; + static int LUACALL wxLua_wxBitmapComboBox_FindString(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxBitmapComboBox_FindString[1] = {{ wxLua_wxBitmapComboBox_FindString, WXLUAMETHOD_METHOD, 2, 3, s_wxluatypeArray_wxLua_wxBitmapComboBox_FindString }}; + // int FindString(const wxString& s, bool bCase = false) const + static int LUACALL wxLua_wxBitmapComboBox_FindString(lua_State *L) + { + // get number of arguments + int argCount = lua_gettop(L); + // bool bCase = false + bool bCase = (argCount >= 3 ? wxlua_getbooleantype(L, 3) : false); + // const wxString s + const wxString s = wxlua_getwxStringtype(L, 2); + // get this + wxBitmapComboBox * self = (wxBitmapComboBox *)wxluaT_getuserdatatype(L, 1, wxluatype_wxBitmapComboBox); + // call FindString + int returns = (self->FindString(s, bCase)); + // push the result number + lua_pushnumber(L, returns); + + return 1; + } + + #if (wxLUA_USE_wxBitmapComboBox && wxUSE_BITMAPCOMBOBOX) && (wxLUA_USE_wxPointSizeRect) static wxLuaArgType s_wxluatypeArray_wxLua_wxBitmapComboBox_GetBitmapSize[] = { &wxluatype_wxBitmapComboBox, NULL }; *************** *** 1525,1533 **** #endif // (wxLUA_USE_wxBitmapComboBox && wxUSE_BITMAPCOMBOBOX) && (wxLUA_USE_wxPointSizeRect) #if (wxLUA_USE_wxBitmapComboBox && wxUSE_BITMAPCOMBOBOX) && (wxLUA_USE_wxBitmap) static wxLuaArgType s_wxluatypeArray_wxLua_wxBitmapComboBox_GetItemBitmap[] = { &wxluatype_wxBitmapComboBox, &wxluatype_TINTEGER, NULL }; static int LUACALL wxLua_wxBitmapComboBox_GetItemBitmap(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxBitmapComboBox_GetItemBitmap[1] = {{ wxLua_wxBitmapComboBox_GetItemBitmap, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxBitmapComboBox_GetItemBitmap }}; ! // wxBitmap GetItemBitmap(unsigned int n) const static int LUACALL wxLua_wxBitmapComboBox_GetItemBitmap(lua_State *L) { --- 1579,1604 ---- #endif // (wxLUA_USE_wxBitmapComboBox && wxUSE_BITMAPCOMBOBOX) && (wxLUA_USE_wxPointSizeRect) + static wxLuaArgType s_wxluatypeArray_wxLua_wxBitmapComboBox_GetCount[] = { &wxluatype_wxBitmapComboBox, NULL }; + static int LUACALL wxLua_wxBitmapComboBox_GetCount(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxBitmapComboBox_GetCount[1] = {{ wxLua_wxBitmapComboBox_GetCount, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxBitmapComboBox_GetCount }}; + // unsigned int GetCount() const + static int LUACALL wxLua_wxBitmapComboBox_GetCount(lua_State *L) + { + // get this + wxBitmapComboBox * self = (wxBitmapComboBox *)wxluaT_getuserdatatype(L, 1, wxluatype_wxBitmapComboBox); + // call GetCount + unsigned int returns = (self->GetCount()); + // push the result number + lua_pushnumber(L, returns); + + return 1; + } + + #if (wxLUA_USE_wxBitmapComboBox && wxUSE_BITMAPCOMBOBOX) && (wxLUA_USE_wxBitmap) static wxLuaArgType s_wxluatypeArray_wxLua_wxBitmapComboBox_GetItemBitmap[] = { &wxluatype_wxBitmapComboBox, &wxluatype_TINTEGER, NULL }; static int LUACALL wxLua_wxBitmapComboBox_GetItemBitmap(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxBitmapComboBox_GetItemBitmap[1] = {{ wxLua_wxBitmapComboBox_GetItemBitmap, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxBitmapComboBox_GetItemBitmap }}; ! // wxBitmap GetItemBitmap(unsigned int n) const static int LUACALL wxLua_wxBitmapComboBox_GetItemBitmap(lua_State *L) { *************** *** 1547,1554 **** } static wxLuaArgType s_wxluatypeArray_wxLua_wxBitmapComboBox_Insert2[] = { &wxluatype_wxBitmapComboBox, &wxluatype_TSTRING, &wxluatype_wxBitmap, &wxluatype_TINTEGER, &wxluatype_wxClientData, NULL }; static int LUACALL wxLua_wxBitmapComboBox_Insert2(lua_State *L); // // static wxLuaBindCFunc s_wxluafunc_wxLua_wxBitmapComboBox_Insert2[1] = {{ wxLua_wxBitmapComboBox_Insert2, WXLUAMETHOD_METHOD, 5, 5, s_wxluatypeArray_wxLua_wxBitmapComboBox_Insert2 }}; ! // int Insert(const wxString& item, const wxBitmap& bitmap, unsigned int pos, wxClientData *clientData) static int LUACALL wxLua_wxBitmapComboBox_Insert2(lua_State *L) { --- 1618,1663 ---- } + #endif // (wxLUA_USE_wxBitmapComboBox && wxUSE_BITMAPCOMBOBOX) && (wxLUA_USE_wxBitmap) + + static wxLuaArgType s_wxluatypeArray_wxLua_wxBitmapComboBox_GetSelection[] = { &wxluatype_wxBitmapComboBox, NULL }; + static int LUACALL wxLua_wxBitmapComboBox_GetSelection(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxBitmapComboBox_GetSelection[1] = {{ wxLua_wxBitmapComboBox_GetSelection, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxBitmapComboBox_GetSelection }}; + // int GetSelection() const + static int LUACALL wxLua_wxBitmapComboBox_GetSelection(lua_State *L) + { + // get this + wxBitmapComboBox * self = (wxBitmapComboBox *)wxluaT_getuserdatatype(L, 1, wxluatype_wxBitmapComboBox); + // call GetSelection + int returns = (self->GetSelection()); + // push the result number + lua_pushnumber(L, returns); + + return 1; + } + + static wxLuaArgType s_wxluatypeArray_wxLua_wxBitmapComboBox_GetString[] = { &wxluatype_wxBitmapComboBox, &wxluatype_TINTEGER, NULL }; + static int LUACALL wxLua_wxBitmapComboBox_GetString(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxBitmapComboBox_GetString[1] = {{ wxLua_wxBitmapComboBox_GetString, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxBitmapComboBox_GetString }}; + // wxString GetString(unsigned int n) const + static int LUACALL wxLua_wxBitmapComboBox_GetString(lua_State *L) + { + // unsigned int n + unsigned int n = (unsigned int)wxlua_getuintegertype(L, 2); + // get this + wxBitmapComboBox * self = (wxBitmapComboBox *)wxluaT_getuserdatatype(L, 1, wxluatype_wxBitmapComboBox); + // call GetString + wxString returns = (self->GetString(n)); + // push the result string + wxlua_pushwxString(L, returns); + + return 1; + } + + + #if (wxLUA_USE_wxBitmapComboBox && wxUSE_BITMAPCOMBOBOX) && (wxLUA_USE_wxBitmap) static wxLuaArgType s_wxluatypeArray_wxLua_wxBitmapComboBox_Insert2[] = { &wxluatype_wxBitmapComboBox, &wxluatype_TSTRING, &wxluatype_wxBitmap, &wxluatype_TINTEGER, &wxluatype_wxClientData, NULL }; static int LUACALL wxLua_wxBitmapComboBox_Insert2(lua_State *L); // // static wxLuaBindCFunc s_wxluafunc_wxLua_wxBitmapComboBox_Insert2[1] = {{ wxLua_wxBitmapComboBox_Insert2, WXLUAMETHOD_METHOD, 5, 5, s_wxluatypeArray_wxLua_wxBitmapComboBox_Insert2 }}; ! // int Insert(const wxString& item, const wxBitmap& bitmap, unsigned int pos, wxClientData *clientData) static int LUACALL wxLua_wxBitmapComboBox_Insert2(lua_State *L) { *************** *** 1574,1578 **** static int LUACALL wxLua_wxBitmapComboBox_Insert1(lua_State *L); // // static wxLuaBindCFunc s_wxluafunc_wxLua_wxBitmapComboBox_Insert1[1] = {{ wxLua_wxBitmapComboBox_Insert1, WXLUAMETHOD_METHOD, 5, 5, s_wxluatypeArray_wxLua_wxBitmapComboBox_Insert1 }}; ! // int Insert(const wxString& item, const wxBitmap& bitmap, unsigned int pos, voidptr_long data ) // C++ is (void *clientData) You can put a number here static int LUACALL wxLua_wxBitmapComboBox_Insert1(lua_State *L) { --- 1683,1687 ---- static int LUACALL wxLua_wxBitmapComboBox_Insert1(lua_State *L); // // static wxLuaBindCFunc s_wxluafunc_wxLua_wxBitmapComboBox_Insert1[1] = {{ wxLua_wxBitmapComboBox_Insert1, WXLUAMETHOD_METHOD, 5, 5, s_wxluatypeArray_wxLua_wxBitmapComboBox_Insert1 }}; ! // int Insert(const wxString& item, const wxBitmap& bitmap, unsigned int pos, voidptr_long data ) // C++ is (void *clientData) You can put a number here static int LUACALL wxLua_wxBitmapComboBox_Insert1(lua_State *L) { *************** *** 1598,1602 **** static int LUACALL wxLua_wxBitmapComboBox_Insert(lua_State *L); // // static wxLuaBindCFunc s_wxluafunc_wxLua_wxBitmapComboBox_Insert[1] = {{ wxLua_wxBitmapComboBox_Insert, WXLUAMETHOD_METHOD, 4, 4, s_wxluatypeArray_wxLua_wxBitmapComboBox_Insert }}; ! // int Insert(const wxString& item, const wxBitmap& bitmap, unsigned int pos) static int LUACALL wxLua_wxBitmapComboBox_Insert(lua_State *L) { --- 1707,1711 ---- static int LUACALL wxLua_wxBitmapComboBox_Insert(lua_State *L); // // static wxLuaBindCFunc s_wxluafunc_wxLua_wxBitmapComboBox_Insert[1] = {{ wxLua_wxBitmapComboBox_Insert, WXLUAMETHOD_METHOD, 4, 4, s_wxluatypeArray_wxLua_wxBitmapComboBox_Insert }}; ! // int Insert(const wxString& item, const wxBitmap& bitmap, unsigned int pos) static int LUACALL wxLua_wxBitmapComboBox_Insert(lua_State *L) { *************** *** 1617,1620 **** --- 1726,1749 ---- } + #endif // (wxLUA_USE_wxBitmapComboBox && wxUSE_BITMAPCOMBOBOX) && (wxLUA_USE_wxBitmap) + + static wxLuaArgType s_wxluatypeArray_wxLua_wxBitmapComboBox_Select[] = { &wxluatype_wxBitmapComboBox, &wxluatype_TNUMBER, NULL }; + static int LUACALL wxLua_wxBitmapComboBox_Select(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxBitmapComboBox_Select[1] = {{ wxLua_wxBitmapComboBox_Select, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxBitmapComboBox_Select }}; + // void Select(int n) + static int LUACALL wxLua_wxBitmapComboBox_Select(lua_State *L) + { + // int n + int n = (int)wxlua_getnumbertype(L, 2); + // get this + wxBitmapComboBox * self = (wxBitmapComboBox *)wxluaT_getuserdatatype(L, 1, wxluatype_wxBitmapComboBox); + // call Select + self->Select(n); + + return 0; + } + + + #if (wxLUA_USE_wxBitmapComboBox && wxUSE_BITMAPCOMBOBOX) && (wxLUA_USE_wxBitmap) static wxLuaArgType s_wxluatypeArray_wxLua_wxBitmapComboBox_SetItemBitmap[] = { &wxluatype_wxBitmapComboBox, &wxluatype_TINTEGER, &wxluatype_wxBitmap, NULL }; static int LUACALL wxLua_wxBitmapComboBox_SetItemBitmap(lua_State *L); *************** *** 1637,1640 **** --- 1766,1856 ---- #endif // (wxLUA_USE_wxBitmapComboBox && wxUSE_BITMAPCOMBOBOX) && (wxLUA_USE_wxBitmap) + static wxLuaArgType s_wxluatypeArray_wxLua_wxBitmapComboBox_SetSelection[] = { &wxluatype_wxBitmapComboBox, &wxluatype_TNUMBER, NULL }; + static int LUACALL wxLua_wxBitmapComboBox_SetSelection(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxBitmapComboBox_SetSelection[1] = {{ wxLua_wxBitmapComboBox_SetSelection, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxBitmapComboBox_SetSelection }}; + // void SetSelection(int n) + static int LUACALL wxLua_wxBitmapComboBox_SetSelection(lua_State *L) + { + // int n + int n = (int)wxlua_getnumbertype(L, 2); + // get this + wxBitmapComboBox * self = (wxBitmapComboBox *)wxluaT_getuserdatatype(L, 1, wxluatype_wxBitmapComboBox); + // call SetSelection + self->SetSelection(n); + + return 0; + } + + static wxLuaArgType s_wxluatypeArray_wxLua_wxBitmapComboBox_SetString1[] = { &wxluatype_wxBitmapComboBox, &wxluatype_TINTEGER, &wxluatype_TSTRING, NULL }; + static int LUACALL wxLua_wxBitmapComboBox_SetString1(lua_State *L); + // // static wxLuaBindCFunc s_wxluafunc_wxLua_wxBitmapComboBox_SetString1[1] = {{ wxLua_wxBitmapComboBox_SetString1, WXLUAMETHOD_METHOD, 3, 3, s_wxluatypeArray_wxLua_wxBitmapComboBox_SetString1 }}; + // void SetString(unsigned int n, const wxString& s) + static int LUACALL wxLua_wxBitmapComboBox_SetString1(lua_State *L) + { + // const wxString s + const wxString s = wxlua_getwxStringtype(L, 3); + // unsigned int n + unsigned int n = (unsigned int)wxlua_getuintegertype(L, 2); + // get this + wxBitmapComboBox * self = (wxBitmapComboBox *)wxluaT_getuserdatatype(L, 1, wxluatype_wxBitmapComboBox); + // call SetString + self->SetString(n, s); + + return 0; + } + + static wxLuaArgType s_wxluatypeArray_wxLua_wxBitmapComboBox_SetString[] = { &wxluatype_wxBitmapComboBox, &wxluatype_TINTEGER, &wxluatype_TSTRING, NULL }; + static int LUACALL wxLua_wxBitmapComboBox_SetString(lua_State *L); + // // static wxLuaBindCFunc s_wxluafunc_wxLua_wxBitmapComboBox_SetString[1] = {{ wxLua_wxBitmapComboBox_SetString, WXLUAMETHOD_METHOD, 3, 3, s_wxluatypeArray_wxLua_wxBitmapComboBox_SetString }}; + // void SetString(unsigned int n, const wxString& s) + static int LUACALL wxLua_wxBitmapComboBox_SetString(lua_State *L) + { + // const wxString s + const wxString s = wxlua_getwxStringtype(L, 3); + // unsigned int n + unsigned int n = (unsigned int)wxlua_getuintegertype(L, 2); + // get this + wxBitmapComboBox * self = (wxBitmapComboBox *)wxluaT_getuserdatatype(L, 1, wxluatype_wxBitmapComboBox); + // call SetString + self->SetString(n, s); + + return 0; + } + + static wxLuaArgType s_wxluatypeArray_wxLua_wxBitmapComboBox_SetStringSelection[] = { &wxluatype_wxBitmapComboBox, &wxluatype_TSTRING, NULL }; + static int LUACALL wxLua_wxBitmapComboBox_SetStringSelection(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxBitmapComboBox_SetStringSelection[1] = {{ wxLua_wxBitmapComboBox_SetStringSelection, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxBitmapComboBox_SetStringSelection }}; + // bool SetStringSelection(const wxString& s) + static int LUACALL wxLua_wxBitmapComboBox_SetStringSelection(lua_State *L) + { + // const wxString s + const wxString s = wxlua_getwxStringtype(L, 2); + // get this + wxBitmapComboBox * self = (wxBitmapComboBox *)wxluaT_getuserdatatype(L, 1, wxluatype_wxBitmapComboBox); + // call SetStringSelection + bool returns = (self->SetStringSelection(s)); + // push the result flag + lua_pushboolean(L, returns); + + return 1; + } + + static wxLuaArgType s_wxluatypeArray_wxLua_wxBitmapComboBox_SetValue[] = { &wxluatype_wxBitmapComboBox, &wxluatype_TSTRING, NULL }; + static int LUACALL wxLua_wxBitmapComboBox_SetValue(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxBitmapComboBox_SetValue[1] = {{ wxLua_wxBitmapComboBox_SetValue, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxBitmapComboBox_SetValue }}; + // void SetValue(const wxString& value) + static int LUACALL wxLua_wxBitmapComboBox_SetValue(lua_State *L) + { + // const wxString value + const wxString value = wxlua_getwxStringtype(L, 2); + // get this + wxBitmapComboBox * self = (wxBitmapComboBox *)wxluaT_getuserdatatype(L, 1, wxluatype_wxBitmapComboBox); + // call SetValue + self->SetValue(value); + + return 0; + } + + #if (((wxLUA_USE_wxBitmapComboBox && wxUSE_BITMAPCOMBOBOX) && (wxLUA_USE_wxArrayString)) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS)) && (wxLUA_USE_wxPointSizeRect) static wxLuaArgType s_wxluatypeArray_wxLua_wxBitmapComboBox_constructor1[] = { &wxluatype_wxWindow, &wxluatype_TNUMBER, &wxluatype_TSTRING, &wxluatype_wxPoint, &wxluatype_wxSize, &wxluatype_wxArrayString, &wxluatype_TNUMBER, &wxluatype_wxValidator, &wxluatype_TSTRING, NULL }; *************** *** 1733,1736 **** --- 1949,1963 ---- #endif // ((wxLUA_USE_wxBitmapComboBox && wxUSE_BITMAPCOMBOBOX) && (wxLUA_USE_wxBitmap)) + #if (wxLUA_USE_wxBitmapComboBox && wxUSE_BITMAPCOMBOBOX) + // function overload table + static wxLuaBindCFunc s_wxluafunc_wxLua_wxBitmapComboBox_SetString_overload[] = + { + { wxLua_wxBitmapComboBox_SetString1, WXLUAMETHOD_METHOD, 3, 3, s_wxluatypeArray_wxLua_wxBitmapComboBox_SetString1 }, + { wxLua_wxBitmapComboBox_SetString, WXLUAMETHOD_METHOD, 3, 3, s_wxluatypeArray_wxLua_wxBitmapComboBox_SetString }, + }; + static int s_wxluafunc_wxLua_wxBitmapComboBox_SetString_overload_count = sizeof(s_wxluafunc_wxLua_wxBitmapComboBox_SetString_overload)/sizeof(wxLuaBindCFunc); + + #endif // (wxLUA_USE_wxBitmapComboBox && wxUSE_BITMAPCOMBOBOX) + #if ((((wxLUA_USE_wxBitmapComboBox && wxUSE_BITMAPCOMBOBOX) && (wxLUA_USE_wxArrayString)) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS)) && (wxLUA_USE_wxPointSizeRect))||(wxLUA_USE_wxBitmapComboBox && wxUSE_BITMAPCOMBOBOX) // function overload table *************** *** 1753,1776 **** --- 1980,2024 ---- #endif // ((wxLUA_USE_wxBitmapComboBox && wxUSE_BITMAPCOMBOBOX) && (wxLUA_USE_wxBitmap)) + { "Clear", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxBitmapComboBox_Clear, 1, NULL }, + #if (((wxLUA_USE_wxBitmapComboBox && wxUSE_BITMAPCOMBOBOX) && (wxLUA_USE_wxArrayString)) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS)) && (wxLUA_USE_wxPointSizeRect) { "Create", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxBitmapComboBox_Create, 1, NULL }, #endif // (((wxLUA_USE_wxBitmapComboBox && wxUSE_BITMAPCOMBOBOX) && (wxLUA_USE_wxArrayString)) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS)) && (wxLUA_USE_wxPointSizeRect) + { "Delete", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxBitmapComboBox_Delete, 1, NULL }, + { "FindString", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxBitmapComboBox_FindString, 1, NULL }, + #if (wxLUA_USE_wxBitmapComboBox && wxUSE_BITMAPCOMBOBOX) && (wxLUA_USE_wxPointSizeRect) { "GetBitmapSize", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxBitmapComboBox_GetBitmapSize, 1, NULL }, #endif // (wxLUA_USE_wxBitmapComboBox && wxUSE_BITMAPCOMBOBOX) && (wxLUA_USE_wxPointSizeRect) + { "GetCount", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxBitmapComboBox_GetCount, 1, NULL }, + #if (wxLUA_USE_wxBitmapComboBox && wxUSE_BITMAPCOMBOBOX) && (wxLUA_USE_wxBitmap) { "GetItemBitmap", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxBitmapComboBox_GetItemBitmap, 1, NULL }, #endif // (wxLUA_USE_wxBitmapComboBox && wxUSE_BITMAPCOMBOBOX) && (wxLUA_USE_wxBitmap) + { "GetSelection", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxBitmapComboBox_GetSelection, 1, NULL }, + { "GetString", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxBitmapComboBox_GetString, 1, NULL }, + #if ((wxLUA_USE_wxBitmapComboBox && wxUSE_BITMAPCOMBOBOX) && (wxLUA_USE_wxBitmap)) { "Insert", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxBitmapComboBox_Insert_overload, s_wxluafunc_wxLua_wxBitmapComboBox_Insert_overload_count, 0 }, #endif // ((wxLUA_USE_wxBitmapComboBox && wxUSE_BITMAPCOMBOBOX) && (wxLUA_USE_wxBitmap)) + { "Select", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxBitmapComboBox_Select, 1, NULL }, + #if (wxLUA_USE_wxBitmapComboBox && wxUSE_BITMAPCOMBOBOX) && (wxLUA_USE_wxBitmap) { "SetItemBitmap", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxBitmapComboBox_SetItemBitmap, 1, NULL }, #endif // (wxLUA_USE_wxBitmapComboBox && wxUSE_BITMAPCOMBOBOX) && (wxLUA_USE_wxBitmap) + { "SetSelection", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxBitmapComboBox_SetSelection, 1, NULL }, + + #if (wxLUA_USE_wxBitmapComboBox && wxUSE_BITMAPCOMBOBOX) + { "SetString", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxBitmapComboBox_SetString_overload, s_wxluafunc_wxLua_wxBitmapComboBox_SetString_overload_count, 0 }, + #endif // (wxLUA_USE_wxBitmapComboBox && wxUSE_BITMAPCOMBOBOX) + + { "SetStringSelection", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxBitmapComboBox_SetStringSelection, 1, NULL }, + { "SetValue", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxBitmapComboBox_SetValue, 1, NULL }, + #if ((((wxLUA_USE_wxBitmapComboBox && wxUSE_BITMAPCOMBOBOX) && (wxLUA_USE_wxArrayString)) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS)) && (wxLUA_USE_wxPointSizeRect))||(wxLUA_USE_wxBitmapComboBox && wxUSE_BITMAPCOMBOBOX) { "wxBitmapComboBox", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxBitmapComboBox_constructor_overload, s_wxluafunc_wxLua_wxBitmapComboBox_constructor_overload_count, 0 }, *************** *** 15597,15600 **** --- 15845,15850 ---- static const char* wxluabaseclassnames_wxAnimationCtrl[] = { wxluaclassname_wxControl, NULL }; static wxLuaBindClass* wxluabaseclassbinds_wxAnimationCtrl[] = { NULL }; + static const char* wxluabaseclassnames_wxBitmapComboBox[] = { wxluaclassname_wxControl, NULL }; + static wxLuaBindClass* wxluabaseclassbinds_wxBitmapComboBox[] = { NULL }; static const char* wxluabaseclassnames_wxCalculateLayoutEvent[] = { wxluaclassname_wxEvent, NULL }; static wxLuaBindClass* wxluabaseclassbinds_wxCalculateLayoutEvent[] = { NULL }; *************** *** 15877,15881 **** #if wxLUA_USE_wxBitmapComboBox && wxUSE_BITMAPCOMBOBOX ! { wxluaclassname_wxBitmapComboBox, wxBitmapComboBox_methods, wxBitmapComboBox_methodCount, CLASSINFO(wxBitmapComboBox), &wxluatype_wxBitmapComboBox, NULL, NULL, g_wxluanumberArray_None, 0, }, #endif // wxLUA_USE_wxBitmapComboBox && wxUSE_BITMAPCOMBOBOX --- 16127,16131 ---- #if wxLUA_USE_wxBitmapComboBox && wxUSE_BITMAPCOMBOBOX ! { wxluaclassname_wxBitmapComboBox, wxBitmapComboBox_methods, wxBitmapComboBox_methodCount, CLASSINFO(wxBitmapComboBox), &wxluatype_wxBitmapComboBox, wxluabaseclassnames_wxBitmapComboBox, wxluabaseclassbinds_wxBitmapComboBox, g_wxluanumberArray_None, 0, }, #endif // wxLUA_USE_wxBitmapComboBox && wxUSE_BITMAPCOMBOBOX |
|
From: John L. <jr...@us...> - 2009-06-24 19:58:33
|
Update of /cvsroot/wxlua/wxLua/modules/wxluadebug/src In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv4615/wxLua/modules/wxluadebug/src Modified Files: wxldebug.cpp Log Message: More fixes for mysterious crash using MSVC release and wxString + operator wxT("a")+wxString("b")+wxT("c")+wxString("d")... Index: wxldebug.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/src/wxldebug.cpp,v retrieving revision 1.66 retrieving revision 1.67 diff -C2 -d -r1.66 -r1.67 *** wxldebug.cpp 14 May 2009 05:06:21 -0000 1.66 --- wxldebug.cpp 24 Jun 2009 19:57:40 -0000 1.67 *************** *** 184,188 **** if (lua_getinfo(L, "Sln", &luaDebug)) { ! //wxPrintf(wxString(lua_Debug_to_wxString(luaDebug) + wxT("\n")).c_str()); // skip stack frames that do not have line number, always add first --- 184,188 ---- if (lua_getinfo(L, "Sln", &luaDebug)) { ! //wxPrintf(wxT("%s\n"), lua_Debug_to_wxString(luaDebug).c_str()); // skip stack frames that do not have line number, always add first *************** *** 228,232 **** while (!name.IsEmpty()) { ! //wxPrintf(wxString(lua_Debug_to_wxString(luaDebug) + wxT(" lua_getlocal :") + name + wxT("\n")).c_str()); int wxl_valuetype = WXLUA_TNONE; --- 228,232 ---- while (!name.IsEmpty()) { ! //wxPrintf(wxT("%s lua_getlocal :%s\n"), lua_Debug_to_wxString(luaDebug).c_str(), name.c_str()); int wxl_valuetype = WXLUA_TNONE; *************** *** 367,371 **** if (lightuserdata_reg_key == &wxlua_lreg_types_key) { ! value += wxT(" (") + wxluaT_typename(L, (int)lua_tonumber(L, -2)) + wxT(")"); } else if (lightuserdata_reg_key == &wxlua_lreg_classes_key) --- 367,371 ---- if (lightuserdata_reg_key == &wxlua_lreg_types_key) { ! value += wxString::Format(wxT(" (%s)"), wxluaT_typename(L, (int)lua_tonumber(L, -2)).c_str()); } else if (lightuserdata_reg_key == &wxlua_lreg_classes_key) *************** *** 377,381 **** { wxLuaBinding* binding = (wxLuaBinding*)lua_touserdata(L, -2); ! name = wxT("wxLuaBinding(")+name+wxT(") -> ")+binding->GetBindingName(); value += wxT(" = ") + binding->GetLuaNamespace(); } --- 377,381 ---- { wxLuaBinding* binding = (wxLuaBinding*)lua_touserdata(L, -2); ! name = wxString::Format(wxT("wxLuaBinding(%s) -> %s"), name.c_str(), binding->GetBindingName().c_str()); value += wxT(" = ") + binding->GetLuaNamespace(); } *************** *** 407,411 **** { wxObject* obj = (wxObject*)lua_touserdata(L, -1); ! name = wxString(obj->GetClassInfo()->GetClassName()) + wxT("(") + name + wxT(")"); } } --- 407,411 ---- { wxObject* obj = (wxObject*)lua_touserdata(L, -1); ! name = wxString::Format(wxT("%s(%s)"), obj->GetClassInfo()->GetClassName(), name.c_str()); } } *************** *** 418,422 **** if (key == &wxlua_metatable_type_key) { ! value += wxT(" (") + wxluaT_typename(L, (int)lua_tonumber(L, -1)) + wxT(")"); } else if (key == &wxlua_metatable_wxluabindclass_key) --- 418,422 ---- if (key == &wxlua_metatable_type_key) { ! value += wxString::Format(wxT(" (%s)"), wxluaT_typename(L, (int)lua_tonumber(L, -1)).c_str()); } else if (key == &wxlua_metatable_wxluabindclass_key) *************** *** 646,650 **** { const char* ss = *(const char**)udata; ! s += wxT(" (") + lua2wx(ss) + wxT(")"); } } --- 646,650 ---- { const char* ss = *(const char**)udata; ! s += wxString::Format(wxT(" (%s)"), lua2wx(ss).c_str()); } } |
|
From: John L. <jr...@us...> - 2009-06-24 19:57:44
|
Update of /cvsroot/wxlua/wxLua/modules/wxluasocket/src In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv4615/wxLua/modules/wxluasocket/src Modified Files: wxldserv.cpp wxldtarg.cpp wxlsock.cpp Log Message: More fixes for mysterious crash using MSVC release and wxString + operator wxT("a")+wxString("b")+wxT("c")+wxString("d")... Index: wxldtarg.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxldtarg.cpp,v retrieving revision 1.47 retrieving revision 1.48 diff -C2 -d -r1.47 -r1.48 *** wxldtarg.cpp 26 Mar 2008 05:23:48 -0000 1.47 --- wxldtarg.cpp 24 Jun 2009 19:57:41 -0000 1.48 *************** *** 558,562 **** } ! lua_pop(L, 1); // removes `value'; } lua_settop(L, nOldTop); // the table of globals. --- 558,562 ---- } ! lua_pop(L, 1); // removes 'value'; } lua_settop(L, nOldTop); // the table of globals. *************** *** 572,576 **** wxLuaDebugData::GetTypeValue(m_wxlState, -1, &wxl_type, value); ! strResult = wxluaT_typename(L, wxl_type) + wxT(" : ") + value; lua_pop(L, 1); --- 572,576 ---- wxLuaDebugData::GetTypeValue(m_wxlState, -1, &wxl_type, value); ! strResult.Printf(wxT("%s : %s"), wxluaT_typename(L, wxl_type).c_str(), value.c_str()); lua_pop(L, 1); Index: wxldserv.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxldserv.cpp,v retrieving revision 1.49 retrieving revision 1.50 diff -C2 -d -r1.49 -r1.50 *** wxldserv.cpp 22 Dec 2007 06:07:16 -0000 1.49 --- wxldserv.cpp 24 Jun 2009 19:57:41 -0000 1.50 *************** *** 539,547 **** if (!read_ok) { - wxString s = wxT("Failed reading from the debugger socket. ") + msg + wxT("\n"); - s += GetSocketErrorMsg(); - wxLuaDebuggerEvent debugEvent(wxEVT_WXLUA_DEBUGGER_DEBUGGEE_DISCONNECTED, this); ! debugEvent.SetMessage(s); SendEvent(debugEvent); } --- 539,544 ---- if (!read_ok) { wxLuaDebuggerEvent debugEvent(wxEVT_WXLUA_DEBUGGER_DEBUGGEE_DISCONNECTED, this); ! debugEvent.SetMessage(wxString::Format(wxT("Failed reading from the debugger socket. %s\n"), msg.c_str(), GetSocketErrorMsg().c_str())); SendEvent(debugEvent); } *************** *** 553,561 **** if (!write_ok) { - wxString s = wxT("Failed writing to the debugger socket. ") + msg + wxT("\n"); - s += GetSocketErrorMsg(); - wxLuaDebuggerEvent debugEvent(wxEVT_WXLUA_DEBUGGER_DEBUGGEE_DISCONNECTED, this); ! debugEvent.SetMessage(s); SendEvent(debugEvent); } --- 550,555 ---- if (!write_ok) { wxLuaDebuggerEvent debugEvent(wxEVT_WXLUA_DEBUGGER_DEBUGGEE_DISCONNECTED, this); ! debugEvent.SetMessage(wxString::Format(wxT("Failed writing to the debugger socket. %s\n%s"), msg.c_str(), GetSocketErrorMsg().c_str())); SendEvent(debugEvent); } Index: wxlsock.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxlsock.cpp,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** wxlsock.cpp 13 Dec 2007 00:47:53 -0000 1.34 --- wxlsock.cpp 24 Jun 2009 19:57:41 -0000 1.35 *************** *** 83,92 **** { #ifdef __WXMSW__ // no console in MSW ! wxLuaCharBuffer buf(title+ wxString::Format(wxT(" PID %ld TIME %s "), (long)wxGetProcessId(), wxT(__TIME__)) + msg + wxT("\n")); FILE* h = fopen("wxLua_socketdebug.log", "a"); fprintf(h, buf.GetData()); fclose(h); #else // !__WXMSW__ ! wxSafeShowMessage(title, wxString::Format(wxT("PID %ld TIME %s\n\t"), (long)wxGetProcessId(), wxT(__TIME__)) + msg); #endif // __WXMSW__ } --- 83,92 ---- { #ifdef __WXMSW__ // no console in MSW ! wxLuaCharBuffer buf(wxString::Format(wxT("%s PID %ld TIME %s %s\n"), title.c_str(), (long)wxGetProcessId(), wxT(__TIME__), msg.c_str())); FILE* h = fopen("wxLua_socketdebug.log", "a"); fprintf(h, buf.GetData()); fclose(h); #else // !__WXMSW__ ! wxSafeShowMessage(title, wxString::Format(wxT("PID %ld TIME %s\n\t%s"), (long)wxGetProcessId(), wxT(__TIME__), msg.c_str())); #endif // __WXMSW__ } |
|
From: John L. <jr...@us...> - 2009-06-23 23:08:26
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/src In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv14130/wxLua/modules/wxlua/src Modified Files: wxlstate.cpp Log Message: Fix for MSVC6 release compile crash. Somehow the compiler is not concatenating wxStrings and literal char "strings" properly. Use wxString::Printf() instead. Index: wxlstate.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlstate.cpp,v retrieving revision 1.181 retrieving revision 1.182 diff -C2 -d -r1.181 -r1.182 *** wxlstate.cpp 19 May 2009 03:20:53 -0000 1.181 --- wxlstate.cpp 23 Jun 2009 23:08:12 -0000 1.182 *************** *** 329,333 **** } ! wxString msg = msg_ + wxT("\nFunction called: '") + argMsg + wxT("'") + funcArgs; wxlua_error(L, msg); } --- 329,334 ---- } ! wxString msg; ! msg.Printf(wxT("%s\nFunction called: '%s'%s"), msg_.c_str(), argMsg.c_str(), funcArgs.c_str()); wxlua_error(L, msg); } |
|
From: John L. <jr...@us...> - 2009-06-09 21:53:02
|
Update of /cvsroot/wxlua/website In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv2825/website Modified Files: download.php Log Message: update mac package Index: download.php =================================================================== RCS file: /cvsroot/wxlua/website/download.php,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** download.php 3 Jun 2009 03:19:39 -0000 1.33 --- download.php 9 Jun 2009 21:52:09 -0000 1.34 *************** *** 19,23 **** $dlllink="http://downloads.sourceforge.net/wxlua/wxLua-$latestversion-MSW-dll.zip"; $linuxlink="http://downloads.sourceforge.net/wxlua/wxlua-$latestversion-1.x86.package"; ! $maclink="http://downloads.sourceforge.net/wxlua/wxlua-2.8.7.0-tiger.dmg"; $gzlink="http://downloads.sourceforge.net/wxlua/wxLua-$latestversion-src.tar.gz"; ?> --- 19,23 ---- $dlllink="http://downloads.sourceforge.net/wxlua/wxLua-$latestversion-MSW-dll.zip"; $linuxlink="http://downloads.sourceforge.net/wxlua/wxlua-$latestversion-1.x86.package"; ! $maclink="http://downloads.sourceforge.net/wxlua/wxlua-2.8.10.0-tiger.dmg"; $gzlink="http://downloads.sourceforge.net/wxlua/wxLua-$latestversion-src.tar.gz"; ?> *************** *** 66,71 **** <h1 class="first">Download wxLua...</h1> ! <p><strong>Sources or binaries?</strong> wxLua can be used as an <strong>external library by C++ projects</strong> ! in need of a Lua interpreter or as an <strong>application</strong> or <strong>module</strong> for programmers who want to write applications entirely in Lua.<br/><br/> --- 66,71 ---- <h1 class="first">Download wxLua...</h1> ! <p><strong>Sources or binaries?</strong> wxLua can be used as an <strong>external library by C++ projects</strong> ! in need of a Lua interpreter or as an <strong>application</strong> or <strong>module</strong> for programmers who want to write applications entirely in Lua.<br/><br/> |
|
From: John L. <jr...@us...> - 2009-06-03 03:19:44
|
Update of /cvsroot/wxlua/website In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv20705/website Modified Files: documentation.php download.php index.php support.php Log Message: Remove nightly snapshot link and a little bit of cleanup Index: support.php =================================================================== RCS file: /cvsroot/wxlua/website/support.php,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** support.php 1 Jul 2007 00:10:22 -0000 1.8 --- support.php 3 Jun 2009 03:19:39 -0000 1.9 *************** *** 2,7 **** <?php $pagetitle="support"; ! $anchors_href=array("ml", "faq"); ! $anchors_text=array("Mailing list", "FAQ"); include_once("header.inc.php"); ?> --- 2,7 ---- <?php $pagetitle="support"; ! $anchors_href=array("ml"); ! $anchors_text=array("Mailing list"); include_once("header.inc.php"); ?> *************** *** 9,16 **** <h1 id="ml" class="first">Mailing list</h1> <p>The <strong>wxlua-users mailing list</strong> ! is where wxLua developers and users work on and discuss about wxLua; you can <a href="http://sourceforge.net/mailarchive/forum.php?forum_id=45271">browse the archives</a>, <a href="http://sourceforge.net/search/index.php?type_of_search=mlists&group_id=140042&forum_id=45271">search them</a> or just <a href="http://lists.sourceforge.net/lists/listinfo/wxlua-users">subscribe it</a> and ask for help.</p> ! <p>You can also browse it through the <a href="http://news.gmane.org/gmane.comp.lib.wxwidgets.wxlua.user">GMane web interface</a> or <a href="http://search.gmane.org/index.php?group=gmane.comp.lib.wxwidgets.wxlua.user">search it (using GMane)</a>. ! More info about <strong>GMane</strong> services for the wxLua mailing list can be found at <a href="http://dir.gmane.org/gmane.comp.lib.wxwidgets.wxlua.user">http://dir.gmane.org/gmane.comp.lib.wxwidgets.wxlua.user</a>.</p> <p><strong>Recent changes</strong> to wxLua's CVS can be viewed at --- 9,25 ---- <h1 id="ml" class="first">Mailing list</h1> <p>The <strong>wxlua-users mailing list</strong> ! is where wxLua developers and users work on and discuss wxLua. You can ! <a href="http://sourceforge.net/mailarchive/forum.php?forum_id=45271">browse the archives</a>, ! <a href="http://sourceforge.net/search/index.php?type_of_search=mlists&group_id=140042&forum_id=45271">search them</a> ! or <a href="http://lists.sourceforge.net/lists/listinfo/wxlua-users">subscribe</a> to it and ask for help. ! The wxLua mailing list requires a subscription to limit the junk mail sent to it, once subscribed your ! e-mail will not be sold to others. ! </p> ! ! <p>You can also browse it through the <a href="http://news.gmane.org/gmane.comp.lib.wxwidgets.wxlua.user">GMane web interface</a> ! or <a href="http://search.gmane.org/index.php?group=gmane.comp.lib.wxwidgets.wxlua.user">search it (using GMane)</a>. ! More info about <strong>GMane</strong> services for the wxLua mailing list can be found at ! <a href="http://dir.gmane.org/gmane.comp.lib.wxwidgets.wxlua.user">http://dir.gmane.org/gmane.comp.lib.wxwidgets.wxlua.user</a>.</p> <p><strong>Recent changes</strong> to wxLua's CVS can be viewed at Index: documentation.php =================================================================== RCS file: /cvsroot/wxlua/website/documentation.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** documentation.php 1 Jul 2007 00:10:22 -0000 1.2 --- documentation.php 3 Jun 2009 03:19:39 -0000 1.3 *************** *** 9,13 **** <h1 id="reference" class="first">Reference manuals</h1> <p>The following links contain useful documents for learning and understanding wxLua, Lua, and wxWidgets.<br/> ! If you're looking for tutorials see the "Getting started" section in the <a href="index.php">homepage</a>...</p> <div class="indented"> --- 9,13 ---- <h1 id="reference" class="first">Reference manuals</h1> <p>The following links contain useful documents for learning and understanding wxLua, Lua, and wxWidgets.<br/> ! If you're looking for tutorials see the "Getting started" section on the <a href="index.php">homepage</a>...</p> <div class="indented"> *************** *** 16,20 **** programming in lua and wxLua as well as how to use the wxLua library in a C++ program.</p> <p>The <a href="docs/wxluaref.html">wxLua class reference</a> has a complete list of wxWidgets classes ! and datatypes that wxLua wraps.</p> <p>The <a href="docs/FAQ.html">FAQ</a> may answer some of your questions and it highlights important points.</p> <p>There are also <a href="http://www.doxygen.org">doxygen</a>-generated documentation for --- 16,20 ---- programming in lua and wxLua as well as how to use the wxLua library in a C++ program.</p> <p>The <a href="docs/wxluaref.html">wxLua class reference</a> has a complete list of wxWidgets classes ! and datatypes that wxLua wraps.</p> <p>The <a href="docs/FAQ.html">FAQ</a> may answer some of your questions and it highlights important points.</p> <p>There are also <a href="http://www.doxygen.org">doxygen</a>-generated documentation for *************** *** 39,44 **** <p>Read the <a href="docs/binding.html">binding.html</a> file from the docs directory. Also, take a look at a few of the binding files in ! <a href="http://wxlua.cvs.sourceforge.net/wxlua/wxLua/bindings/wxwidgets">wxLua CVS</a> or ! from our <a href="http://wxlua.sourceforge.net/wxLua/bindings/wxwidgets/">nightly tarball</a> to see how they're constructed and how they're merely simplified versions of the original C/C++ code.</p> --- 39,43 ---- <p>Read the <a href="docs/binding.html">binding.html</a> file from the docs directory. Also, take a look at a few of the binding files in ! <a href="http://wxlua.cvs.sourceforge.net/wxlua/wxLua/bindings/wxwidgets">wxLua CVS</a> to see how they're constructed and how they're merely simplified versions of the original C/C++ code.</p> *************** *** 46,51 **** <p>You can browse online the CVS repository of wxLua at <a href="http://wxlua.cvs.sourceforge.net/wxlua/wxLua">this page</a>.</p> - <p><strong>Note</strong>: the Sourceforge CVS browser shows the sources with a delay of some hours respect the real repository. More up to date sources can be downloaded or browsed from the nightly tarball linked in the <a href="download.php">download page</a>.</p> - <h1 id="authors">Authors</h1> <p>The wxLua development team is composed by various developers (here listed in <strong>chronological order</strong>):</p> --- 45,48 ---- *************** *** 57,62 **** <li><strong>Klaas Holwerda</strong>: author of wxLuaCan sample and indefatigable source of ideas.</li> <li><strong>Francesco Montorsi</strong>: worked on the bakefile-based build system, on this website and the wxLua packaging.</li> ! <li><strong>Anders F Björklund</strong>: contributed wxMac screenshots and created wxMac package.</li> ! <li><strong>Reuben Thomas</strong>: wrote the bit library that wxLua includes.</li> <li><strong>Did we forget you?</strong> contact us and we'll add you.</li> </ol> --- 54,59 ---- <li><strong>Klaas Holwerda</strong>: author of wxLuaCan sample and indefatigable source of ideas.</li> <li><strong>Francesco Montorsi</strong>: worked on the bakefile-based build system, on this website and the wxLua packaging.</li> ! <li><strong>Anders F Björklund</strong>: contributed wxMac screenshots and created wxMac package.</li> ! <li><strong>Reuben Thomas</strong>: wrote the bit library that wxLua includes.</li> <li><strong>Did we forget you?</strong> contact us and we'll add you.</li> </ol> Index: download.php =================================================================== RCS file: /cvsroot/wxlua/website/download.php,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** download.php 24 May 2009 16:42:31 -0000 1.32 --- download.php 3 Jun 2009 03:19:39 -0000 1.33 *************** *** 2,8 **** <?php $pagetitle="download"; ! $anchors_href=array("win", "linux", "mac", "sources", "snapshot", "browsesources"); $anchors_text=array("...for Windows", "...for Linux", "...for Macintosh", "Sources", ! "Nightly snapshot", "Browse sources"); include_once("header.inc.php"); --- 2,8 ---- <?php $pagetitle="download"; ! $anchors_href=array("win", "linux", "mac", "sources", "browsesources"); $anchors_text=array("...for Windows", "...for Linux", "...for Macintosh", "Sources", ! "Browse sources"); include_once("header.inc.php"); *************** *** 13,17 **** $winsize="9"; // size of the wxlua-xxx.bin.zip file (in MB) ! $apsize="11"; // size of the wxlua-xxx.package file (in MB) $bundlesize="20"; // size of the wxlua-xxx.dmg file (in MB) --- 13,17 ---- $winsize="9"; // size of the wxlua-xxx.bin.zip file (in MB) ! $apsize="11"; // size of the wxlua-xxx.package file (in MB) $bundlesize="20"; // size of the wxlua-xxx.dmg file (in MB) *************** *** 23,28 **** ?> - - <div class="rightSideBar"> <p class="sideBarTitle">Latest version</p> --- 23,26 ---- *************** *** 66,75 **** ?> </div> <h1 class="first">Download wxLua...</h1> ! <p><strong>Sources or binaries?</strong> wxLua can be used both as <strong>external library by other ! C++ projects</strong> in need of a lua interpreter or as <strong>final application</strong> for those ! programmers who want to write applications entirely in lua.<br/><br/> ! So, if you are interested to wxLua as external, embeddable library you should download the <strong>source package</strong>.<br/> ! Instead, if you are interested to wxLua for scripting only, then go with the <strong>binaries</strong> !</p> <p><b>You can view a complete list of the downloads <a href="http://sourceforge.net/project/showfiles.php?group_id=140042">here<alt="Downloads"/></a>.</b></p> --- 64,75 ---- ?> </div> + <h1 class="first">Download wxLua...</h1> ! <p><strong>Sources or binaries?</strong> wxLua can be used as an <strong>external library by C++ projects</strong> ! in need of a Lua interpreter or as an <strong>application</strong> or <strong>module</strong> for programmers ! who want to write applications entirely in Lua.<br/><br/> ! ! If you are interested to wxLua as external, embeddable, library you should download the <strong>source package</strong>.<br/> ! Instead, if you are interested to wxLua for writing programs only, then go with the <strong>binaries</strong> !</p> <p><b>You can view a complete list of the downloads <a href="http://sourceforge.net/project/showfiles.php?group_id=140042">here<alt="Downloads"/></a>.</b></p> *************** *** 115,132 **** <div class="indented"> - <h2 id="snapshot">Nightly snapshot</h2> - <p>A nightly tarball (tar.gz) source package is created with Unix linefeeds (LF) for the sources, but DOS linefeeds (CRLF) for the build files for MSWindows compilers.<br/> - This combination seems to work for most people. If not, you can use the programs dos2unix and unix2dos which are available for most systems.</p> - <ul> - <li>Browse <a href="http://wxlua.sourceforge.net/download/">wxLua_Snapshot_YYYY-MM-DD.tar.gz</a> source packages</li> - </ul> - </div> - - <div class="indented"> <h2 id="browsesources">Browse the source files online</h2> <p>The Sourceforge CVS repository or the source files used to create the nightly tarball can be browsed online as well:</p> <ul> <li>Browse the wxLua <a href="http://wxlua.cvs.sourceforge.net/wxlua/wxLua/">CVS repository</a> on Sourceforge</li> - <li>Browse the wxLua source files <a href="http://wxlua.sourceforge.net/wxLua/">online</a></li> </ul> </div> --- 115,122 ---- Index: index.php =================================================================== RCS file: /cvsroot/wxlua/website/index.php,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** index.php 23 Sep 2008 20:33:24 -0000 1.21 --- index.php 3 Jun 2009 03:19:39 -0000 1.22 *************** *** 16,53 **** <h1 id="whatis" class="first">What is wxLua ?</h1> ! <p>wxLua is a set of bindings to the <a href="http://www.wxwidgets.org">wxWidgets</a> library for the ! <a href="http://www.lua.org">Lua</a> programming language. With <strong>wxLua</strong> you can write programs ! in Lua that use the wxWidgets <a href="http://en.wikipedia.org/wiki/Cross-platform">cross-platform</a> GUI library to ! develop and deliver your software with the programming ease of an interpreted language like Lua. Nearly all of the functionality of wxWidgets is exposed to Lua, meaning that your programs can have windows, dialogs, menus, toolbars, controls, image loading and saving, drawing, sockets, streams, printing, clipboard access... and much more.</p> ! <p>Additionally, wxLua can be used in your C++ programs to embed a <em>lua interpreter</em> ! with the wxWidgets API bindings. See the <a href="documentation.php">wxLua documentation</a> for more info.</p> ! <p>Want an example of how easy it is to write a cross-platform GUI? Here is a simple lua script which creates a wxFrame top level window and a menubar, just add your program to it:</p> <div style="z-index: 0"><?php include_once("luasample.lua.html"); ?></div> <p>Easy, isn't it ? You can see more samples <a href="http://wxlua.cvs.sourceforge.net/wxlua/wxLua/samples/">here</a>.</p> ! <p><strong>If you use wxLua or you wrote a wxLua-based application, don't forget to <a href="http://news.gmane.org/gmane.comp.lib.wxwidgets.wxlua.user">tell us</a> about it !</strong></p> <h1 id="start">Getting started</h1> <ol> ! <li><p><strong>get the tools</strong>; the <a href="download.php">download page</a> contains ! the binary packages which allow you to get started in few minutes. You will find the <strong>wxLua</strong> ! and <strong>wxLuaEdit</strong> applications there which allow you to write and test your (wx)Lua programs.</p></li> <li> ! <p><strong>learn Lua</strong>; once you've got wxLua installed and running, you need to learn how to use it: a good way to learn <a href="http://www.lua.org">Lua</a>, in case you don't already know, is to refer to the ! <a href="http://lua-users.org/wiki/TutorialDirectory">tutorial</a> hosted in the Lua wiki.</p></li> <li> ! <p><strong>learn wxLua</strong>; once you've got some experience with Lua language you can start to learn wxLua bindings looking at the <a href="documentation.php">documentation page</a> and at the samples in the <tt>wxLua/samples</tt> directory.</p></li> </ol> ! <p>Last, if you need help look at the <a href="support.php">support page</a>.</p> ! <?php include_once("footer.inc.php"); ?> \ No newline at end of file --- 16,60 ---- <h1 id="whatis" class="first">What is wxLua ?</h1> ! <p>wxLua is a set of bindings to the C++ <a href="http://www.wxwidgets.org">wxWidgets</a> ! <a href="http://en.wikipedia.org/wiki/Cross-platform">cross-platform</a> ! <a href="http://en.wikipedia.org/wiki/GUI">GUI</a> library for the ! <a href="http://www.lua.org">Lua</a> programming language. ! You can write complex, graphical, interactive programs with <strong>wxLua</strong> ! to develop and deliver your software with the programming ease of an interpreted language like Lua. Nearly all of the functionality of wxWidgets is exposed to Lua, meaning that your programs can have windows, dialogs, menus, toolbars, controls, image loading and saving, drawing, sockets, streams, printing, clipboard access... and much more.</p> ! <p>Additionally, wxLua can be used in your C++ programs to embed a <em>Lua interpreter</em> ! with the wxWidgets API installed to make development easier or to provide a scripting ! extension to the program's users. See the <a href="documentation.php">wxLua documentation</a> for more info.</p> ! <p>Want to see an example of how easy it is to write a cross-platform GUI? Here is a simple Lua script which creates a wxFrame top level window and a menubar, just add your program to it:</p> <div style="z-index: 0"><?php include_once("luasample.lua.html"); ?></div> <p>Easy, isn't it ? You can see more samples <a href="http://wxlua.cvs.sourceforge.net/wxlua/wxLua/samples/">here</a>.</p> ! <p><strong>If you use wxLua or you wrote a wxLua-based application, ! don't forget to <a href="http://news.gmane.org/gmane.comp.lib.wxwidgets.wxlua.user">tell us</a> about it !</strong></p> <h1 id="start">Getting started</h1> <ol> ! <li><p><strong>Get the tools:</strong> The <a href="download.php">download page</a> contains ! the binary packages which allow you to get started in a few minutes. You can use the <strong>wxLua</strong> ! and <strong>wxLuaEdit</strong> applications write, debug, and run your (wx)Lua programs.</p></li> <li> ! <p><strong>Learn Lua:</strong> Once you've got wxLua installed and running, you need to learn how to use it. ! A good way to learn <a href="http://www.lua.org">Lua</a>, in case you don't already know, is to refer to the ! <a href="http://lua-users.org/wiki/TutorialDirectory">tutorial</a> hosted on the Lua wiki.</p></li> <li> ! <p><strong>Learn wxLua:</strong> Now that you have some familiarity with the Lua language you can learn ! about wxWidgets. There is information about the wxLua bindings on the <a href="documentation.php">documentation page</a> ! and the samples, in the <tt>wxLua/samples</tt> directory, might be helpful too.</p></li> </ol> ! <p>Finally, if you need further help, please look at the <a href="support.php">support page</a>.</p> ! <?php include_once("footer.inc.php"); ?> |
|
From: John L. <jr...@us...> - 2009-06-01 22:28:44
|
Update of /cvsroot/wxlua/wxLua/docs In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv9876/wxLua/docs Modified Files: wxlua.html Log Message: Fix running files with spaces in their names. Index: wxlua.html =================================================================== RCS file: /cvsroot/wxlua/wxLua/docs/wxlua.html,v retrieving revision 1.44 retrieving revision 1.45 diff -C2 -d -r1.44 -r1.45 *** wxlua.html 28 May 2009 05:49:21 -0000 1.44 --- wxlua.html 1 Jun 2009 22:28:30 -0000 1.45 *************** *** 1,13 **** <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <html><head> - - <meta content="text/html; charset=ISO-8859-1" http-equiv="content-type"> - <title>wxLua Documentation</title> - <meta content="John Labenski" name="author"> ! </head><body> <h2><u>wxLua 2.8.10 - Documentation</u></h2> --- 1,12 ---- <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <html><head> + <meta content="text/html; charset=ISO-8859-1" http-equiv="content-type"><title>wxLua Documentation</title> ! ! ! <meta content="John Labenski" name="author"></head><body> <h2><u>wxLua 2.8.10 - Documentation</u></h2> *************** *** 23,27 **** running standalone wxLua ! scripts (wxLuaFreeze), a Lua module that may be loaded using <i>require("wx")</i> when using the standard Lua executable, and a --- 22,26 ---- running standalone wxLua ! scripts (wxLuaFreeze), a Lua module that may be loaded using <font color="blue"><i>require("wx")</i></font> when using the standard Lua executable, and a *************** *** 38,49 **** fast, dynamic, and easy to learn. Lua contains a limited number of data types, ! mainly numbers, strings, functions, tables, and userdata. Perhaps the most powerful ! feature of the Lua language is that the tables can be used as either ! arrays ! or hash tables that can cross-reference numbers, strings, ! functions, and/or ! subtables.<br> <br> --- 37,46 ---- fast, dynamic, and easy to learn. Lua contains a limited number of data types, ! mainly numbers, booleans, strings, functions, tables, and userdata. Perhaps the most powerful ! feature of the Lua language is that tables can be used as either ! numerically indexed arrays ! or associative arrays that can cross-reference any variable type to any other variable type.<br> <br> *************** *** 145,149 **** <li>wxLua uses an unmodified copy of Lua 5.1.4.</li> ! <li>Official patches on www.lua.org are applied as they are released.<br> </li> --- 142,146 ---- <li>wxLua uses an unmodified copy of Lua 5.1.4.</li> ! <li>However, official patches on www.lua.org are applied as they are released.<br> </li> *************** *** 218,222 **** them with other values or types, there is no "const" keyword.</li> <li>Variables are global unless you put the keyword ! '<i><font color="blue">local</font></i>' in front of them, this is sometimes good practice.</li> <li>The --- 215,219 ---- them with other values or types, there is no "const" keyword.</li> <li>Variables are global unless you put the keyword ! "<i><font color="blue">local</font></i>" in front of them, this is sometimes good practice.</li> <li>The *************** *** 233,237 **** <li>A <i><font color="blue">local</font></i> variable created with the same name as a global ! variable only temporarily supersedes the global.</li> <li>Use the function <font color="blue"><i>type(var_name)</i></font> to --- 230,234 ---- <li>A <i><font color="blue">local</font></i> variable created with the same name as a global ! variable temporarily supersedes the global.</li> <li>Use the function <font color="blue"><i>type(var_name)</i></font> to *************** *** 262,266 **** <li>You can provide an inline alternative to <font color="blue"><i>nil</i></font> ! using the '<i><font color="blue">or</font></i>' keyword since <font color="blue"><i>nil</i></font> evaluates to false.</li> <ul> --- 259,263 ---- <li>You can provide an inline alternative to <font color="blue"><i>nil</i></font> ! using the "<i><font color="blue">or</font></i>" keyword since <font color="blue"><i>nil</i></font> evaluates to false.</li> <ul> *************** *** 278,286 **** <font color="blue"><i>false</i></font>, but the number 0 evaluates as <i><font color="blue">true</font></i> since it has a ! value, i.e. not <font color="blue"><i>nil</i></font>, use <i><font color="blue">"a ~= 0"</font>.</i> </li> </ul> <ul> <li><font color="blue"><i>a = 0; if a ! then print(a) end</i></font> ; prints "0" since the variable '<i>a</i>' evaluates to <i><font color="blue">true</font></i>.</li> --- 275,283 ---- <font color="blue"><i>false</i></font>, but the number 0 evaluates as <i><font color="blue">true</font></i> since it has a ! value, i.e. not <font color="blue"><i>nil</i></font>, use <i><font color="blue">(a ~= 0)</font>.</i> </li> </ul> <ul> <li><font color="blue"><i>a = 0; if a ! then print(a) end</i></font> ; prints "0" since the variable "<i>a"</i> evaluates to <i><font color="blue">true</font></i>.</li> *************** *** 318,321 **** --- 315,321 ---- of a particular string stored at any one time no matter how many variables reference it.</li> + <li>String variables are copy on write and the example above shows that overwriting "b" does not change "a".<br> + </li> + <li><font color="blue"><i>s = "How are 'you'!"</i></font> or <font color="blue"><i>s</i><i> *************** *** 373,379 **** <ul> <li>Printing a table is the same as calling <font color="blue"><i>tostring(t)</i></font> ! on the table which displays the type and its memory address.</li> <li>Assigning a variable to an existing table does not copy the ! table <br> </li> </ul> --- 373,379 ---- <ul> <li>Printing a table is the same as calling <font color="blue"><i>tostring(t)</i></font> ! on the table which displays the variable type and its memory address.</li> <li>Assigning a variable to an existing table does not copy the ! table and you can use either variable to access and modify the elements.<br> </li> </ul> *************** *** 394,400 **** <li>Set values as : <font color="blue"><i>t</i><i>.a = 2; t["a"] = 3; t[10] = 4</i></font></li> ! <li>New ! values that don't already exist are automatically ! created.</li> <li>Clear values by setting them to <i>nil</i>, e.g. <font color="blue"><i>t</i><i>.a = nil</i></font></li> --- 394,399 ---- <li>Set values as : <font color="blue"><i>t</i><i>.a = 2; t["a"] = 3; t[10] = 4</i></font></li> ! <li>Elements are automatically created when assigning new ! values to elements that don't already exist and accessing elements that don't exist returns <font color="blue"><i>nil</i></font>.</li> <li>Clear values by setting them to <i>nil</i>, e.g. <font color="blue"><i>t</i><i>.a = nil</i></font></li> *************** *** 432,436 **** <li>The global table is called <font color="blue"><i>_G</i></font> and you can display it ! as any table using<br> </li> <ul> --- 431,435 ---- <li>The global table is called <font color="blue"><i>_G</i></font> and you can display it ! as you would any table using<br> </li> <ul> *************** *** 451,455 **** function, among other things.</li> <li>This ! is the datatype that wxLua uses wrap wxWidgets C++ objects that are pushed into Lua. <br> </li> --- 450,454 ---- function, among other things.</li> <li>This ! is the data type that wxLua uses wrap wxWidgets C++ objects that are pushed into Lua. <br> </li> *************** *** 468,472 **** <li>prints "function: 01DE2AF8 3 function"</li> <li>Printing a function is the same as calling <font color="blue"><i>tostring(f)</i></font> on the function which displays ! the type and its memory address.</li> </ul> <li>Can --- 467,471 ---- <li>prints "function: 01DE2AF8 3 function"</li> <li>Printing a function is the same as calling <font color="blue"><i>tostring(f)</i></font> on the function which displays ! the variable type and its memory address.</li> </ul> <li>Can *************** *** 493,497 **** functions by value and changes to them do not modify the original.</li> <li>Tables and userdata are passed to functions by reference and ! changes to them modify the original variable.</li> </ul> <ul> --- 492,496 ---- functions by value and changes to them do not modify the original.</li> <li>Tables and userdata are passed to functions by reference and ! changes to them do modify the original variable.</li> </ul> <ul> *************** *** 502,506 **** </li> <li>prints "hello hello", i.e. <font color="blue"><i>tbl</i><i>[1] ! == "hello"</i></font> and the variable <i>item</i> still equals "hello" and was not changed.<br> </li> --- 501,505 ---- </li> <li>prints "hello hello", i.e. <font color="blue"><i>tbl</i><i>[1] ! == "hello"</i></font> and the variable <i>"item"</i> still equals "hello" and was not changed.<br> </li> *************** *** 568,572 **** <blockquote> ! <pre><font color="blue">local a, b, c = 1, 2, 3 -- can assign multiple values<br>a = 1; b = 2; c = 3 -- use ; for multiple lines of code on single line<br>a, b, c = 1, 2, 3 -- this works too<br>if (a == 1) and ((b <= 2) or (c ~= 3)) then <br> print(a+b/c) <br>elseif a == 2 then -- no parentheses necessary<br> print(a)<br>else<br> print(b)<br>end</font></pre> </blockquote> --- 567,571 ---- <blockquote> ! <pre><font color="blue">local a, b, c = 1, 2, 3 -- can assign multiple values<br>a = 1; b = 2; c = 3 -- use ; for multiple lines of code on single line<br>a, b, c = 1, 2, 3 -- this works too<br>if (a == 1) and ((b <= 2) or (c ~= 3)) then <br> print(a+b/c) <br>elseif a == 2 then -- no parentheses necessary<br> print(a)<br>else<br> print(b)<br>end</font></pre> </blockquote> *************** *** 579,583 **** function() ... end</i></font> may be used to simulate one.</li> <blockquote> ! <pre><font color="blue">case = {}<br>case[1] = function() print("Hello #1") end<br>case[2] = function() print("Hello #2") end<br>...<br>if case[value] then<br> case[value]()<br>else<br> print("Unknown case value")<br>end</font></pre> </blockquote> </ul> --- 578,582 ---- function() ... end</i></font> may be used to simulate one.</li> <blockquote> ! <pre><font color="blue">case = {}<br>case[1] = function() print("Hello #1") end -- anonymous function<br>case[2] = function() print("Hello #2") end<br>...<br>if case[value] then<br> case[value]()<br>else<br> print("Unknown case value")<br>end</font></pre> </blockquote> </ul> *************** *** 593,597 **** <blockquote> ! <pre><font color="blue">function Check5(val) if val == 5 then return true end end -- returns nil if val ~= 5<br>local a = 1<br>while a < 10 do<br> print(a)<br> if </font><font><font color="blue">Check5</font></font><font color="blue">(a) then break end<br></font><font><font color="blue"> a = a + 1 -- no increment operator<br></font></font><font color="blue">end</font></pre> </blockquote> --- 592,596 ---- <blockquote> ! <pre><font color="blue">function Check5(val)</font><font><font color="blue"> -- returns nil if val ~= 5</font></font><font color="blue"> <br> if val == 5 then <br> return true <br> end <br>end <br><br>local a = 1<br>while a < 10 do<br> print(a)<br> if </font><font><font color="blue">Check5</font></font><font color="blue">(a) then break end<br></font><font><font color="blue"> a = a + 1 -- no increment operator<br></font></font><font color="blue">end</font></pre> </blockquote> *************** *** 662,666 **** discarded.</li> <li>Return ! values using the '<font color="blue"><i>return</i></font>' keyword.</li> <li>Not all return values need to be used and extra ones will be discarded. </li> --- 661,665 ---- discarded.</li> <li>Return ! values using the "<font color="blue"><i>return</i></font>" keyword.</li> <li>Not all return values need to be used and extra ones will be discarded. </li> *************** *** 722,726 **** <blockquote> ! <pre><font color="blue">-- Print the keys in table t for table of values<br>function PrintKeys(t, vals, cmp_case)<br></font><font><font color="blue"> -- use nested functions for repetitive code or to simplify code<br></font></font><font color="blue"> local function cmp_vals(a, b) <br> if cmp_case then -- using upvalue variable<br> return a == b<br> else<br> return string.lower(a) == string.lower(b)<br> end<br> end<br> <br></font><font color="blue"> local function find_key(t, val)<br> for k,v in pairs(t) do<br> if </font><font><font color="blue">cmp_vals</font></font><font color="blue">(val, v) then return k end<br> end<br> end<br><br> for i = 1, #vals do<br> print(</font><font><font color="blue">find_key(t, vals[i])</font></font><font color="blue">, vals[i])<br> end<br>end<br><br>-- prints "a1 a2", "b1 b2", "nil C2"<br>PrintKeys({a1 = "a2", b1 = "b2", c1 = "c2"}, {"a2", "b2", "C2"}, true)<br><br><br>-- Varargs example, prints "4 4 4 20 20" and "table: 0183B820 10 30 5"<br>function Varargs(...)<br> local args = {...}<br> print(select("#", ...), #{...}, #args, args[2], unpack({...}, 2, 2)) <br> return args, unpack(args) -- same as return ...<br>end<br><br>vals, val1, _, val3 = Varargs(10, 20, 30, 40)<br>print(vals, val1, val3, select("#", Varargs(10, 20, 30, 40)))</font><br></pre> </blockquote> --- 721,725 ---- <blockquote> ! <pre><font color="blue">-- Print the keys in table t for table of values<br>function PrintKeys(t, vals, cmp_case)<br></font><font><font color="blue"> -- use nested functions for repetitive code or to simplify code<br></font></font><font color="blue"> local function cmp_vals(a, b) <br> if cmp_case then -- can use upvalue variables<br> return a == b<br> else<br> return string.lower(a) == string.lower(b)<br> end<br> end<br> <br></font><font color="blue"> local function find_key(t, val)<br> for k,v in pairs(t) do<br> if </font><font><font color="blue">cmp_vals</font></font><font color="blue">(val, v) then return k end<br> end<br> end<br><br> for i = 1, #vals do<br> print(</font><font><font color="blue">find_key(t, vals[i])</font></font><font color="blue">, vals[i])<br> end<br>end<br><br>-- prints "a1 a2", "b1 b2", "nil C2"<br>PrintKeys({a1 = "a2", b1 = "b2", c1 = "c2"}, {"a2", "b2", "C2"}, true)<br><br><br>-- Varargs example, prints "4 4 4 20 20" and "table: 0183B820 10 30 5"<br>function Varargs(...)<br> local args = {...}<br> print(select("#", ...), #{...}, #args, args[2], unpack({...}, 2, 2)) <br> return args, unpack(args) -- same as return ...<br>end<br><br>vals, val1, _, val3 = Varargs(10, 20, 30, 40)<br>print(vals, val1, val3, select("#", Varargs(10, 20, 30, 40)))</font><br></pre> </blockquote> *************** *** 781,785 **** in wxLua</u></h2> ! Programming in wxLua means that you're writing Lua programs using the Lua language using an additional table of functions, objects, numbers, --- 780,784 ---- in wxLua</u></h2> ! Programming in wxLua means that you're writing programs in the Lua language using an additional table of functions, objects, numbers, *************** *** 966,977 **** </li> </ul> <li>wxLua ! does not use the static event tables since it is ! not a compiled language. Rather the wxEvtHandler::Connect() function is ! used ! to connect event types to a wxEvtHandler, typically a wxWindow ! derived class. Therefore you do not use EVT_XXX() macros, but the corresponding wxEVT_XXX. The wxluaref.html manual contains a complete ! mapping between the two. </li> <ul> <li>Example : <i>EVT_MENU(id, --- 965,977 ---- </li> </ul> + <li>wxLua ! does not use the static event tables, the EVT_XXX() macros, since it is ! not a compiled language, but rather the corresponding wxEVT_XXX. The wxluaref.html manual contains a complete ! mapping between the two.</li> ! <li>Use the wxEvtHandler::Connect() function to connect event types to a wxEvtHandler, typically a wxWindow ! derived class.</li> ! <ul> <li>Example : <i>EVT_MENU(id, *************** *** 1078,1082 **** stricter about type than Lua. For example; string arguments do not accept numbers which Lua would silently convert. </li> ! <li>Member functions from the base class(es) are also available --- 1078,1082 ---- stricter about type than Lua. For example; string arguments do not accept numbers which Lua would silently convert. </li> ! <li>Member functions inherited from the base class(es) are also available *************** *** 1124,1128 **** that have the %delete binding tag will be eventually garbage collected when they go out of scope.</li> ! <li>Classed without the %delete tag are assumed to be eventually attached to another object that will delete them for you.</li> --- 1124,1128 ---- that have the %delete binding tag will be eventually garbage collected when they go out of scope.</li> ! <li>Classes without the %delete tag are assumed to be eventually attached to another object that will delete them for you.</li> *************** *** 1136,1141 **** <ul> <li>This ! is really a MS Windows problem, in Win95 based systems the number that ! you could create was severely limited, but even in NT systems (XP, Vista) you will have problems if you've created hundreds of them. One visible sign --- 1136,1142 ---- <ul> <li>This ! is really a problem only in MS Windows. Windows 95 based systems are ! allowed only dozens of GDI objects at any one time, but even in NT ! systems (XP, Vista) you will have problems if you've created hundreds of them. One visible sign *************** *** 1149,1153 **** since the Lua userdata that wxLua pushes into Lua only store a void* pointer to the C++ class object, Lua only ! thinks they are of size void* which are on 32bit x86 machines only 8 bytes. However, the class might store a 1024x768 x 3 bytes/pixel --- 1150,1154 ---- since the Lua userdata that wxLua pushes into Lua only store a void* pointer to the C++ class object, Lua only ! thinks they are of size void* which are on 64bit x86 machines only 8 bytes. However, the class might store a 1024x768 x 3 bytes/pixel *************** *** 1160,1165 **** <li>The solution is to use the delete() function on certain types of userdata when you are done.</li> ! <li>Care must be taken to ensure that you're not silently ! creating too many temporary objects.</li> <ul> <li>Example: <i>"wxDC:SetPen(wx.wxPen(wx.wxColour(1,2,3), --- 1161,1166 ---- <li>The solution is to use the delete() function on certain types of userdata when you are done.</li> ! <li><font color="red">Care must be taken to ensure that you're not silently ! creating too many temporary objects.</font></li> <ul> <li>Example: <i>"wxDC:SetPen(wx.wxPen(wx.wxColour(1,2,3), *************** *** 1644,1648 **** The examples below are for MS Windows .exe executables, but the same ! applies for Linux or OSX, just remove the .exe extension for the executable. See also <a href="#wxLua_Applications">wxLua Applications</a> for more information about these programs. --- 1645,1649 ---- The examples below are for MS Windows .exe executables, but the same ! applies for Linux or OSX, just remove the .exe extension from the executable. See also <a href="#wxLua_Applications">wxLua Applications</a> for more information about these programs. *************** *** 1670,1674 **** <li>You may need to adjust the <i>package.cpath</i> variable to have it point to the correct location of the wx.so or ! wx.dll shared library for require("wx") to load.</li> </ul> </ul> --- 1671,1675 ---- <li>You may need to adjust the <i>package.cpath</i> variable to have it point to the correct location of the wx.so or ! wx.dll shared library for <i>require("wx")</i> to load.</li> </ul> </ul> |
|
From: John L. <jr...@us...> - 2009-06-01 22:28:32
|
Update of /cvsroot/wxlua/wxLua/apps/wxlua/src In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv9876/wxLua/apps/wxlua/src Modified Files: wxlua.cpp Log Message: Fix running files with spaces in their names. Index: wxlua.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxlua/src/wxlua.cpp,v retrieving revision 1.56 retrieving revision 1.57 diff -C2 -d -r1.56 -r1.57 *** wxlua.cpp 6 Jan 2009 21:17:18 -0000 1.56 --- wxlua.cpp 1 Jun 2009 22:28:29 -0000 1.57 *************** *** 64,71 **** wxCMD_LINE_VAL_NONE, wxCMD_LINE_PARAM_OPTIONAL }, ! { wxCMD_LINE_SWITCH, wxT("m"), wxT("msgdlg"), wxT("Print output to a message dialog."), wxCMD_LINE_VAL_NONE, wxCMD_LINE_PARAM_OPTIONAL }, ! { wxCMD_LINE_SWITCH, wxT("c"), wxT("console"), wxT("Print output to a persistent message console."), wxCMD_LINE_VAL_NONE, wxCMD_LINE_PARAM_OPTIONAL }, --- 64,71 ---- wxCMD_LINE_VAL_NONE, wxCMD_LINE_PARAM_OPTIONAL }, ! { wxCMD_LINE_SWITCH, wxT("m"), wxT("msgdlg"), wxT("Print output to message dialogs."), wxCMD_LINE_VAL_NONE, wxCMD_LINE_PARAM_OPTIONAL }, ! { wxCMD_LINE_SWITCH, wxT("c"), wxT("console"), wxT("Print output to a message console."), wxCMD_LINE_VAL_NONE, wxCMD_LINE_PARAM_OPTIONAL }, *************** *** 365,368 **** --- 365,369 ---- } + void wxLuaStandaloneApp::DisplayMessage(const wxString &msg, bool is_error, const wxLuaState& wxlState) |
|
From: John L. <jr...@us...> - 2009-06-01 22:28:32
|
Update of /cvsroot/wxlua/wxLua/samples In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv9876/wxLua/samples Modified Files: editor.wx.lua Log Message: Fix running files with spaces in their names. Index: editor.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/editor.wx.lua,v retrieving revision 1.58 retrieving revision 1.59 diff -C2 -d -r1.58 -r1.59 *** editor.wx.lua 1 Apr 2008 05:10:05 -0000 1.58 --- editor.wx.lua 1 Jun 2009 22:28:30 -0000 1.59 *************** *** 1799,1803 **** local id = editor:GetId(); local console = iff(menuBar:IsChecked(ID_USECONSOLE), " -c ", "") ! local cmd = '"'..programName..'" '..console..openDocuments[id].filePath DisplayOutput("Running program: "..cmd.."\n") --- 1799,1803 ---- local id = editor:GetId(); local console = iff(menuBar:IsChecked(ID_USECONSOLE), " -c ", "") ! local cmd = '"'..programName..'" '..console..'"'..openDocuments[id].filePath..'"' DisplayOutput("Running program: "..cmd.."\n") |
