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: Francesco M. <fr...@us...> - 2008-02-03 22:38:57
|
Update of /cvsroot/wxlua/website In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv4956 Modified Files: download.php Log Message: updated for 2.8.7.0 release Index: download.php =================================================================== RCS file: /cvsroot/wxlua/website/download.php,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** download.php 24 Aug 2007 06:37:48 -0000 1.28 --- download.php 3 Feb 2008 22:38:52 -0000 1.29 *************** *** 10,28 **** // IMPORTANT: update these info when a new release is available! // ============================================================= ! $latestversion="2.8.4.2"; ! $apsize="9.6"; // size of the wxlua-xxx.package file (in MB) $bundlesize="16.9"; // size of the wxlua-xxx.dmg file (in MB) ! $winlink="http://downloads.sourceforge.net/wxlua/wxLua-2.8.4.2-MSW-bin.zip?use_mirror=osdn"; ! $dlllink="http://downloads.sourceforge.net/wxlua/wxLua-2.8.4.2-MSW-dll.zip?use_mirror=osdn"; ! ! //$linuxlink="http://prdownloads.sourceforge.net/wxlua/wxlua-$latestversion-1.x86.package?download"; ! $linuxlink="http://downloads.sourceforge.net/wxlua/wxlua-2.8.0.0-1.x86.package?use_mirror=internap"; ! ! // $maclink="http://prdownloads.sourceforge.net/wxlua/wxlua-$latestversion-tiger.dmg?download"; ! $maclink="http://downloads.sourceforge.net/wxlua/wxlua-2.8.4.1-tiger.dmg?use_mirror=osdn"; ! ! $gzlink="http://downloads.sourceforge.net/wxlua/wxLua-2.8.4.1.tar.gz?use_mirror=osdn"; ?> --- 10,24 ---- // IMPORTANT: update these info when a new release is available! // ============================================================= ! $latestversion="2.8.7.0"; ! $winsize="9"; // size of the wxlua-xxx.bin.zip file (in MB) ! $apsize="11"; // size of the wxlua-xxx.package file (in MB) $bundlesize="16.9"; // size of the wxlua-xxx.dmg file (in MB) ! $winlink="http://downloads.sourceforge.net/wxlua/wxLua-$latestversion-MSW-bin.zip"; ! $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.4.1-tiger.dmg"; ! $gzlink="http://downloads.sourceforge.net/wxlua/wxLua-$latestversion-src.tar.gz"; ?> *************** *** 82,86 **** <h2 id="win">...for Windows</h2> <a href="<?php echo $winlink; ?>"><img src="images/win.png" alt="Windows download"/></a> ! <p><a href="<?php echo $winlink; ?>">Binary package</a> : self-contained; you won't need anything else.</p> <p>You may also want to download a <a href="<?php echo $dlllink; ?>">package</a> containing the DLLs required for using wxWidgets bindings as a <a href="http://lua-users.org/wiki/BuildingModules">Lua module</a>.</p> --- 78,82 ---- <h2 id="win">...for Windows</h2> <a href="<?php echo $winlink; ?>"><img src="images/win.png" alt="Windows download"/></a> ! <p><a href="<?php echo $winlink; ?>">Binary package</a> ~ <?php echo $winsize; ?> MB: self-contained; you won't need anything else.</p> <p>You may also want to download a <a href="<?php echo $dlllink; ?>">package</a> containing the DLLs required for using wxWidgets bindings as a <a href="http://lua-users.org/wiki/BuildingModules">Lua module</a>.</p> |
|
From: Francesco M. <fr...@us...> - 2008-02-03 21:55:36
|
Update of /cvsroot/wxlua/wxLua/distrib/autopackage In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv20598/distrib/autopackage Modified Files: default.apspec.in makeautopackage Log Message: updated stuff for the autopackage building Index: default.apspec.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/distrib/autopackage/default.apspec.in,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** default.apspec.in 24 Dec 2006 13:30:56 -0000 1.4 --- default.apspec.in 3 Feb 2008 21:55:31 -0000 1.5 *************** *** 24,28 **** export APBUILD_STATIC="tiff expat" export NO_WXLUAEDIT_CHECK=1 ! prepareBuild --disable-shared --disable-debug --enable-unicode --disable-customwxbind-install --disable-precomp-headers [BuildUnprepare] --- 24,28 ---- export APBUILD_STATIC="tiff expat" export NO_WXLUAEDIT_CHECK=1 ! prepareBuild --disable-shared --disable-debug --enable-unicode --disable-customwxbind-install --disable-precomp-headers --disable-systemlua [BuildUnprepare] *************** *** 40,44 **** # statically to all wxWidgets (STC cannot be built statically # against a shared build of wx) ! ##require @wxwidgets.org/wxgtk 26.0 # remove the wxLua RPM/DEB/other native package format if installed --- 40,44 ---- # statically to all wxWidgets (STC cannot be built statically # against a shared build of wx) ! ##require @wxwidgets.org/wxgtk 28.0 # remove the wxLua RPM/DEB/other native package format if installed Index: makeautopackage =================================================================== RCS file: /cvsroot/wxlua/wxLua/distrib/autopackage/makeautopackage,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** makeautopackage 24 Dec 2006 13:30:56 -0000 1.3 --- makeautopackage 3 Feb 2008 21:55:31 -0000 1.4 *************** *** 1,14 **** ! #!/bin/sh # NB: you can also do "make autopackage" from the # main dir after you ran configure there rm -rf toupload mkdir -p toupload ! rm -f upload/*.xml upload/*.meta upload/*.package cd ../.. ! makeinstaller $@ distrib/autopackage/default.apspec if test $? = 0; then mv *.xml *.meta *.package distrib/autopackage/toupload fi --- 1,38 ---- ! #!/bin/bash # NB: you can also do "make autopackage" from the # main dir after you ran configure there + currloc="http://wxlua.sourceforge.net/wxlua/" + sshurl="shell.sf.net:/home/groups/w/wx/wxlua/htdocs/wxlua/" + + + if [[ ! -f distrib/autopackage/default.apspec ]]; then + echo + echo "Please first run the configure script in the ../.. folder in" + echo "order to create the default.apspec file from default.apspec.in" + echo + exit 1 + fi + + # remove old stuff rm -rf toupload mkdir -p toupload ! rm -f toupload/*.xml toupload/*.meta toupload/*.package + # build the package cd ../.. ! makepackage $@ distrib/autopackage/default.apspec if test $? = 0; then mv *.xml *.meta *.package distrib/autopackage/toupload + + echo + echo + echo "= REMINDER ===================================================" + echo "Now that the autopackage has been built successfully, remember" + echo "to upload the .meta, .package and .xml files to the" + echo " $currloc" + echo "folder:" + echo " scp toupload/*.xml toupload/*.meta toupload/*.package $sshurl" + echo "==============================================================" fi |
|
From: John L. <jr...@us...> - 2008-02-02 17:10:19
|
Update of /cvsroot/wxlua/wxLua/docs In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv30014/wxLua/docs Modified Files: changelog.txt Log Message: Set date for 2.8.7.0 release. Index: changelog.txt =================================================================== RCS file: /cvsroot/wxlua/wxLua/docs/changelog.txt,v retrieving revision 1.62 retrieving revision 1.63 diff -C2 -d -r1.62 -r1.63 *** changelog.txt 1 Feb 2008 05:36:38 -0000 1.62 --- changelog.txt 2 Feb 2008 17:10:12 -0000 1.63 *************** *** 2,6 **** =============== ! version 2.8.7.0 (released ??/??/????) -------------------------------------------------------------------- --- 2,6 ---- =============== ! version 2.8.7.0 (released 02/02/2008) -------------------------------------------------------------------- |
|
From: John L. <jr...@us...> - 2008-02-02 16:42:16
|
Update of /cvsroot/wxlua/wxLua/modules/build/msvc8 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv17989/wxLua/modules/build/msvc8 Modified Files: modules_mod_luamodule_mono.vcproj Log Message: Visual C fix for not understanding ULL Update bakefiles Index: modules_mod_luamodule_mono.vcproj =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msvc8/modules_mod_luamodule_mono.vcproj,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** modules_mod_luamodule_mono.vcproj 31 Jan 2008 04:34:05 -0000 1.9 --- modules_mod_luamodule_mono.vcproj 2 Feb 2008 16:41:42 -0000 1.10 *************** *** 933,945 **** /> <File - RelativePath="..\..\wxlua\src\wxlua.cpp" - /> - <File RelativePath="..\..\wxlua\src\wxlua_bind.cpp" /> <File - RelativePath="..\..\wxluasocket\src\wxluasocket.cpp" - /> - <File RelativePath="..\..\wxluasocket\src\wxluasocket_bind.cpp" /> --- 933,939 ---- |
|
From: John L. <jr...@us...> - 2008-02-02 16:42:15
|
Update of /cvsroot/wxlua/wxLua/modules/build/bakefiles In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv17989/wxLua/modules/build/bakefiles Modified Files: common.bkl Log Message: Visual C fix for not understanding ULL Update bakefiles Index: common.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/bakefiles/common.bkl,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** common.bkl 21 Jan 2008 03:09:49 -0000 1.18 --- common.bkl 2 Feb 2008 16:41:41 -0000 1.19 *************** *** 99,103 **** <set var="LUAMODULEMONO_SRC"> $(LUAMODULE_SRC) ! <!-- don't duplicate the dummy.cpp files - FIXME is there a better way? removeDuplicates with safeSplit? $(WXBINDADV_SRC) --- 99,103 ---- <set var="LUAMODULEMONO_SRC"> $(LUAMODULE_SRC) ! <!-- don't duplicate the dummy.cpp files - FIXME is there a better way? removeDuplicates with safeSplit? $(WXBINDADV_SRC) *************** *** 120,138 **** $(fileList('wxbind/src/*.cpp')) ! wxluasocket/src/wxldserv.cpp wxluasocket/src/wxldtarg.cpp wxluasocket/src/wxlsock.cpp wxluasocket/src/wxluasocket_bind.cpp - wxluasocket/src/wxluasocket.cpp wxluadebug/src/wxldebug.cpp wxluadebug/src/wxlstack.cpp ! wxlua/src/wxlbind.cpp wxlua/src/wxlcallb.cpp wxlua/src/wxlstate.cpp wxlua/src/wxlua_bind.cpp - wxlua/src/wxlua.cpp </set> <set var="LUAMODULEMONO_HDR">$(LUAMODULE_HDR)</set> --- 120,136 ---- $(fileList('wxbind/src/*.cpp')) ! wxluasocket/src/wxldserv.cpp wxluasocket/src/wxldtarg.cpp wxluasocket/src/wxlsock.cpp wxluasocket/src/wxluasocket_bind.cpp wxluadebug/src/wxldebug.cpp wxluadebug/src/wxlstack.cpp ! wxlua/src/wxlbind.cpp wxlua/src/wxlcallb.cpp wxlua/src/wxlstate.cpp wxlua/src/wxlua_bind.cpp </set> <set var="LUAMODULEMONO_HDR">$(LUAMODULE_HDR)</set> |
|
From: John L. <jr...@us...> - 2008-02-02 16:42:15
|
Update of /cvsroot/wxlua/wxLua/modules/build/msvc6 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv17989/wxLua/modules/build/msvc6 Modified Files: modules_mod_luamodule_mono.dsp Log Message: Visual C fix for not understanding ULL Update bakefiles Index: modules_mod_luamodule_mono.dsp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msvc6/modules_mod_luamodule_mono.dsp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** modules_mod_luamodule_mono.dsp 31 Jan 2008 04:34:05 -0000 1.9 --- modules_mod_luamodule_mono.dsp 2 Feb 2008 16:41:41 -0000 1.10 *************** *** 419,434 **** # Begin Source File - SOURCE=..\..\wxlua\src\wxlua.cpp - # End Source File - # Begin Source File - SOURCE=..\..\wxlua\src\wxlua_bind.cpp # End Source File # Begin Source File - SOURCE=..\..\wxluasocket\src\wxluasocket.cpp - # End Source File - # Begin Source File - SOURCE=..\..\wxluasocket\src\wxluasocket_bind.cpp # End Source File --- 419,426 ---- |
|
From: John L. <jr...@us...> - 2008-02-02 16:42:14
|
Update of /cvsroot/wxlua/wxLua/modules In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv17989/wxLua/modules Modified Files: Makefile.in Log Message: Visual C fix for not understanding ULL Update bakefiles Index: Makefile.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/Makefile.in,v retrieving revision 1.75 retrieving revision 1.76 diff -C2 -d -r1.75 -r1.76 *** Makefile.in 31 Jan 2008 04:34:04 -0000 1.75 --- Makefile.in 2 Feb 2008 16:40:55 -0000 1.76 *************** *** 602,606 **** mod_luamodule_mono_wxlsock.o \ mod_luamodule_mono_wxluasocket_bind.o \ - mod_luamodule_mono_wxluasocket.o \ mod_luamodule_mono_wxldebug.o \ mod_luamodule_mono_wxlstack.o \ --- 602,605 ---- *************** *** 608,613 **** mod_luamodule_mono_wxlcallb.o \ mod_luamodule_mono_wxlstate.o \ ! mod_luamodule_mono_wxlua_bind.o \ ! mod_luamodule_mono_wxlua.o MOD_LUAMODULE_MONO_ODEP = \ $(___pch_wxprec_mod_luamodule_mono_wx_wxprec_h_gch___depname) --- 607,611 ---- mod_luamodule_mono_wxlcallb.o \ mod_luamodule_mono_wxlstate.o \ ! mod_luamodule_mono_wxlua_bind.o MOD_LUAMODULE_MONO_ODEP = \ $(___pch_wxprec_mod_luamodule_mono_wx_wxprec_h_gch___depname) *************** *** 3575,3581 **** $(CXXC) -c -o $@ $(MOD_LUAMODULE_MONO_CXXFLAGS) $(srcdir)/wxluasocket/src/wxluasocket_bind.cpp - mod_luamodule_mono_wxluasocket.o: $(srcdir)/wxluasocket/src/wxluasocket.cpp $(MOD_LUAMODULE_MONO_ODEP) - $(CXXC) -c -o $@ $(MOD_LUAMODULE_MONO_CXXFLAGS) $(srcdir)/wxluasocket/src/wxluasocket.cpp - mod_luamodule_mono_wxldebug.o: $(srcdir)/wxluadebug/src/wxldebug.cpp $(MOD_LUAMODULE_MONO_ODEP) $(CXXC) -c -o $@ $(MOD_LUAMODULE_MONO_CXXFLAGS) $(srcdir)/wxluadebug/src/wxldebug.cpp --- 3573,3576 ---- *************** *** 3596,3602 **** $(CXXC) -c -o $@ $(MOD_LUAMODULE_MONO_CXXFLAGS) $(srcdir)/wxlua/src/wxlua_bind.cpp - mod_luamodule_mono_wxlua.o: $(srcdir)/wxlua/src/wxlua.cpp $(MOD_LUAMODULE_MONO_ODEP) - $(CXXC) -c -o $@ $(MOD_LUAMODULE_MONO_CXXFLAGS) $(srcdir)/wxlua/src/wxlua.cpp - # Include dependency info, if present: --- 3591,3594 ---- |
|
From: John L. <jr...@us...> - 2008-02-02 16:42:13
|
Update of /cvsroot/wxlua/wxLua In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv17989/wxLua Modified Files: Makefile.in Log Message: Visual C fix for not understanding ULL Update bakefiles Index: Makefile.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/Makefile.in,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** Makefile.in 15 Jan 2008 00:08:15 -0000 1.31 --- Makefile.in 2 Feb 2008 16:40:55 -0000 1.32 *************** *** 80,84 **** samples: @mkdir -p $(DESTDIR)$(datadir)/wxlua/samples ! @for f in samples/auidemo.wx.lua samples/bindings.wx.lua samples/calculator.wx.lua samples/choices.wx.lua samples/controls.wx.lua samples/coroutine.wx.lua samples/dialog.wx.lua samples/editor.wx.lua samples/grid.wx.lua samples/htmlwin.wx.lua samples/luamodule.wx.lua samples/mdi.wx.lua samples/media.wx.lua samples/minimal.wx.lua samples/picker.wx.lua samples/printing.wx.lua samples/scribble.wx.lua samples/settings.wx.lua samples/sizer.wx.lua samples/tree.wx.lua samples/unittest.wx.lua samples/validator.wx.lua samples/veryminimal.wx.lua samples/wxluasudoku.wx.lua samples/calculator.xrc; do \ if test ! -f $(DESTDIR)$(datadir)/wxlua/samples/$$f -a ! -d $(DESTDIR)$(datadir)/wxlua/samples/$$f ; \ then x=yep ; \ --- 80,84 ---- samples: @mkdir -p $(DESTDIR)$(datadir)/wxlua/samples ! @for f in samples/auidemo.wx.lua samples/bindings.wx.lua samples/calculator.wx.lua samples/choices.wx.lua samples/controls.wx.lua samples/coroutine.wx.lua samples/dialog.wx.lua samples/editor.wx.lua samples/grid.wx.lua samples/gridtable.wx.lua samples/htmlwin.wx.lua samples/luamodule.wx.lua samples/mdi.wx.lua samples/media.wx.lua samples/minimal.wx.lua samples/picker.wx.lua samples/printing.wx.lua samples/scribble.wx.lua samples/settings.wx.lua samples/sizer.wx.lua samples/tree.wx.lua samples/unittest.wx.lua samples/validator.wx.lua samples/veryminimal.wx.lua samples/wxluasudoku.wx.lua samples/calculator.xrc; do \ if test ! -f $(DESTDIR)$(datadir)/wxlua/samples/$$f -a ! -d $(DESTDIR)$(datadir)/wxlua/samples/$$f ; \ then x=yep ; \ |
|
From: John L. <jr...@us...> - 2008-02-02 16:41:49
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv17989/wxLua/modules/wxlua/src Modified Files: wxlstate.cpp Log Message: Visual C fix for not understanding ULL Update bakefiles Index: wxlstate.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlstate.cpp,v retrieving revision 1.172 retrieving revision 1.173 diff -C2 -d -r1.172 -r1.173 *** wxlstate.cpp 2 Feb 2008 15:56:55 -0000 1.172 --- wxlstate.cpp 2 Feb 2008 16:41:45 -0000 1.173 *************** *** 4019,4023 **** #define BITLIB_FLOAT_MAX 0xfffffffffffffL #define BITLIB_FLOAT_MIN (-0x10000000000000L) ! #define BITLIB_FLOAT_UMAX 0x1fffffffffffffUL /* FIXME: Assume lua_Integer is ptrdiff_t */ --- 4019,4027 ---- #define BITLIB_FLOAT_MAX 0xfffffffffffffL #define BITLIB_FLOAT_MIN (-0x10000000000000L) ! #if defined(__VISUALC__) ! #define BITLIB_FLOAT_UMAX 0x1fffffffffffffUL ! #else ! #define BITLIB_FLOAT_UMAX 0x1fffffffffffffULL ! #endif /* FIXME: Assume lua_Integer is ptrdiff_t */ *************** *** 4087,4091 **** #define MONADIC(name, op) \ ! static int bit_##name(lua_State *L) { \ lua_Number f; \ lua_pushinteger(L, BIT_TRUNCATE(op TOBIT(L, 1, f))); \ --- 4091,4095 ---- #define MONADIC(name, op) \ ! static int bit_ ## name(lua_State *L) { \ lua_Number f; \ lua_pushinteger(L, BIT_TRUNCATE(op TOBIT(L, 1, f))); \ |
|
From: John L. <jr...@us...> - 2008-02-02 16:41:49
|
Update of /cvsroot/wxlua/wxLua/modules/build/msw In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv17989/wxLua/modules/build/msw Modified Files: makefile.bcc makefile.gcc makefile.vc makefile.wat Log Message: Visual C fix for not understanding ULL Update bakefiles Index: makefile.vc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.vc,v retrieving revision 1.89 retrieving revision 1.90 diff -C2 -d -r1.89 -r1.90 *** makefile.vc 31 Jan 2008 04:34:06 -0000 1.89 --- makefile.vc 2 Feb 2008 16:41:43 -0000 1.90 *************** *** 725,729 **** vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_wxlsock.obj \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_wxluasocket_bind.obj \ - vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_wxluasocket.obj \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_wxldebug.obj \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_wxlstack.obj \ --- 725,728 ---- *************** *** 731,736 **** vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_wxlcallb.obj \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_wxlstate.obj \ ! vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_wxlua_bind.obj \ ! vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_wxlua.obj ### Conditionally set variables: ### --- 730,734 ---- vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_wxlcallb.obj \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_wxlstate.obj \ ! vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_wxlua_bind.obj ### Conditionally set variables: ### *************** *** 2429,2435 **** $(CXX) /c /nologo /TP /Fo$@ $(MOD_LUAMODULE_MONO_CXXFLAGS) ..\..\wxluasocket\src\wxluasocket_bind.cpp - vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_wxluasocket.obj: ..\..\wxluasocket\src\wxluasocket.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MOD_LUAMODULE_MONO_CXXFLAGS) ..\..\wxluasocket\src\wxluasocket.cpp - vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_wxldebug.obj: ..\..\wxluadebug\src\wxldebug.cpp $(CXX) /c /nologo /TP /Fo$@ $(MOD_LUAMODULE_MONO_CXXFLAGS) ..\..\wxluadebug\src\wxldebug.cpp --- 2427,2430 ---- *************** *** 2450,2454 **** $(CXX) /c /nologo /TP /Fo$@ $(MOD_LUAMODULE_MONO_CXXFLAGS) ..\..\wxlua\src\wxlua_bind.cpp - vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_wxlua.obj: ..\..\wxlua\src\wxlua.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MOD_LUAMODULE_MONO_CXXFLAGS) ..\..\wxlua\src\wxlua.cpp - --- 2445,2446 ---- Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.bcc,v retrieving revision 1.90 retrieving revision 1.91 diff -C2 -d -r1.90 -r1.91 *** makefile.bcc 31 Jan 2008 04:34:05 -0000 1.90 --- makefile.bcc 2 Feb 2008 16:41:42 -0000 1.91 *************** *** 716,720 **** bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_wxlsock.obj \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_wxluasocket_bind.obj \ - bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_wxluasocket.obj \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_wxldebug.obj \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_wxlstack.obj \ --- 716,719 ---- *************** *** 722,727 **** bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_wxlcallb.obj \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_wxlstate.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_wxlua_bind.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_wxlua.obj ### Conditionally set variables: ### --- 721,725 ---- bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_wxlcallb.obj \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_wxlstate.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_wxlua_bind.obj ### Conditionally set variables: ### *************** *** 2298,2304 **** $(CXX) -q -c -P -o$@ $(MOD_LUAMODULE_MONO_CXXFLAGS) ..\..\wxluasocket\src\wxluasocket_bind.cpp - bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_wxluasocket.obj: ..\..\wxluasocket\src\wxluasocket.cpp - $(CXX) -q -c -P -o$@ $(MOD_LUAMODULE_MONO_CXXFLAGS) ..\..\wxluasocket\src\wxluasocket.cpp - bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_wxldebug.obj: ..\..\wxluadebug\src\wxldebug.cpp $(CXX) -q -c -P -o$@ $(MOD_LUAMODULE_MONO_CXXFLAGS) ..\..\wxluadebug\src\wxldebug.cpp --- 2296,2299 ---- *************** *** 2319,2323 **** $(CXX) -q -c -P -o$@ $(MOD_LUAMODULE_MONO_CXXFLAGS) ..\..\wxlua\src\wxlua_bind.cpp - bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_wxlua.obj: ..\..\wxlua\src\wxlua.cpp - $(CXX) -q -c -P -o$@ $(MOD_LUAMODULE_MONO_CXXFLAGS) ..\..\wxlua\src\wxlua.cpp - --- 2314,2315 ---- Index: makefile.wat =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.wat,v retrieving revision 1.89 retrieving revision 1.90 diff -C2 -d -r1.89 -r1.90 *** makefile.wat 31 Jan 2008 04:34:06 -0000 1.89 --- makefile.wat 2 Feb 2008 16:41:44 -0000 1.90 *************** *** 1252,1256 **** watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_wxlsock.obj & watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_wxluasocket_bind.obj & - watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_wxluasocket.obj & watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_wxldebug.obj & watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_wxlstack.obj & --- 1252,1255 ---- *************** *** 1258,1263 **** watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_wxlcallb.obj & watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_wxlstate.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_wxlua_bind.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_wxlua.obj --- 1257,1261 ---- watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_wxlcallb.obj & watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_wxlstate.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_wxlua_bind.obj *************** *** 2559,2565 **** $(CXX) -bt=nt -zq -fo=$^@ $(MOD_LUAMODULE_MONO_CXXFLAGS) $< - watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_wxluasocket.obj : .AUTODEPEND ..\..\wxluasocket\src\wxluasocket.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MOD_LUAMODULE_MONO_CXXFLAGS) $< - watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_wxldebug.obj : .AUTODEPEND ..\..\wxluadebug\src\wxldebug.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MOD_LUAMODULE_MONO_CXXFLAGS) $< --- 2557,2560 ---- *************** *** 2580,2584 **** $(CXX) -bt=nt -zq -fo=$^@ $(MOD_LUAMODULE_MONO_CXXFLAGS) $< - watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_wxlua.obj : .AUTODEPEND ..\..\wxlua\src\wxlua.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MOD_LUAMODULE_MONO_CXXFLAGS) $< - --- 2575,2576 ---- Index: makefile.gcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.gcc,v retrieving revision 1.89 retrieving revision 1.90 diff -C2 -d -r1.89 -r1.90 *** makefile.gcc 31 Jan 2008 04:34:05 -0000 1.89 --- makefile.gcc 2 Feb 2008 16:41:43 -0000 1.90 *************** *** 565,569 **** gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_wxlsock.o \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_wxluasocket_bind.o \ - gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_wxluasocket.o \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_wxldebug.o \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_wxlstack.o \ --- 565,568 ---- *************** *** 571,576 **** gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_wxlcallb.o \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_wxlstate.o \ ! gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_wxlua_bind.o \ ! gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_wxlua.o ### Conditionally set variables: ### --- 570,574 ---- gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_wxlcallb.o \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_wxlstate.o \ ! gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_wxlua_bind.o ### Conditionally set variables: ### *************** *** 2272,2278 **** $(CXX) -c -o $@ $(MOD_LUAMODULE_MONO_CXXFLAGS) $(CPPDEPS) $< - gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_wxluasocket.o: ../../wxluasocket/src/wxluasocket.cpp - $(CXX) -c -o $@ $(MOD_LUAMODULE_MONO_CXXFLAGS) $(CPPDEPS) $< - gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_wxldebug.o: ../../wxluadebug/src/wxldebug.cpp $(CXX) -c -o $@ $(MOD_LUAMODULE_MONO_CXXFLAGS) $(CPPDEPS) $< --- 2270,2273 ---- *************** *** 2293,2299 **** $(CXX) -c -o $@ $(MOD_LUAMODULE_MONO_CXXFLAGS) $(CPPDEPS) $< - gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_wxlua.o: ../../wxlua/src/wxlua.cpp - $(CXX) -c -o $@ $(MOD_LUAMODULE_MONO_CXXFLAGS) $(CPPDEPS) $< - .PHONY: all clean --- 2288,2291 ---- |
|
From: John L. <jr...@us...> - 2008-02-02 15:57:00
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv1206/wxLua/modules/wxlua/src Modified Files: wxlstate.cpp Log Message: Fix for MSVC6 not understanding ULL Index: wxlstate.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlstate.cpp,v retrieving revision 1.171 retrieving revision 1.172 diff -C2 -d -r1.171 -r1.172 *** wxlstate.cpp 2 Feb 2008 15:39:05 -0000 1.171 --- wxlstate.cpp 2 Feb 2008 15:56:55 -0000 1.172 *************** *** 4019,4023 **** #define BITLIB_FLOAT_MAX 0xfffffffffffffL #define BITLIB_FLOAT_MIN (-0x10000000000000L) ! #define BITLIB_FLOAT_UMAX 0x1fffffffffffffULL /* FIXME: Assume lua_Integer is ptrdiff_t */ --- 4019,4023 ---- #define BITLIB_FLOAT_MAX 0xfffffffffffffL #define BITLIB_FLOAT_MIN (-0x10000000000000L) ! #define BITLIB_FLOAT_UMAX 0x1fffffffffffffUL /* FIXME: Assume lua_Integer is ptrdiff_t */ *************** *** 4087,4091 **** #define MONADIC(name, op) \ ! static int bit_ ## name(lua_State *L) { \ lua_Number f; \ lua_pushinteger(L, BIT_TRUNCATE(op TOBIT(L, 1, f))); \ --- 4087,4091 ---- #define MONADIC(name, op) \ ! static int bit_##name(lua_State *L) { \ lua_Number f; \ lua_pushinteger(L, BIT_TRUNCATE(op TOBIT(L, 1, f))); \ |
|
From: John L. <jr...@us...> - 2008-02-02 15:39:11
|
Update of /cvsroot/wxlua/wxLua/bindings In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv26472/wxLua/bindings Modified Files: genwxbind.bat Log Message: Try to use the lua.exe in the path first Fix bitlib LUALIB_API to use LUACALL Index: genwxbind.bat =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.bat,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** genwxbind.bat 7 Jan 2008 19:11:12 -0000 1.11 --- genwxbind.bat 2 Feb 2008 15:39:05 -0000 1.12 *************** *** 3,9 **** REM The C++ source files are only modified if any changes have been made. REM @echo on ! SET LUA=..\bin\lua.exe REM Find a suitable lua.exe to run IF EXIST ..\bin\gccud_lib\lua.exe SET LUA=..\bin\gccud_lib\lua.exe IF EXIST ..\bin\gccud_dll\lua.exe SET LUA=..\bin\gccud_dll\lua.exe --- 3,11 ---- REM The C++ source files are only modified if any changes have been made. REM @echo on ! SET LUA=lua.exe REM Find a suitable lua.exe to run + IF EXIST ..\bin\lua.exe SET LUA=..\bin\lua.exe + IF EXIST ..\bin\gccud_lib\lua.exe SET LUA=..\bin\gccud_lib\lua.exe IF EXIST ..\bin\gccud_dll\lua.exe SET LUA=..\bin\gccud_dll\lua.exe *************** *** 76,80 **** echo Generating wxLuaCan app Binding cd ..\apps\wxluacan\src ! ..\..\..\bindings\%LUA% -e"rulesFilename=\"wxluacan_rules.lua\"" ../../../bindings/genwxbind.lua cd ..\..\..\bindings --- 78,82 ---- echo Generating wxLuaCan app Binding cd ..\apps\wxluacan\src ! %LUA% -e"rulesFilename=\"wxluacan_rules.lua\"" ../../../bindings/genwxbind.lua cd ..\..\..\bindings |
|
From: John L. <jr...@us...> - 2008-02-02 15:39:11
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv26472/wxLua/modules/wxlua/src Modified Files: wxlstate.cpp Log Message: Try to use the lua.exe in the path first Fix bitlib LUALIB_API to use LUACALL Index: wxlstate.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlstate.cpp,v retrieving revision 1.170 retrieving revision 1.171 diff -C2 -d -r1.170 -r1.171 *** wxlstate.cpp 1 Feb 2008 05:36:38 -0000 1.170 --- wxlstate.cpp 2 Feb 2008 15:39:05 -0000 1.171 *************** *** 4142,4146 **** }; ! LUALIB_API int luaopen_bit (lua_State *L) { luaL_register(L, "bit", bitlib); lua_pushnumber(L, BIT_BITS); --- 4142,4146 ---- }; ! int LUACALL luaopen_bit (lua_State *L) { luaL_register(L, "bit", bitlib); lua_pushnumber(L, BIT_BITS); |
|
From: John L. <jr...@us...> - 2008-02-01 05:36:43
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv15324/wxLua/modules/wxlua/src Modified Files: wxlstate.cpp Log Message: Update bitlib to version 25 Index: wxlstate.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlstate.cpp,v retrieving revision 1.169 retrieving revision 1.170 diff -C2 -d -r1.169 -r1.170 *** wxlstate.cpp 29 Jan 2008 00:49:15 -0000 1.169 --- wxlstate.cpp 1 Feb 2008 05:36:38 -0000 1.170 *************** *** 3994,4002 **** } //----------------------------------------------------------------------------- ! // bitlib release 21 - Bitwise operations library // by Reuben Thomas <rr...@sc...> // http://luaforge.net/projects/bitlib ! // copyright Reuben Thomas 2000-2006, and is released under the MIT license //----------------------------------------------------------------------------- --- 3994,4003 ---- } + //----------------------------------------------------------------------------- ! // bitlib release 25 - Bitwise operations library // by Reuben Thomas <rr...@sc...> // http://luaforge.net/projects/bitlib ! // copyright Reuben Thomas 2000-2008, and is released under the MIT license //----------------------------------------------------------------------------- *************** *** 4005,4054 **** /* Bitwise operations library */ ! /* Reuben Thomas nov00-08dec06 */ ! //#include "lauxlib.h" ! //#include "lua.h" ! //#include <inttypes.h> ! //typedef uintmax_t Integer; ! //typedef intmax_t UInteger; ! typedef long Integer; // FIXME - is this good enough? probably for us ! typedef unsigned long UInteger; ! #define TDYADIC(name, op, type1, type2) \ ! static int bit_ ## name(lua_State* L) { \ ! lua_pushnumber(L, \ ! (type1)luaL_checknumber(L, 1) op (type2)luaL_checknumber(L, 2)); \ ! return 1; \ } ! #define MONADIC(name, op, type) \ ! static int bit_ ## name(lua_State* L) { \ ! lua_pushnumber(L, op (type)luaL_checknumber(L, 1)); \ ! return 1; \ } ! #define VARIADIC(name, op, type) \ ! static int bit_ ## name(lua_State *L) { \ ! int n = lua_gettop(L), i; \ ! Integer w = (type)luaL_checknumber(L, 1); \ ! for (i = 2; i <= n; i++) \ ! w op (type)luaL_checknumber(L, i); \ ! lua_pushnumber(L, w); \ ! return 1; \ } ! MONADIC(bnot, ~, Integer) ! VARIADIC(band, &=, Integer) ! VARIADIC(bor, |=, Integer) ! VARIADIC(bxor, ^=, Integer) ! TDYADIC(lshift, <<, Integer, UInteger) ! TDYADIC(rshift, >>, UInteger, UInteger) ! TDYADIC(arshift, >>, Integer, UInteger) ! TDYADIC(mod, %, Integer, Integer) static const struct luaL_reg bitlib[] = { {"bnot", bit_bnot}, {"band", bit_band}, --- 4006,4134 ---- /* Bitwise operations library */ ! /* (c) Reuben Thomas 2000-2008 */ ! /* See README for license */ ! //#include "config.h" ! //#include <lua.h> ! //#include <lauxlib.h> ! #include <limits.h> ! //#include "bit_limits.h" ! #define BITLIB_FLOAT_BITS 53 ! #define BITLIB_FLOAT_MAX 0xfffffffffffffL ! #define BITLIB_FLOAT_MIN (-0x10000000000000L) ! #define BITLIB_FLOAT_UMAX 0x1fffffffffffffULL ! /* FIXME: Assume lua_Integer is ptrdiff_t */ ! #define LUA_INTEGER_MAX PTRDIFF_MAX ! #define LUA_INTEGER_MIN PTRDIFF_MIN ! #ifndef SIZE_MAX ! #define SIZE_MAX ((size_t)-1) ! #endif ! ! /* FIXME: Assume size_t is an unsigned lua_Integer */ ! typedef size_t lua_UInteger; ! #define LUA_UINTEGER_MAX SIZE_MAX ! ! ! /* Bit type size and limits */ ! ! #define BIT_BITS \ ! (CHAR_BIT * sizeof(lua_Integer) > BITLIB_FLOAT_BITS ? \ ! BITLIB_FLOAT_BITS : (CHAR_BIT * sizeof(lua_Integer))) ! ! /* This code may give warnings if BITLIB_FLOAT_* are too big to fit in ! long, but that doesn't matter since in that case they won't be ! used. */ ! #define BIT_MAX \ ! (CHAR_BIT * sizeof(lua_Integer) > BITLIB_FLOAT_BITS ? BITLIB_FLOAT_MAX : LUA_INTEGER_MAX) ! ! #define BIT_MIN \ ! (CHAR_BIT * sizeof(lua_Integer) > BITLIB_FLOAT_BITS ? BITLIB_FLOAT_MIN : LUA_INTEGER_MIN) ! ! #define BIT_UMAX \ ! (CHAR_BIT * sizeof(lua_Integer) > BITLIB_FLOAT_BITS ? BITLIB_FLOAT_UMAX : LUA_UINTEGER_MAX) ! ! ! #define BUILTIN_CAST ! ! /* Define TOBIT to get a bit value */ ! #ifdef BUILTIN_CAST ! #define TOBIT(L, n, res) \ ! ((void)(res), luaL_checkinteger((L), (n))) ! #else ! #include <stdint.h> ! #include <math.h> ! ! /* FIXME: Assume lua_Number fits in a double (use of fmod). */ ! #define TOBIT(L, n, res) \ ! ((lua_Integer)(((res) = fmod(luaL_checknumber(L, (n)), (double)BIT_UMAX + 1.0)), \ ! (res) > BIT_MAX ? ((res) -= (double)BIT_UMAX, (res) -= 1) : \ ! ((res) < BIT_MIN ? ((res) += (double)BIT_UMAX, (res) += 1) : (res)))) ! #endif ! ! ! #define BIT_TRUNCATE(i) \ ! ((i) & BIT_UMAX) ! ! /* Operations ! ! The macros MONADIC and VARIADIC only deal with bitwise operations. ! ! LOGICAL_SHIFT truncates its left-hand operand before shifting so ! that any extra bits at the most-significant end are not shifted ! into the result. ! ! ARITHMETIC_SHIFT does not truncate its left-hand operand, so that ! the sign bits are not removed and right shift work properly. ! */ ! ! #define MONADIC(name, op) \ ! static int bit_ ## name(lua_State *L) { \ ! lua_Number f; \ ! lua_pushinteger(L, BIT_TRUNCATE(op TOBIT(L, 1, f))); \ ! return 1; \ } ! #define VARIADIC(name, op) \ ! static int bit_ ## name(lua_State *L) { \ ! lua_Number f; \ ! int n = lua_gettop(L), i; \ ! lua_Integer w = TOBIT(L, 1, f); \ ! for (i = 2; i <= n; i++) \ ! w op TOBIT(L, i, f); \ ! lua_pushinteger(L, BIT_TRUNCATE(w)); \ ! return 1; \ } ! #define LOGICAL_SHIFT(name, op) \ ! static int bit_ ## name(lua_State *L) { \ ! lua_Number f; \ ! lua_pushinteger(L, BIT_TRUNCATE(BIT_TRUNCATE((lua_UInteger)TOBIT(L, 1, f)) op \ ! (unsigned)luaL_checknumber(L, 2))); \ ! return 1; \ } ! #define ARITHMETIC_SHIFT(name, op) \ ! static int bit_ ## name(lua_State *L) { \ ! lua_Number f; \ ! lua_pushinteger(L, BIT_TRUNCATE((lua_Integer)TOBIT(L, 1, f) op \ ! (unsigned)luaL_checknumber(L, 2))); \ ! return 1; \ ! } ! ! MONADIC(cast, +) ! MONADIC(bnot, ~) ! VARIADIC(band, &=) ! VARIADIC(bor, |=) ! VARIADIC(bxor, ^=) ! ARITHMETIC_SHIFT(lshift, <<) ! LOGICAL_SHIFT(rshift, >>) ! ARITHMETIC_SHIFT(arshift, >>) static const struct luaL_reg bitlib[] = { + {"cast", bit_cast}, {"bnot", bit_bnot}, {"band", bit_band}, *************** *** 4058,4067 **** {"rshift", bit_rshift}, {"arshift", bit_arshift}, ! {"mod", bit_mod}, {NULL, NULL} }; ! int LUACALL luaopen_bit (lua_State *L) { ! luaL_openlib(L, "bit", bitlib, 0); return 1; } --- 4138,4149 ---- {"rshift", bit_rshift}, {"arshift", bit_arshift}, ! {NULL, NULL} }; ! LUALIB_API int luaopen_bit (lua_State *L) { ! luaL_register(L, "bit", bitlib); ! lua_pushnumber(L, BIT_BITS); ! lua_setfield(L, -2, "bits"); return 1; } |
|
From: John L. <jr...@us...> - 2008-02-01 05:36:43
|
Update of /cvsroot/wxlua/wxLua/docs In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv15324/wxLua/docs Modified Files: changelog.txt Log Message: Update bitlib to version 25 Index: changelog.txt =================================================================== RCS file: /cvsroot/wxlua/wxLua/docs/changelog.txt,v retrieving revision 1.61 retrieving revision 1.62 diff -C2 -d -r1.61 -r1.62 *** changelog.txt 25 Jan 2008 23:50:49 -0000 1.61 --- changelog.txt 1 Feb 2008 05:36:38 -0000 1.62 *************** *** 152,155 **** --- 152,157 ---- declaration and implementation source code. + - Updated bitlib to version 25. + version 2.8.4.2 -------------------------------------------------------------------- |
|
From: John L. <jr...@us...> - 2008-02-01 05:36:42
|
Update of /cvsroot/wxlua/wxLua/samples In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv15324/wxLua/samples Modified Files: unittest.wx.lua Log Message: Update bitlib to version 25 Index: unittest.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/unittest.wx.lua,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** unittest.wx.lua 23 Jan 2008 06:43:40 -0000 1.22 --- unittest.wx.lua 1 Feb 2008 05:36:39 -0000 1.23 *************** *** 346,350 **** PrintOk(bit.rshift(0x2, 1) == 1, "Test bit library bit.rshift.") PrintOk(bit.arshift(-2, 1) == -1, "Test bit library bit.arshift. Note, this preserves sign") - PrintOk(bit.mod(7, 2) == 1, "Test bit library bit.mod.") -- --------------------------------------------------------------------------- --- 346,349 ---- |
|
From: John L. <jr...@us...> - 2008-01-31 05:09:23
|
Update of /cvsroot/wxlua/wxLua/bindings/wxlua In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv1826/wxLua/bindings/wxlua Modified Files: override.hpp wxlua.i Log Message: Add functions to check if objects are gc, tracked, or refed in Lua. Index: wxlua.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxlua/wxlua.i,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** wxlua.i 26 Jan 2008 23:27:25 -0000 1.17 --- wxlua.i 31 Jan 2008 05:09:19 -0000 1.18 *************** *** 53,56 **** --- 53,65 ---- %function LuaTable GetTrackedWinDestroyCallbackInfo(bool as_string = false) + // Is the wxLua userdata object on the list to be garbage collected by Lua? + %function bool isgcobject(void* object) + + // Is the wxLua userdata object on the list of tracked objects? + %function bool istrackedobject(void* object) + + // Is the wxLua object refed by wxLua + %function bool isrefed(void* object) + // --------------------------------------------------------------------------- // Type information about the bindings or current userdata *************** *** 228,232 **** int RunString(const wxString &script, const wxString& name = "") bool IsRunning() const - */ %endclass --- 237,240 ---- Index: override.hpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxlua/override.hpp,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** override.hpp 24 Jan 2008 00:18:15 -0000 1.19 --- override.hpp 31 Jan 2008 05:09:19 -0000 1.20 *************** *** 103,106 **** --- 103,152 ---- %end + %override wxLua_function_isgcobject + // %function bool isgcobject(void* object) + static int LUACALL wxLua_function_isgcobject(lua_State *L) + { + bool ret = false; + if (wxlua_iswxuserdatatype(wxluaT_type(L, 1))) + { + void* obj_ptr = wxlua_touserdata(L, 1, false); + ret = wxluaO_isgcobject(L, obj_ptr); + } + + lua_pushboolean(L, ret); + return 1; + } + %end + + %override wxLua_function_istrackedobject + // %function bool istrackedobject(void* object) + static int LUACALL wxLua_function_istrackedobject(lua_State *L) + { + bool ret = false; + int wxl_type = wxluaT_type(L, 1); + + if (wxlua_iswxuserdatatype(wxl_type)) + { + void* obj_ptr = wxlua_touserdata(L, 1, false); + ret = wxluaO_istrackedweakobject(L, obj_ptr, wxl_type, false); + } + + lua_pushboolean(L, ret); + return 1; + } + %end + + %override wxLua_function_isrefed + // %function bool isrefed(void* object) + static int LUACALL wxLua_function_isrefed(lua_State *L) + { + bool ret = wxluaR_isrefed(L, 1, &wxlua_lreg_refs_key) != LUA_NOREF; + + lua_pushboolean(L, ret); + return 1; + } + %end + + %override wxLua_function_type // %function int type(int wxluaarg_tag) |
|
From: John L. <jr...@us...> - 2008-01-31 05:09:23
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv1826/wxLua/modules/wxlua/src Modified Files: wxlua_bind.cpp Log Message: Add functions to check if objects are gc, tracked, or refed in Lua. Index: wxlua_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlua_bind.cpp,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** wxlua_bind.cpp 29 Jan 2008 04:22:54 -0000 1.27 --- wxlua_bind.cpp 31 Jan 2008 05:09:19 -0000 1.28 *************** *** 930,933 **** --- 930,984 ---- static wxLuaBindCFunc s_wxluafunc_wxLua_function_GetTrackedWindowInfo[1] = {{ wxLua_function_GetTrackedWindowInfo, WXLUAMETHOD_CFUNCTION, 0, 1, s_wxluatypeArray_wxLua_function_GetTrackedWindowInfo }}; + static wxLuaArgType s_wxluatypeArray_wxLua_function_isgcobject[] = { &wxluatype_TLIGHTUSERDATA, NULL }; + // %override wxLua_function_isgcobject + // %function bool isgcobject(void* object) + static int LUACALL wxLua_function_isgcobject(lua_State *L) + { + bool ret = false; + if (wxlua_iswxuserdatatype(wxluaT_type(L, 1))) + { + void* obj_ptr = wxlua_touserdata(L, 1, false); + ret = wxluaO_isgcobject(L, obj_ptr); + } + + lua_pushboolean(L, ret); + return 1; + } + + static wxLuaBindCFunc s_wxluafunc_wxLua_function_isgcobject[1] = {{ wxLua_function_isgcobject, WXLUAMETHOD_CFUNCTION, 1, 1, s_wxluatypeArray_wxLua_function_isgcobject }}; + + static wxLuaArgType s_wxluatypeArray_wxLua_function_isrefed[] = { &wxluatype_TLIGHTUSERDATA, NULL }; + // %override wxLua_function_isrefed + // %function bool isrefed(void* object) + static int LUACALL wxLua_function_isrefed(lua_State *L) + { + bool ret = wxluaR_isrefed(L, 1, &wxlua_lreg_refs_key) != LUA_NOREF; + + lua_pushboolean(L, ret); + return 1; + } + + static wxLuaBindCFunc s_wxluafunc_wxLua_function_isrefed[1] = {{ wxLua_function_isrefed, WXLUAMETHOD_CFUNCTION, 1, 1, s_wxluatypeArray_wxLua_function_isrefed }}; + + static wxLuaArgType s_wxluatypeArray_wxLua_function_istrackedobject[] = { &wxluatype_TLIGHTUSERDATA, NULL }; + // %override wxLua_function_istrackedobject + // %function bool istrackedobject(void* object) + static int LUACALL wxLua_function_istrackedobject(lua_State *L) + { + bool ret = false; + int wxl_type = wxluaT_type(L, 1); + + if (wxlua_iswxuserdatatype(wxl_type)) + { + void* obj_ptr = wxlua_touserdata(L, 1, false); + ret = wxluaO_istrackedweakobject(L, obj_ptr, wxl_type, false); + } + + lua_pushboolean(L, ret); + return 1; + } + + static wxLuaBindCFunc s_wxluafunc_wxLua_function_istrackedobject[1] = {{ wxLua_function_istrackedobject, WXLUAMETHOD_CFUNCTION, 1, 1, s_wxluatypeArray_wxLua_function_istrackedobject }}; + static wxLuaArgType s_wxluatypeArray_wxLua_function_iswxluatype[] = { &wxluatype_TNUMBER, &wxluatype_TNUMBER, NULL }; // %rename iswxluatype %function int wxlua_iswxluatype(int luatype, int wxluaarg_tag) *************** *** 1042,1045 **** --- 1093,1099 ---- { "GetTrackedWinDestroyCallbackInfo", WXLUAMETHOD_CFUNCTION, s_wxluafunc_wxLua_function_GetTrackedWinDestroyCallbackInfo, 1, NULL }, { "GetTrackedWindowInfo", WXLUAMETHOD_CFUNCTION, s_wxluafunc_wxLua_function_GetTrackedWindowInfo, 1, NULL }, + { "isgcobject", WXLUAMETHOD_CFUNCTION, s_wxluafunc_wxLua_function_isgcobject, 1, NULL }, + { "isrefed", WXLUAMETHOD_CFUNCTION, s_wxluafunc_wxLua_function_isrefed, 1, NULL }, + { "istrackedobject", WXLUAMETHOD_CFUNCTION, s_wxluafunc_wxLua_function_istrackedobject, 1, NULL }, { "iswxluatype", WXLUAMETHOD_CFUNCTION, s_wxluafunc_wxLua_function_iswxluatype, 1, NULL }, { "type", WXLUAMETHOD_CFUNCTION, s_wxluafunc_wxLua_function_type, 1, NULL }, |
|
From: John L. <jr...@us...> - 2008-01-31 05:09:22
|
Update of /cvsroot/wxlua/wxLua/docs In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv1826/wxLua/docs Modified Files: wxluaref.html Log Message: Add functions to check if objects are gc, tracked, or refed in Lua. Index: wxluaref.html =================================================================== RCS file: /cvsroot/wxlua/wxLua/docs/wxluaref.html,v retrieving revision 1.49 retrieving revision 1.50 diff -C2 -d -r1.49 -r1.50 *** wxluaref.html 31 Jan 2008 04:34:03 -0000 1.49 --- wxluaref.html 31 Jan 2008 05:09:19 -0000 1.50 *************** *** 24854,24857 **** --- 24854,24866 ---- <font color=#AA0000><i>%function</i> LuaTable GetTrackedWinDestroyCallbackInfo(bool as_string = false)</font><br> <br> + <font color=#009900>// Is the wxLua userdata object on the list to be garbage collected by Lua?</font><br> + <font color=#AA0000><i>%function</i> bool isgcobject(void* object)</font><br> + <br> + <font color=#009900>// Is the wxLua userdata object on the list of tracked objects?</font><br> + <font color=#AA0000><i>%function</i> bool istrackedobject(void* object)</font><br> + <br> + <font color=#009900>// Is the wxLua object refed by wxLua</font><br> + <font color=#AA0000><i>%function</i> bool isrefed(void* object)</font><br> + <br> <font color=#009900>// ---------------------------------------------------------------------------</font><br> <font color=#009900>// Type information about the bindings or current userdata</font><br> *************** *** 25036,25040 **** int RunString(const <a href="#wxString">wxString</a> &script, const <a href="#wxString">wxString</a>& name = "")<br> bool IsRunning() const<br> - <br> */</font><br> </blockquote><font color=#DD0000><font color=#DD0000><i>%endclass</i></font></font><br> --- 25045,25048 ---- |
|
From: John L. <jr...@us...> - 2008-01-31 04:34:38
|
Update of /cvsroot/wxlua/wxLua/modules/build/msvc8 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv20345/wxLua/modules/build/msvc8 Modified Files: modules_mod_luamodule_mono.vcproj modules_mod_wxbindadv.vcproj Log Message: Added wxLuaGridTableBase and it's sample gridtable.wx.lua. Thanks to Hakki Dogusan. Index: modules_mod_luamodule_mono.vcproj =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msvc8/modules_mod_luamodule_mono.vcproj,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** modules_mod_luamodule_mono.vcproj 29 Jan 2008 01:38:57 -0000 1.8 --- modules_mod_luamodule_mono.vcproj 31 Jan 2008 04:34:05 -0000 1.9 *************** *** 819,822 **** --- 819,825 ---- /> <File + RelativePath="..\..\wxbind\src\wxadv_wxladv.cpp" + /> + <File RelativePath="..\..\wxbind\src\wxaui_bind.cpp" /> Index: modules_mod_wxbindadv.vcproj =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msvc8/modules_mod_wxbindadv.vcproj,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** modules_mod_wxbindadv.vcproj 29 Jan 2008 01:38:57 -0000 1.9 --- modules_mod_wxbindadv.vcproj 31 Jan 2008 04:34:05 -0000 1.10 *************** *** 1538,1541 **** --- 1538,1544 ---- RelativePath="..\..\wxbind\src\wxadv_bind.cpp" /> + <File + RelativePath="..\..\wxbind\src\wxadv_wxladv.cpp" + /> </Filter> <Filter *************** *** 1546,1549 **** --- 1549,1555 ---- RelativePath="..\..\wxbind\include\wxadv_bind.h" /> + <File + RelativePath="..\..\wxbind\include\wxadv_wxladv.h" + /> </Filter> </Files> |
|
From: John L. <jr...@us...> - 2008-01-31 04:34:38
|
Update of /cvsroot/wxlua/wxLua/modules/build/msvc6 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv20345/wxLua/modules/build/msvc6 Modified Files: modules_mod_luamodule_mono.dsp modules_mod_wxbindadv.dsp Log Message: Added wxLuaGridTableBase and it's sample gridtable.wx.lua. Thanks to Hakki Dogusan. Index: modules_mod_wxbindadv.dsp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msvc6/modules_mod_wxbindadv.dsp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** modules_mod_wxbindadv.dsp 29 Jan 2008 01:38:56 -0000 1.9 --- modules_mod_wxbindadv.dsp 31 Jan 2008 04:34:05 -0000 1.10 *************** *** 461,464 **** --- 461,468 ---- SOURCE=..\..\wxbind\src\wxadv_bind.cpp # End Source File + # Begin Source File + + SOURCE=..\..\wxbind\src\wxadv_wxladv.cpp + # End Source File # End Group # Begin Group "WXBINDADV headers" *************** *** 469,472 **** --- 473,480 ---- SOURCE=..\..\wxbind\include\wxadv_bind.h # End Source File + # Begin Source File + + SOURCE=..\..\wxbind\include\wxadv_wxladv.h + # End Source File # End Group # End Target Index: modules_mod_luamodule_mono.dsp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msvc6/modules_mod_luamodule_mono.dsp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** modules_mod_luamodule_mono.dsp 29 Jan 2008 01:38:56 -0000 1.8 --- modules_mod_luamodule_mono.dsp 31 Jan 2008 04:34:05 -0000 1.9 *************** *** 267,270 **** --- 267,274 ---- # Begin Source File + SOURCE=..\..\wxbind\src\wxadv_wxladv.cpp + # End Source File + # Begin Source File + SOURCE=..\..\wxbind\src\wxaui_bind.cpp # End Source File |
|
From: John L. <jr...@us...> - 2008-01-31 04:34:38
|
Update of /cvsroot/wxlua/wxLua/modules In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv20345/wxLua/modules Modified Files: Makefile.in Log Message: Added wxLuaGridTableBase and it's sample gridtable.wx.lua. Thanks to Hakki Dogusan. Index: Makefile.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/Makefile.in,v retrieving revision 1.74 retrieving revision 1.75 diff -C2 -d -r1.74 -r1.75 *** Makefile.in 29 Jan 2008 01:38:56 -0000 1.74 --- Makefile.in 31 Jan 2008 04:34:04 -0000 1.75 *************** *** 165,171 **** WXBINDADV_LIB_OBJECTS = \ wxbindadv_lib_wxadv_bind.o \ wxbindadv_lib_dummy.o WXBINDADV_LIB_HEADERS = \ ! wxbind/include/wxadv_bind.h WXBINDADV_LIB_ODEP = \ $(___pch_wxprec_wxbindadv_lib_wx_wxprec_h_gch___depname) --- 165,173 ---- WXBINDADV_LIB_OBJECTS = \ wxbindadv_lib_wxadv_bind.o \ + wxbindadv_lib_wxadv_wxladv.o \ wxbindadv_lib_dummy.o WXBINDADV_LIB_HEADERS = \ ! wxbind/include/wxadv_bind.h \ ! wxbind/include/wxadv_wxladv.h WXBINDADV_LIB_ODEP = \ $(___pch_wxprec_wxbindadv_lib_wx_wxprec_h_gch___depname) *************** *** 176,182 **** WXBINDADV_DLL_OBJECTS = \ wxbindadv_dll_wxadv_bind.o \ wxbindadv_dll_dummy.o WXBINDADV_DLL_HEADERS = \ ! wxbind/include/wxadv_bind.h WXBINDADV_DLL_ODEP = \ $(___pch_wxprec_wxbindadv_dll_wx_wxprec_h_gch___depname) --- 178,186 ---- WXBINDADV_DLL_OBJECTS = \ wxbindadv_dll_wxadv_bind.o \ + wxbindadv_dll_wxadv_wxladv.o \ wxbindadv_dll_dummy.o WXBINDADV_DLL_HEADERS = \ ! wxbind/include/wxadv_bind.h \ ! wxbind/include/wxadv_wxladv.h WXBINDADV_DLL_ODEP = \ $(___pch_wxprec_wxbindadv_dll_wx_wxprec_h_gch___depname) *************** *** 558,561 **** --- 562,566 ---- mod_luamodule_mono_dummy.o \ mod_luamodule_mono_wxadv_bind.o \ + mod_luamodule_mono_wxadv_wxladv.o \ mod_luamodule_mono_wxaui_bind.o \ mod_luamodule_mono_wxbase_base.o \ *************** *** 2858,2862 **** @COND_INSTALL_CUSTOM_WXBIND_1@wxbindsrc: @COND_INSTALL_CUSTOM_WXBIND_1@ @mkdir -p $(DESTDIR)$(prefix)/src/wxbind ! @COND_INSTALL_CUSTOM_WXBIND_1@ @for f in wxbind/src/dummy.cpp wxbind/src/wxadv_bind.cpp wxbind/src/wxaui_bind.cpp wxbind/src/wxbase_base.cpp wxbind/src/wxbase_bind.cpp wxbind/src/wxbase_config.cpp wxbind/src/wxbase_data.cpp wxbind/src/wxbase_datetime.cpp wxbind/src/wxbase_file.cpp wxbind/src/wxcore_appframe.cpp wxbind/src/wxcore_bind.cpp wxbind/src/wxcore_clipdrag.cpp wxbind/src/wxcore_controls.cpp wxbind/src/wxcore_core.cpp wxbind/src/wxcore_defsutils.cpp wxbind/src/wxcore_dialogs.cpp wxbind/src/wxcore_event.cpp wxbind/src/wxcore_gdi.cpp wxbind/src/wxcore_geometry.cpp wxbind/src/wxcore_help.cpp wxbind/src/wxcore_image.cpp wxbind/src/wxcore_mdi.cpp wxbind/src/wxcore_menutool.cpp wxbind/src/wxcore_picker.cpp wxbind/src/wxcore_print.cpp wxbind/src/wxcore_sizer.cpp wxbind/src/wxcore_windows.cpp wxbind/src/wxcore_wxlcore.cpp wxbind/src/wxgl_bind.cpp wxbind/src/wxhtml_bind.cpp wxbind/src/wxhtml_wxlhtml.cpp wxbind/src/wxmedia_bind.cpp wxbind/src/wxnet_bind.cpp wxbind/src/wxrichtext_bind.cpp wxbind/src/wxstc_bind.cpp wxbind/src/wxxml_bind.cpp wxbind/src/wxxrc_bind.cpp; do \ @COND_INSTALL_CUSTOM_WXBIND_1@ if test ! -f $(DESTDIR)$(prefix)/src/wxbind/$$f -a ! -d $(DESTDIR)$(prefix)/src/wxbind/$$f ; \ @COND_INSTALL_CUSTOM_WXBIND_1@ then x=yep ; \ --- 2863,2867 ---- @COND_INSTALL_CUSTOM_WXBIND_1@wxbindsrc: @COND_INSTALL_CUSTOM_WXBIND_1@ @mkdir -p $(DESTDIR)$(prefix)/src/wxbind ! @COND_INSTALL_CUSTOM_WXBIND_1@ @for f in wxbind/src/dummy.cpp wxbind/src/wxadv_bind.cpp wxbind/src/wxadv_wxladv.cpp wxbind/src/wxaui_bind.cpp wxbind/src/wxbase_base.cpp wxbind/src/wxbase_bind.cpp wxbind/src/wxbase_config.cpp wxbind/src/wxbase_data.cpp wxbind/src/wxbase_datetime.cpp wxbind/src/wxbase_file.cpp wxbind/src/wxcore_appframe.cpp wxbind/src/wxcore_bind.cpp wxbind/src/wxcore_clipdrag.cpp wxbind/src/wxcore_controls.cpp wxbind/src/wxcore_core.cpp wxbind/src/wxcore_defsutils.cpp wxbind/src/wxcore_dialogs.cpp wxbind/src/wxcore_event.cpp wxbind/src/wxcore_gdi.cpp wxbind/src/wxcore_geometry.cpp wxbind/src/wxcore_help.cpp wxbind/src/wxcore_image.cpp wxbind/src/wxcore_mdi.cpp wxbind/src/wxcore_menutool.cpp wxbind/src/wxcore_picker.cpp wxbind/src/wxcore_print.cpp wxbind/src/wxcore_sizer.cpp wxbind/src/wxcore_windows.cpp wxbind/src/wxcore_wxlcore.cpp wxbind/src/wxgl_bind.cpp wxbind/src/wxhtml_bind.cpp wxbind/src/wxhtml_wxlhtml.cpp wxbind/src/wxmedia_bind.cpp wxbind/src/wxnet_bind.cpp wxbind/src/wxrichtext_bind.cpp wxbind/src/wxstc_bind.cpp wxbind/src/wxxml_bind.cpp wxbind/src/wxxrc_bind.cpp; do \ @COND_INSTALL_CUSTOM_WXBIND_1@ if test ! -f $(DESTDIR)$(prefix)/src/wxbind/$$f -a ! -d $(DESTDIR)$(prefix)/src/wxbind/$$f ; \ @COND_INSTALL_CUSTOM_WXBIND_1@ then x=yep ; \ *************** *** 3099,3102 **** --- 3104,3110 ---- $(CXXC) -c -o $@ $(WXBINDADV_LIB_CXXFLAGS) $(srcdir)/wxbind/src/wxadv_bind.cpp + wxbindadv_lib_wxadv_wxladv.o: $(srcdir)/wxbind/src/wxadv_wxladv.cpp $(WXBINDADV_LIB_ODEP) + $(CXXC) -c -o $@ $(WXBINDADV_LIB_CXXFLAGS) $(srcdir)/wxbind/src/wxadv_wxladv.cpp + wxbindadv_lib_dummy.o: $(srcdir)/wxbind/src/dummy.cpp $(WXBINDADV_LIB_ODEP) $(CXXC) -c -o $@ $(WXBINDADV_LIB_CXXFLAGS) $(srcdir)/wxbind/src/dummy.cpp *************** *** 3105,3108 **** --- 3113,3119 ---- $(CXXC) -c -o $@ $(WXBINDADV_DLL_CXXFLAGS) $(srcdir)/wxbind/src/wxadv_bind.cpp + wxbindadv_dll_wxadv_wxladv.o: $(srcdir)/wxbind/src/wxadv_wxladv.cpp $(WXBINDADV_DLL_ODEP) + $(CXXC) -c -o $@ $(WXBINDADV_DLL_CXXFLAGS) $(srcdir)/wxbind/src/wxadv_wxladv.cpp + wxbindadv_dll_dummy.o: $(srcdir)/wxbind/src/dummy.cpp $(WXBINDADV_DLL_ODEP) $(CXXC) -c -o $@ $(WXBINDADV_DLL_CXXFLAGS) $(srcdir)/wxbind/src/dummy.cpp *************** *** 3444,3447 **** --- 3455,3461 ---- $(CXXC) -c -o $@ $(MOD_LUAMODULE_MONO_CXXFLAGS) $(srcdir)/wxbind/src/wxadv_bind.cpp + mod_luamodule_mono_wxadv_wxladv.o: $(srcdir)/wxbind/src/wxadv_wxladv.cpp $(MOD_LUAMODULE_MONO_ODEP) + $(CXXC) -c -o $@ $(MOD_LUAMODULE_MONO_CXXFLAGS) $(srcdir)/wxbind/src/wxadv_wxladv.cpp + mod_luamodule_mono_wxaui_bind.o: $(srcdir)/wxbind/src/wxaui_bind.cpp $(MOD_LUAMODULE_MONO_ODEP) $(CXXC) -c -o $@ $(MOD_LUAMODULE_MONO_CXXFLAGS) $(srcdir)/wxbind/src/wxaui_bind.cpp |
|
From: John L. <jr...@us...> - 2008-01-31 04:34:37
|
Update of /cvsroot/wxlua/wxLua/docs In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv20345/wxLua/docs Modified Files: wxluaref.html Log Message: Added wxLuaGridTableBase and it's sample gridtable.wx.lua. Thanks to Hakki Dogusan. Index: wxluaref.html =================================================================== RCS file: /cvsroot/wxlua/wxLua/docs/wxluaref.html,v retrieving revision 1.48 retrieving revision 1.49 diff -C2 -d -r1.48 -r1.49 *** wxluaref.html 24 Jan 2008 04:53:48 -0000 1.48 --- wxluaref.html 31 Jan 2008 04:34:03 -0000 1.49 *************** *** 8,12 **** <body> ! <h1>wxLua 2.8.4.0 Reference Manual for wxWidgets 2.8.7</h1> <h2>Classes</h2> --- 8,12 ---- <body> ! <h1>wxLua 2.8.7.0 Reference Manual for wxWidgets 2.8.7</h1> [...1096 lines suppressed...] <font color=#009900>//void StopParsing()</font><br> </blockquote><font color=#DD0000><font color=#DD0000><i>%endclass</i></font></font><br> --- 21237,21245 ---- <font color=#009900>//<a href="#wxString">wxString</a>* GetSource()</font><br> void InitParser(const <a href="#wxString">wxString</a>& source)<br> ! <font color=#009900>//virtual <a href="#wxFSFile">wxFSFile</a>* OpenURL(wxHtmlURLType type, const <a href="#wxString">wxString</a>& url)</font><br> <font color=#009900>//<a href="#wxObject">wxObject</a>* Parse(const <a href="#wxString">wxString</a>& source)</font><br> <font color=#009900>//void PushTagHandler(wxHtmlTagHandler* handler, <a href="#wxString">wxString</a> tags)</font><br> <font color=#009900>//void PopTagHandler()</font><br> ! <font color=#009900>//void SetFS(<a href="#wxFileSystem">wxFileSystem</a> *fs)</font><br> <font color=#009900>//void StopParsing()</font><br> </blockquote><font color=#DD0000><font color=#DD0000><i>%endclass</i></font></font><br> *************** *** 24551,24555 **** <font color=#006666><i>%define</i> WXLUA_TINTEGER</font><br> <font color=#006666><i>%define</i> WXLUA_TCFUNCTION</font><br> - <font color=#006666><i>%define</i> WXLUA_TNULL</font><br> <br> <font color=#006666><i>%define</i> WXLUA_T_MAX</font><br> --- 24890,24893 ---- |
|
From: John L. <jr...@us...> - 2008-01-31 04:34:37
|
Update of /cvsroot/wxlua/wxLua/bindings In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv20345/wxLua/bindings Modified Files: genwxbind.lua Log Message: Added wxLuaGridTableBase and it's sample gridtable.wx.lua. Thanks to Hakki Dogusan. Index: genwxbind.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.lua,v retrieving revision 1.165 retrieving revision 1.166 diff -C2 -d -r1.165 -r1.166 *** genwxbind.lua 29 Jan 2008 04:22:51 -0000 1.165 --- genwxbind.lua 31 Jan 2008 04:34:02 -0000 1.166 *************** *** 2729,2732 **** --- 2729,2737 ---- } + if (parseObject.Name == "wxGridCellWorker") or (parseObject.Name == "wxGridCellEditor") or + (parseObject.Name == "wxGridCellAttr") then + encapsulationBinding.Implementation = "wxLUA_IMPLEMENT_wxGridCellWorker_ENCAPSULATION("..parseObject.Name..", "..MakeVar(parseObject.Name)..")\n" + end + if not encapsulationBindingTable[encapcondition] then encapsulationBindingTable[encapcondition] = {} |
|
From: John L. <jr...@us...> - 2008-01-31 04:34:37
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv20345/wxLua/bindings/wxwidgets Modified Files: wx_datatypes.lua wxadv_grid.i wxadv_override.hpp Log Message: Added wxLuaGridTableBase and it's sample gridtable.wx.lua. Thanks to Hakki Dogusan. Index: wx_datatypes.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wx_datatypes.lua,v retrieving revision 1.92 retrieving revision 1.93 diff -C2 -d -r1.92 -r1.93 *** wx_datatypes.lua 29 Jan 2008 00:49:10 -0000 1.92 --- wx_datatypes.lua 31 Jan 2008 04:34:02 -0000 1.93 *************** *** 1755,1758 **** --- 1755,1759 ---- }, wxGridCellAttr = { + ["%encapsulate"] = true, BaseClass = "wxClientDataContainer", Condition = "wxLUA_USE_wxGrid && wxUSE_GRID", *************** *** 1768,1771 **** --- 1769,1773 ---- }, wxGridCellAttrProvider = { + ["%encapsulate"] = true, BaseClass = "wxClientDataContainer", Condition = "wxLUA_USE_wxGrid && wxUSE_GRID", *************** *** 1775,1778 **** --- 1777,1781 ---- }, wxGridCellAutoWrapStringEditor = { + ["%encapsulate"] = true, BaseClass = "wxGridCellTextEditor", Condition = "wxLUA_USE_wxGrid && wxUSE_GRID", *************** *** 1782,1785 **** --- 1785,1789 ---- }, wxGridCellAutoWrapStringRenderer = { + ["%encapsulate"] = true, BaseClass = "wxGridCellStringRenderer", Condition = "wxLUA_USE_wxGrid && wxUSE_GRID", *************** *** 1789,1792 **** --- 1793,1797 ---- }, wxGridCellBoolEditor = { + ["%encapsulate"] = true, BaseClass = "wxGridCellEditor", Condition = "wxLUA_USE_wxGrid && wxUSE_GRID", *************** *** 1796,1799 **** --- 1801,1805 ---- }, wxGridCellBoolRenderer = { + ["%encapsulate"] = true, BaseClass = "wxGridCellRenderer", Condition = "wxLUA_USE_wxGrid && wxUSE_GRID", *************** *** 1803,1806 **** --- 1809,1813 ---- }, wxGridCellChoiceEditor = { + ["%encapsulate"] = true, BaseClass = "wxGridCellEditor", Condition = "wxLUA_USE_wxGrid && wxUSE_GRID", *************** *** 1817,1820 **** --- 1824,1828 ---- }, wxGridCellDateTimeRenderer = { + ["%encapsulate"] = true, BaseClass = "wxGridCellStringRenderer", Condition = "wxLUA_USE_wxGrid && wxUSE_GRID", *************** *** 1824,1827 **** --- 1832,1836 ---- }, wxGridCellEditor = { + ["%encapsulate"] = true, BaseClass = "wxGridCellWorker", Condition = "wxLUA_USE_wxGrid && wxUSE_GRID", *************** *** 1831,1834 **** --- 1840,1844 ---- }, wxGridCellEnumEditor = { + ["%encapsulate"] = true, BaseClass = "wxGridCellChoiceEditor", Condition = "wxLUA_USE_wxGrid && wxUSE_GRID", *************** *** 1838,1841 **** --- 1848,1852 ---- }, wxGridCellEnumRenderer = { + ["%encapsulate"] = true, BaseClass = "wxGridCellStringRenderer", Condition = "wxLUA_USE_wxGrid && wxUSE_GRID", *************** *** 1845,1848 **** --- 1856,1860 ---- }, wxGridCellFloatEditor = { + ["%encapsulate"] = true, BaseClass = "wxGridCellTextEditor", Condition = "wxLUA_USE_wxGrid && wxUSE_GRID", *************** *** 1852,1855 **** --- 1864,1868 ---- }, wxGridCellFloatRenderer = { + ["%encapsulate"] = true, BaseClass = "wxGridCellStringRenderer", Condition = "wxLUA_USE_wxGrid && wxUSE_GRID", *************** *** 1859,1862 **** --- 1872,1876 ---- }, wxGridCellNumberEditor = { + ["%encapsulate"] = true, BaseClass = "wxGridCellTextEditor", Condition = "wxLUA_USE_wxGrid && wxUSE_GRID", *************** *** 1866,1869 **** --- 1880,1884 ---- }, wxGridCellNumberRenderer = { + ["%encapsulate"] = true, BaseClass = "wxGridCellStringRenderer", Condition = "wxLUA_USE_wxGrid && wxUSE_GRID", *************** *** 1873,1876 **** --- 1888,1892 ---- }, wxGridCellRenderer = { + ["%encapsulate"] = true, BaseClass = "wxGridCellWorker", Condition = "wxLUA_USE_wxGrid && wxUSE_GRID", *************** *** 1880,1883 **** --- 1896,1900 ---- }, wxGridCellStringRenderer = { + ["%encapsulate"] = true, BaseClass = "wxGridCellRenderer", Condition = "wxLUA_USE_wxGrid && wxUSE_GRID", *************** *** 1887,1890 **** --- 1904,1908 ---- }, wxGridCellTextEditor = { + ["%encapsulate"] = true, BaseClass = "wxGridCellEditor", Condition = "wxLUA_USE_wxGrid && wxUSE_GRID", *************** *** 1894,1897 **** --- 1912,1916 ---- }, wxGridCellWorker = { + ["%encapsulate"] = true, BaseClass = "wxClientDataContainer", Condition = "wxLUA_USE_wxGrid && wxUSE_GRID", *************** *** 2606,2609 **** --- 2625,2635 ---- ValueType = "class", }, + wxLuaGridTableBase = { + BaseClass = "wxGridTableBase", + Condition = "wxLUA_USE_wxGrid && wxUSE_GRID", + IsNumber = false, + Name = "wxLuaGridTableBase", + ValueType = "class", + }, wxLuaHtmlWinTagEvent = { BaseClass = "wxEvent", Index: wxadv_grid.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxadv_grid.i,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** wxadv_grid.i 16 Jul 2007 19:34:23 -0000 1.1 --- wxadv_grid.i 31 Jan 2008 04:34:02 -0000 1.2 *************** *** 38,42 **** // wxGridCellWorker ! %class %noclassinfo wxGridCellWorker, wxClientDataContainer // wxGridCellWorker() - base class only --- 38,42 ---- // wxGridCellWorker ! %class %delete %noclassinfo %encapsulate wxGridCellWorker, wxClientDataContainer // wxGridCellWorker() - base class only *************** *** 49,53 **** // wxGridCellRenderer ! %class %noclassinfo wxGridCellRenderer, wxGridCellWorker //wxGridCellRenderer() - no constructor abstract class --- 49,53 ---- // wxGridCellRenderer ! %class %delete %noclassinfo %encapsulate wxGridCellRenderer, wxGridCellWorker //wxGridCellRenderer() - no constructor abstract class *************** *** 59,63 **** // wxGridCellStringRenderer ! %class %noclassinfo wxGridCellStringRenderer, wxGridCellRenderer wxGridCellStringRenderer() --- 59,63 ---- // wxGridCellStringRenderer ! %class %delete %noclassinfo %encapsulate wxGridCellStringRenderer, wxGridCellRenderer wxGridCellStringRenderer() *************** *** 67,71 **** // wxGridCellNumberRenderer ! %class %noclassinfo wxGridCellNumberRenderer, wxGridCellStringRenderer wxGridCellNumberRenderer() %endclass --- 67,71 ---- // wxGridCellNumberRenderer ! %class %delete %noclassinfo %encapsulate wxGridCellNumberRenderer, wxGridCellStringRenderer wxGridCellNumberRenderer() %endclass *************** *** 74,78 **** // wxGridCellFloatRenderer ! %class %noclassinfo wxGridCellFloatRenderer, wxGridCellStringRenderer wxGridCellFloatRenderer(int width = -1, int precision = -1) --- 74,78 ---- // wxGridCellFloatRenderer ! %class %delete %noclassinfo %encapsulate wxGridCellFloatRenderer, wxGridCellStringRenderer wxGridCellFloatRenderer(int width = -1, int precision = -1) *************** *** 86,90 **** // wxGridCellBoolRenderer ! %class %noclassinfo wxGridCellBoolRenderer, wxGridCellRenderer wxGridCellBoolRenderer() %endclass --- 86,90 ---- // wxGridCellBoolRenderer ! %class %delete %noclassinfo %encapsulate wxGridCellBoolRenderer, wxGridCellRenderer wxGridCellBoolRenderer() %endclass *************** *** 93,97 **** // wxGridCellDateTimeRenderer ! %class %noclassinfo wxGridCellDateTimeRenderer, wxGridCellStringRenderer wxGridCellDateTimeRenderer(const wxString& outformat = wxDefaultDateTimeFormat, const wxString& informat = wxDefaultDateTimeFormat) %endclass --- 93,97 ---- // wxGridCellDateTimeRenderer ! %class %delete %noclassinfo %encapsulate wxGridCellDateTimeRenderer, wxGridCellStringRenderer wxGridCellDateTimeRenderer(const wxString& outformat = wxDefaultDateTimeFormat, const wxString& informat = wxDefaultDateTimeFormat) %endclass *************** *** 100,104 **** // wxGridCellEnumRenderer ! %class %noclassinfo wxGridCellEnumRenderer, wxGridCellStringRenderer wxGridCellEnumRenderer( const wxString& choices = "" ) %endclass --- 100,104 ---- // wxGridCellEnumRenderer ! %class %delete %noclassinfo %encapsulate wxGridCellEnumRenderer, wxGridCellStringRenderer wxGridCellEnumRenderer( const wxString& choices = "" ) %endclass *************** *** 107,111 **** // wxGridCellAutoWrapStringRenderer ! %class %noclassinfo wxGridCellAutoWrapStringRenderer, wxGridCellStringRenderer wxGridCellAutoWrapStringRenderer() %endclass --- 107,111 ---- // wxGridCellAutoWrapStringRenderer ! %class %delete %noclassinfo %encapsulate wxGridCellAutoWrapStringRenderer, wxGridCellStringRenderer wxGridCellAutoWrapStringRenderer() %endclass *************** *** 114,124 **** // wxGridCellEditor ! %class %noclassinfo wxGridCellEditor, wxGridCellWorker // wxGridCellEditor() - no constructor abstract class bool IsCreated() wxControl* GetControl() ! void SetControl(wxControl* control) wxGridCellAttr* GetCellAttr() void SetCellAttr(wxGridCellAttr* attr) --- 114,126 ---- // wxGridCellEditor ! %class %delete %noclassinfo %encapsulate wxGridCellEditor, wxGridCellWorker // wxGridCellEditor() - no constructor abstract class bool IsCreated() wxControl* GetControl() ! // wxLua Note: This will delete the control ! void SetControl(%ungc wxControl* control) wxGridCellAttr* GetCellAttr() + // wxLua Note: the attr must exist for the life of this object and it doesn't take ownership void SetCellAttr(wxGridCellAttr* attr) *************** *** 141,145 **** // wxGridCellTextEditor ! %class %noclassinfo wxGridCellTextEditor, wxGridCellEditor wxGridCellTextEditor() %endclass --- 143,147 ---- // wxGridCellTextEditor ! %class %delete %noclassinfo %encapsulate wxGridCellTextEditor, wxGridCellEditor wxGridCellTextEditor() %endclass *************** *** 148,152 **** // wxGridCellNumberEditor ! %class %noclassinfo wxGridCellNumberEditor, wxGridCellTextEditor wxGridCellNumberEditor(int min = -1, int max = -1) %endclass --- 150,154 ---- // wxGridCellNumberEditor ! %class %delete %noclassinfo %encapsulate wxGridCellNumberEditor, wxGridCellTextEditor wxGridCellNumberEditor(int min = -1, int max = -1) %endclass *************** *** 155,159 **** // wxGridCellFloatEditor ! %class %noclassinfo wxGridCellFloatEditor, wxGridCellTextEditor wxGridCellFloatEditor(int width = -1, int precision = -1) %endclass --- 157,161 ---- // wxGridCellFloatEditor ! %class %delete %noclassinfo %encapsulate wxGridCellFloatEditor, wxGridCellTextEditor wxGridCellFloatEditor(int width = -1, int precision = -1) %endclass *************** *** 162,166 **** // wxGridCellBoolEditor ! %class %noclassinfo wxGridCellBoolEditor, wxGridCellEditor wxGridCellBoolEditor() %endclass --- 164,168 ---- // wxGridCellBoolEditor ! %class %delete %noclassinfo %encapsulate wxGridCellBoolEditor, wxGridCellEditor wxGridCellBoolEditor() %endclass *************** *** 169,173 **** // wxGridCellChoiceEditor ! %class %noclassinfo wxGridCellChoiceEditor, wxGridCellEditor wxGridCellChoiceEditor(const wxArrayString& choices, bool allowOthers = false) %endclass --- 171,175 ---- // wxGridCellChoiceEditor ! %class %delete %noclassinfo %encapsulate wxGridCellChoiceEditor, wxGridCellEditor wxGridCellChoiceEditor(const wxArrayString& choices, bool allowOthers = false) %endclass *************** *** 176,180 **** // wxGridCellEnumEditor ! %class %noclassinfo wxGridCellEnumEditor, wxGridCellChoiceEditor wxGridCellEnumEditor( const wxString& choices = "" ) %endclass --- 178,182 ---- // wxGridCellEnumEditor ! %class %delete %noclassinfo %encapsulate wxGridCellEnumEditor, wxGridCellChoiceEditor wxGridCellEnumEditor( const wxString& choices = "" ) %endclass *************** *** 183,187 **** // wxGridCellAutoWrapStringEditor ! %class %noclassinfo wxGridCellAutoWrapStringEditor, wxGridCellTextEditor wxGridCellAutoWrapStringEditor() %endclass --- 185,189 ---- // wxGridCellAutoWrapStringEditor ! %class %delete %noclassinfo %encapsulate wxGridCellAutoWrapStringEditor, wxGridCellTextEditor wxGridCellAutoWrapStringEditor() %endclass *************** *** 199,203 **** %endenum ! %class %noclassinfo wxGridCellAttr, wxClientDataContainer wxGridCellAttr() wxGridCellAttr(const wxColour& colText, const wxColour& colBack, const wxFont& font, int hAlign, int vAlign) --- 201,205 ---- %endenum ! %class %delete %noclassinfo %encapsulate wxGridCellAttr, wxClientDataContainer wxGridCellAttr() wxGridCellAttr(const wxColour& colText, const wxColour& colBack, const wxFont& font, int hAlign, int vAlign) *************** *** 213,217 **** --- 215,221 ---- void SetOverflow(bool allow = true) void SetReadOnly(bool isReadOnly = true) + // wxLua Note: the renderer must exist for the life of this object and it doesn't take ownership, but it does call DecRef() void SetRenderer(wxGridCellRenderer *renderer) + // wxLua Note: the editor must exist for the life of this object and it doesn't take ownership, but it does call DecRef() void SetEditor(wxGridCellEditor* editor) void SetKind(wxGridCellAttr::wxAttrKind kind) *************** *** 242,245 **** --- 246,250 ---- bool IsReadOnly() const wxGridCellAttr::wxAttrKind GetKind() + // wxLua Note: the attr must exist for the life of this object and it doesn't take ownership void SetDefAttr(wxGridCellAttr* defAttr) %endclass *************** *** 248,258 **** // wxGridCellAttrProvider ! %class %noclassinfo wxGridCellAttrProvider, wxClientDataContainer wxGridCellAttrProvider() wxGridCellAttr *GetAttr(int row, int col, wxGridCellAttr::wxAttrKind kind) const ! void SetAttr(wxGridCellAttr *attr, int row, int col) ! void SetRowAttr(wxGridCellAttr *attr, int row) ! void SetColAttr(wxGridCellAttr *attr, int col) void UpdateAttrRows( size_t pos, int numRows ) void UpdateAttrCols( size_t pos, int numCols ) --- 253,264 ---- // wxGridCellAttrProvider ! %class %delete %noclassinfo %encapsulate wxGridCellAttrProvider, wxClientDataContainer wxGridCellAttrProvider() + // wxLua Note: You must call DecRef() on the returned attr. wxGridCellAttr *GetAttr(int row, int col, wxGridCellAttr::wxAttrKind kind) const ! void SetAttr(%ungc wxGridCellAttr *attr, int row, int col) ! void SetRowAttr(%ungc wxGridCellAttr *attr, int row) ! void SetColAttr(%ungc wxGridCellAttr *attr, int col) void UpdateAttrRows( size_t pos, int numRows ) void UpdateAttrCols( size_t pos, int numCols ) *************** *** 265,304 **** // no constructor pure virtual base class ! int GetNumberRows() ! int GetNumberCols() ! bool IsEmptyCell( int row, int col ) ! wxString GetValue( int row, int col ) ! void SetValue( int row, int col, const wxString& value ) ! wxString GetTypeName( int row, int col ) ! bool CanGetValueAs( int row, int col, const wxString& typeName ) ! bool CanSetValueAs( int row, int col, const wxString& typeName ) ! bool GetValueAsBool( int row, int col ) ! long GetValueAsLong( int row, int col ) ! double GetValueAsDouble( int row, int col ) ! void SetValueAsBool( int row, int col, bool value ) ! void SetValueAsLong( int row, int col, long value ) ! void SetValueAsDouble( int row, int col, double value ) //virtual void* GetValueAsCustom( int row, int col, const wxString& typeName ) //virtual void SetValueAsCustom( int row, int col, const wxString& typeName, void* value ) ! void SetView( wxGrid *grid ) ! wxGrid * GetView() const ! void Clear() ! bool InsertRows( size_t pos = 0, size_t numRows = 1 ) ! bool AppendRows( size_t numRows = 1 ) ! bool DeleteRows( size_t pos = 0, size_t numRows = 1 ) ! bool InsertCols( size_t pos = 0, size_t numCols = 1 ) ! bool AppendCols( size_t numCols = 1 ) ! bool DeleteCols( size_t pos = 0, size_t numCols = 1 ) ! wxString GetRowLabelValue( int row ) ! wxString GetColLabelValue( int col ) ! void SetRowLabelValue( int row, const wxString& value ) ! void SetColLabelValue( int col, const wxString& value ) void SetAttrProvider(wxGridCellAttrProvider *attrProvider) wxGridCellAttrProvider *GetAttrProvider() const ! bool CanHaveAttributes() ! wxGridCellAttr* GetAttr( int row, int col, wxGridCellAttr::wxAttrKind kind) ! void SetAttr(wxGridCellAttr* attr, int row, int col) ! void SetRowAttr(wxGridCellAttr *attr, int row) ! void SetColAttr(wxGridCellAttr *attr, int col) %endclass --- 271,389 ---- // no constructor pure virtual base class ! virtual int GetNumberRows() ! virtual int GetNumberCols() ! virtual bool IsEmptyCell( int row, int col ) ! virtual wxString GetValue( int row, int col ) ! virtual void SetValue( int row, int col, const wxString& value ) ! virtual wxString GetTypeName( int row, int col ) ! virtual bool CanGetValueAs( int row, int col, const wxString& typeName ) ! virtual bool CanSetValueAs( int row, int col, const wxString& typeName ) ! virtual bool GetValueAsBool( int row, int col ) ! virtual long GetValueAsLong( int row, int col ) ! virtual double GetValueAsDouble( int row, int col ) ! virtual void SetValueAsBool( int row, int col, bool value ) ! virtual void SetValueAsLong( int row, int col, long value ) ! virtual void SetValueAsDouble( int row, int col, double value ) //virtual void* GetValueAsCustom( int row, int col, const wxString& typeName ) //virtual void SetValueAsCustom( int row, int col, const wxString& typeName, void* value ) ! virtual void SetView( wxGrid *grid ) ! virtual wxGrid * GetView() const ! virtual void Clear() ! virtual bool InsertRows( size_t pos = 0, size_t numRows = 1 ) ! virtual bool AppendRows( size_t numRows = 1 ) ! virtual bool DeleteRows( size_t pos = 0, size_t numRows = 1 ) ! virtual bool InsertCols( size_t pos = 0, size_t numCols = 1 ) ! virtual bool AppendCols( size_t numCols = 1 ) ! virtual bool DeleteCols( size_t pos = 0, size_t numCols = 1 ) ! virtual wxString GetRowLabelValue( int row ) ! virtual wxString GetColLabelValue( int col ) ! virtual void SetRowLabelValue( int row, const wxString& value ) ! virtual void SetColLabelValue( int col, const wxString& value ) ! void SetAttrProvider(wxGridCellAttrProvider *attrProvider) wxGridCellAttrProvider *GetAttrProvider() const ! virtual bool CanHaveAttributes() ! virtual wxGridCellAttr* GetAttr( int row, int col, wxGridCellAttr::wxAttrKind kind) ! ! void SetAttr(%ungc wxGridCellAttr* attr, int row, int col) ! void SetRowAttr(%ungc wxGridCellAttr *attr, int row) ! void SetColAttr(%ungc wxGridCellAttr *attr, int col) ! %endclass ! ! // --------------------------------------------------------------------------- ! // wxLuaGridTableBase ! ! %include "wxbind/include/wxadv_wxladv.h" ! ! %class %delete wxLuaGridTableBase, wxGridTableBase ! // %override - the C++ function takes the wxLuaState as the first param ! wxLuaGridTableBase() ! ! // The functions below are all virtual functions that you override in Lua. ! ! // You must override these functions in a derived table class ! // ! //virtual int GetNumberRows(); ! //virtual int GetNumberCols(); ! //virtual bool IsEmptyCell( int row, int col ); ! //virtual wxString GetValue( int row, int col ); ! //virtual void SetValue( int row, int col, const wxString& value ); ! // ! // Data type determination and value access ! //virtual wxString GetTypeName( int row, int col ); ! //virtual bool CanGetValueAs( int row, int col, const wxString& typeName ); ! //virtual bool CanSetValueAs( int row, int col, const wxString& typeName ); ! // ! //virtual long GetValueAsLong( int row, int col ); ! //virtual double GetValueAsDouble( int row, int col ); ! //virtual bool GetValueAsBool( int row, int col ); ! // ! //virtual void SetValueAsLong( int row, int col, long value ); ! //virtual void SetValueAsDouble( int row, int col, double value ); ! //virtual void SetValueAsBool( int row, int col, bool value ); ! // ! // For user defined types ! //virtual void* GetValueAsCustom( int row, int col, const wxString& typeName ); ! //virtual void SetValueAsCustom( int row, int col, const wxString& typeName, void* value ); ! // ! // Overriding these is optional ! // ! //virtual void SetView( wxGrid *grid ) { m_view = grid; } ! //virtual wxGrid * GetView() const { return m_view; } ! // ! //virtual void Clear() {} ! //virtual bool InsertRows( size_t pos = 0, size_t numRows = 1 ); ! //virtual bool AppendRows( size_t numRows = 1 ); ! //virtual bool DeleteRows( size_t pos = 0, size_t numRows = 1 ); ! //virtual bool InsertCols( size_t pos = 0, size_t numCols = 1 ); ! //virtual bool AppendCols( size_t numCols = 1 ); ! //virtual bool DeleteCols( size_t pos = 0, size_t numCols = 1 ); ! // ! //virtual wxString GetRowLabelValue( int row ); ! //virtual wxString GetColLabelValue( int col ); ! //virtual void SetRowLabelValue( int WXUNUSED(row), const wxString& ) {} ! //virtual void SetColLabelValue( int WXUNUSED(col), const wxString& ) {} ! // ! // Attribute handling ! // ! // give us the attr provider to use - we take ownership of the pointer ! //void SetAttrProvider(wxGridCellAttrProvider *attrProvider); ! // ! // get the currently used attr provider (may be NULL) ! //wxGridCellAttrProvider *GetAttrProvider() const { return m_attrProvider; } ! // ! // Does this table allow attributes? Default implementation creates ! // a wxGridCellAttrProvider if necessary. ! //virtual bool CanHaveAttributes(); ! // ! // by default forwarded to wxGridCellAttrProvider if any. May be ! // overridden to handle attributes directly in the table. ! //virtual wxGridCellAttr *GetAttr( int row, int col, ! // wxGridCellAttr::wxAttrKind kind ); ! // ! // these functions take ownership of the pointer ! //virtual void SetAttr(wxGridCellAttr* attr, int row, int col); ! //virtual void SetRowAttr(wxGridCellAttr *attr, int row); ! //virtual void SetColAttr(wxGridCellAttr *attr, int col); %endclass *************** *** 306,310 **** // wxGridStringTable ! %class wxGridStringTable, wxGridTableBase wxGridStringTable( int numRows=0, int numCols=0 ) %endclass --- 391,395 ---- // wxGridStringTable ! %class %delete wxGridStringTable, wxGridTableBase wxGridStringTable( int numRows=0, int numCols=0 ) %endclass *************** *** 387,390 **** --- 472,477 ---- wxGridTableBase * GetTable() const + + // %override so that takeOwnership releases the table from garbage collection by Lua bool SetTable( wxGridTableBase * table, bool takeOwnership = false, wxGrid::wxGridSelectionModes selmode = wxGrid::wxGridSelectCells ) *************** *** 466,471 **** --- 553,564 ---- wxColour GetLabelTextColour() wxFont GetLabelFont() + + // %override [int horiz, int vert] wxGrid::GetRowLabelAlignment() + // C++ Func: void GetRowLabelAlignment( int *horiz, int *vert ) void GetRowLabelAlignment( int *horz, int *vert ) + // %override [int horiz, int vert] wxGrid::GetColLabelAlignment() + // C++ Func: void GetColLabelAlignment( int *horiz, int *vert ) void GetColLabelAlignment( int *horz, int *vert ) + int GetColLabelTextOrientation() wxString GetRowLabelValue( int row ) *************** *** 502,508 **** bool CanDragCell() ! void SetAttr(int row, int col, wxGridCellAttr *attr) ! void SetRowAttr(int row, wxGridCellAttr *attr) ! void SetColAttr(int col, wxGridCellAttr *attr) wxGridCellAttr *GetOrCreateCellAttr(int row, int col) const --- 595,601 ---- bool CanDragCell() ! void SetAttr(int row, int col, %ungc wxGridCellAttr *attr) ! void SetRowAttr(int row, %ungc wxGridCellAttr *attr) ! void SetColAttr(int col, %ungc wxGridCellAttr *attr) wxGridCellAttr *GetOrCreateCellAttr(int row, int col) const *************** *** 569,578 **** void SetCellSize( int row, int col, int num_rows, int num_cols ) ! void SetDefaultRenderer(wxGridCellRenderer *renderer) void SetCellRenderer(int row, int col, wxGridCellRenderer *renderer) wxGridCellRenderer* GetDefaultRenderer() const wxGridCellRenderer* GetCellRenderer(int row, int col) ! void SetDefaultEditor(wxGridCellEditor *editor) void SetCellEditor(int row, int col, wxGridCellEditor *editor) wxGridCellEditor* GetDefaultEditor() const --- 662,671 ---- void SetCellSize( int row, int col, int num_rows, int num_cols ) ! void SetDefaultRenderer(%ungc wxGridCellRenderer *renderer) void SetCellRenderer(int row, int col, wxGridCellRenderer *renderer) wxGridCellRenderer* GetDefaultRenderer() const wxGridCellRenderer* GetCellRenderer(int row, int col) ! void SetDefaultEditor(%ungc wxGridCellEditor *editor) void SetCellEditor(int row, int col, wxGridCellEditor *editor) wxGridCellEditor* GetDefaultEditor() const Index: wxadv_override.hpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxadv_override.hpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** wxadv_override.hpp 23 Jan 2008 06:43:34 -0000 1.5 --- wxadv_override.hpp 31 Jan 2008 04:34:02 -0000 1.6 *************** *** 192,193 **** --- 192,241 ---- } %end + + %override wxLua_wxGrid_SetTable + // bool SetTable(wxGridTableBase *table, bool takeOwnership = false, + // wxGrid::wxGridSelectionModes selmode = + // wxGrid::wxGridSelectCells) + static int LUACALL wxLua_wxGrid_SetTable(lua_State *L) + { + // get number of arguments + int argCount = lua_gettop(L); + // wxGrid::wxGridSelectionModes selmode = wxGrid::wxGridSelectCells + wxGrid::wxGridSelectionModes selmode = (argCount >= 4 ? (wxGrid::wxGridSelectionModes)wxlua_getintegertype(L, 4) : wxGrid::wxGridSelectCells); + // bool takeOwnership = false + bool takeOwnership = (argCount >= 3 ? wxlua_getbooleantype(L, 3) : false); + // wxGridTableBase table + wxGridTableBase * table = (wxGridTableBase *)wxluaT_getuserdatatype(L, 2, wxluatype_wxGridTableBase); + // get this + wxGrid * self = (wxGrid *)wxluaT_getuserdatatype(L, 1, wxluatype_wxGrid); + // call SetTable + bool returns = (self->SetTable(table, takeOwnership, selmode)); + + if (returns && takeOwnership) + { + if (!wxluaO_isgcobject(L, table)) wxluaO_addgcobject(L, table); + } + + // push the result flag + lua_pushboolean(L, returns); + + return 1; + } + %end + + %override wxLua_wxLuaGridTableBase_constructor + // wxLuaGridTableBase() + static int LUACALL wxLua_wxLuaGridTableBase_constructor(lua_State *L) + { + wxLuaState wxlState(L); + + // call constructor + wxLuaGridTableBase *returns = new wxLuaGridTableBase(wxlState); + // add to tracked memory list + wxluaO_addgcobject(L, (wxLuaGridTableBase *)returns); + // push the constructed class pointer + wxluaT_pushuserdatatype(L, returns, wxluatype_wxLuaGridTableBase); + + return 1; + } + %end |
