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...> - 2007-07-28 21:21:50
|
Update of /cvsroot/wxlua/wxLua In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv31703 Modified Files: configure Log Message: regenerated configure script with working frm-bakefile Index: configure =================================================================== RCS file: /cvsroot/wxlua/wxLua/configure,v retrieving revision 1.56 retrieving revision 1.57 diff -C2 -d -r1.56 -r1.57 *** configure 27 Jul 2007 14:11:57 -0000 1.56 --- configure 28 Jul 2007 21:21:41 -0000 1.57 *************** *** 708,711 **** --- 708,712 ---- MAKE_SET AR + AROPTIONS STRIP NM *************** *** 744,747 **** --- 745,749 ---- SONAME_FLAG DEPS_TRACKING + BK_DEPS WINDRES REZ *************** *** 749,752 **** --- 751,755 ---- GCC_PCH ICC_PCH + BK_MAKE_PCH COND_BUILD_DEBUG COND_BUILD_DEBUG_UNICODE_0 *************** *** 6508,6512 **** ! if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. set dummy ${ac_tool_prefix}ar; ac_word=$2 --- 6511,6524 ---- ! if test "x$SUNCXX" = "xyes"; then ! AR=$CXX ! AROPTIONS="-xar -o" ! ! elif test "x$SGICC" = "xyes"; then ! AR=$CXX ! AROPTIONS="-ar -o" ! ! else ! if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. set dummy ${ac_tool_prefix}ar; ac_word=$2 *************** *** 6604,6607 **** --- 6616,6623 ---- fi + AROPTIONS=rcu + fi + + if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. *************** *** 6801,6805 **** INSTALL_DIR="mkdir -p" ;; ! *) INSTALL_DIR="$INSTALL -d" ;; esac --- 6817,6822 ---- INSTALL_DIR="mkdir -p" ;; ! * ) ! INSTALL_DIR='$(INSTALL) -d' ;; esac *************** *** 7062,7066 **** #ifndef __INTEL_COMPILER ! #error Not ICC #endif --- 7079,7083 ---- #ifndef __INTEL_COMPILER ! This is not ICC #endif *************** *** 7133,7136 **** --- 7150,7157 ---- ldargs="-r -keep_private_externs -nostdlib" + if test "x${D}CXX" = "x"; then + CXX="c++" + fi + while test ${D}# -gt 0; do case ${D}1 in *************** *** 7146,7149 **** --- 7167,7176 ---- ;; + -arch|-isysroot) + # collect these options and values + ldargs="${D}{ldargs} ${D}1 ${D}2" + shift + ;; + -s|-Wl,*) # collect these load args *************** *** 7185,7191 **** # if test ${D}{verbose} = 1; then ! echo "c++ ${D}{ldargs} ${D}{objects} -o master.${D}${D}.o" fi ! c++ ${D}{ldargs} ${D}{objects} -o master.${D}${D}.o status=${D}? --- 7212,7218 ---- # if test ${D}{verbose} = 1; then ! echo "${D}CXX ${D}{ldargs} ${D}{objects} -o master.${D}${D}.o" fi ! ${D}CXX ${D}{ldargs} ${D}{objects} -o master.${D}${D}.o status=${D}? *************** *** 7196,7202 **** if test ${D}{status} = 0; then if test ${D}{verbose} = 1; then ! echo "c++ ${D}{linking_flag} master.${D}${D}.o ${D}{args}" fi ! c++ ${D}{linking_flag} master.${D}${D}.o ${D}{args} status=${D}? fi --- 7223,7229 ---- if test ${D}{status} = 0; then if test ${D}{verbose} = 1; then ! echo "${D}CXX ${D}{linking_flag} master.${D}${D}.o ${D}{args}" fi ! ${D}CXX ${D}{linking_flag} master.${D}${D}.o ${D}{args} status=${D}? fi *************** *** 7213,7217 **** SHARED_LD_MODULE_CC="`pwd`/shared-ld-sh -bundle -headerpad_max_install_names -o" ! SHARED_LD_MODULE_CXX="$SHARED_LD_MODULE_CC" --- 7240,7244 ---- SHARED_LD_MODULE_CC="`pwd`/shared-ld-sh -bundle -headerpad_max_install_names -o" ! SHARED_LD_MODULE_CXX="CXX=\$(CXX) $SHARED_LD_MODULE_CC" *************** *** 7235,7239 **** #if (__GNUC__ < 3) || \ ((__GNUC__ == 3) && (__GNUC_MINOR__ < 1)) ! #error old gcc #endif --- 7262,7266 ---- #if (__GNUC__ < 3) || \ ((__GNUC__ == 3) && (__GNUC_MINOR__ < 1)) ! This is old gcc #endif *************** *** 7854,7857 **** --- 7881,7885 ---- powerpc-apple-macos* | \ *-*-freebsd* | *-*-openbsd* | *-*-netbsd* | *-*-k*bsd*-gnu | \ + *-*-mirbsd* | \ *-*-sunos4* | \ *-*-osf* | \ *************** *** 7939,7942 **** --- 7967,7971 ---- echo $ECHO_N "checking for dependency tracking method... $ECHO_C" >&6; } + BK_DEPS="" if test "x$bk_use_trackdeps" = "xno" ; then DEPS_TRACKING=0 *************** *** 7995,7999 **** #!/bin/sh ! # This script is part of Bakefile (http://bakefile.sourceforge.net) autoconf # script. It is used to track C/C++ files dependencies in portable way. # --- 8024,8028 ---- #!/bin/sh ! # This script is part of Bakefile (http://www.bakefile.org) autoconf # script. It is used to track C/C++ files dependencies in portable way. # *************** *** 8095,8098 **** --- 8124,8128 ---- chmod +x bk-deps + BK_DEPS="`pwd`/bk-deps" fi fi *************** *** 8101,8104 **** --- 8131,8135 ---- + case ${BAKEFILE_HOST} in *-*-cygwin* | *-*-mingw32* ) *************** *** 8302,8305 **** --- 8333,8337 ---- ICC_PCH=0 USE_PCH=0 + BK_MAKE_PCH="" case ${BAKEFILE_HOST} in *************** *** 8325,8332 **** #if !defined(__GNUC__) || !defined(__GNUC_MINOR__) ! #error "no pch support" #endif #if (__GNUC__ < 3) ! #error "no pch support" #endif #if (__GNUC__ == 3) && \ --- 8357,8364 ---- #if !defined(__GNUC__) || !defined(__GNUC_MINOR__) ! There is no PCH support #endif #if (__GNUC__ < 3) ! There is no PCH support #endif #if (__GNUC__ == 3) && \ *************** *** 8334,8338 **** ( defined(__APPLE_CC__) && (__GNUC_MINOR__ < 3))) || \ ( defined(__INTEL_COMPILER) ) ! #error "no pch support" #endif --- 8366,8370 ---- ( defined(__APPLE_CC__) && (__GNUC_MINOR__ < 3))) || \ ( defined(__INTEL_COMPILER) ) ! There is no PCH support #endif *************** *** 8381,8385 **** #if !defined(__INTEL_COMPILER) || \ (__INTEL_COMPILER < 800) ! #error "no pch support" #endif --- 8413,8417 ---- #if !defined(__INTEL_COMPILER) || \ (__INTEL_COMPILER < 800) ! There is no PCH support #endif *************** *** 8432,8436 **** #!/bin/sh ! # This script is part of Bakefile (http://bakefile.sourceforge.net) autoconf # script. It is used to generated precompiled headers. # --- 8464,8468 ---- #!/bin/sh ! # This script is part of Bakefile (http://www.bakefile.org) autoconf # script. It is used to generated precompiled headers. # *************** *** 8495,8498 **** --- 8527,8531 ---- chmod +x bk-make-pch + BK_MAKE_PCH="`pwd`/bk-make-pch" fi fi *************** *** 8502,8505 **** --- 8535,8539 ---- + COND_BUILD_DEBUG="#" if test "x$BUILD" = "xdebug" ; then *************** *** 9606,9613 **** MAKE_SET!$MAKE_SET$ac_delim AR!$AR$ac_delim STRIP!$STRIP$ac_delim NM!$NM$ac_delim INSTALL_DIR!$INSTALL_DIR$ac_delim - LDFLAGS_GUI!$LDFLAGS_GUI$ac_delim _ACEOF --- 9640,9647 ---- MAKE_SET!$MAKE_SET$ac_delim AR!$AR$ac_delim + AROPTIONS!$AROPTIONS$ac_delim STRIP!$STRIP$ac_delim NM!$NM$ac_delim INSTALL_DIR!$INSTALL_DIR$ac_delim _ACEOF *************** *** 9651,9654 **** --- 9685,9689 ---- for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF + LDFLAGS_GUI!$LDFLAGS_GUI$ac_delim IF_GNU_MAKE!$IF_GNU_MAKE$ac_delim PLATFORM_UNIX!$PLATFORM_UNIX$ac_delim *************** *** 9683,9686 **** --- 9718,9722 ---- SONAME_FLAG!$SONAME_FLAG$ac_delim DEPS_TRACKING!$DEPS_TRACKING$ac_delim + BK_DEPS!$BK_DEPS$ac_delim WINDRES!$WINDRES$ac_delim REZ!$REZ$ac_delim *************** *** 9688,9691 **** --- 9724,9728 ---- GCC_PCH!$GCC_PCH$ac_delim ICC_PCH!$ICC_PCH$ac_delim + BK_MAKE_PCH!$BK_MAKE_PCH$ac_delim COND_BUILD_DEBUG!$COND_BUILD_DEBUG$ac_delim COND_BUILD_DEBUG_UNICODE_0!$COND_BUILD_DEBUG_UNICODE_0$ac_delim *************** *** 9745,9751 **** COND_USE_SOVERSOLARIS_1!$COND_USE_SOVERSOLARIS_1$ac_delim COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1!$COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1$ac_delim - COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1!$COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1$ac_delim - COND_USE_WXLUACANAPP_1!$COND_USE_WXLUACANAPP_1$ac_delim - COND_USE_WXLUAFREEZEAPP_1!$COND_USE_WXLUAFREEZEAPP_1$ac_delim _ACEOF --- 9782,9785 ---- *************** *** 9789,9792 **** --- 9823,9829 ---- for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF + COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1!$COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1$ac_delim + COND_USE_WXLUACANAPP_1!$COND_USE_WXLUACANAPP_1$ac_delim + COND_USE_WXLUAFREEZEAPP_1!$COND_USE_WXLUAFREEZEAPP_1$ac_delim COND_WINDOWS_IMPLIB_1!$COND_WINDOWS_IMPLIB_1$ac_delim COND_WX_PORT_GTK!$COND_WX_PORT_GTK$ac_delim *************** *** 9800,9804 **** _ACEOF ! if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 9; then break elif $ac_last_try; then --- 9837,9841 ---- _ACEOF ! if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 12; then break elif $ac_last_try; then |
|
From: John L. <jr...@us...> - 2007-07-27 14:12:05
|
Update of /cvsroot/wxlua/wxLua/build/autoconf In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv19144/wxLua/build/autoconf Modified Files: acregen.sh wxcodecheck.m4 Log Message: Some cleanup, print the wxStEdit lib name to help people find what's missing Index: acregen.sh =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/autoconf/acregen.sh,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** acregen.sh 27 Jul 2007 13:33:41 -0000 1.4 --- acregen.sh 27 Jul 2007 14:11:59 -0000 1.5 *************** *** 72,77 **** current=$(pwd) cd $path ! echo $path ! ! aclocal -I ./ && autoconf && mv configure ../.. cd $current --- 72,75 ---- current=$(pwd) cd $path ! aclocal -I . && autoconf && mv configure ../.. cd $current Index: wxcodecheck.m4 =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/autoconf/wxcodecheck.m4,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** wxcodecheck.m4 26 Jul 2007 22:08:11 -0000 1.1 --- wxcodecheck.m4 27 Jul 2007 14:11:59 -0000 1.2 *************** *** 140,144 **** dnl call our base macro adding the version check ! COMPCHECK_MSG="if $1 (version >= $5) is available" AM_WXCODE_CHECKFOR_COMPONENT([$1], [$2], [$3], [ --- 140,144 ---- dnl call our base macro adding the version check ! COMPCHECK_MSG="if $1 (version >= $5) ($wx_temp) is available" AM_WXCODE_CHECKFOR_COMPONENT([$1], [$2], [$3], [ |
|
From: John L. <jr...@us...> - 2007-07-27 14:12:02
|
Update of /cvsroot/wxlua/wxLua In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv19144/wxLua Modified Files: configure Log Message: Some cleanup, print the wxStEdit lib name to help people find what's missing Index: configure =================================================================== RCS file: /cvsroot/wxlua/wxLua/configure,v retrieving revision 1.55 retrieving revision 1.56 diff -C2 -d -r1.55 -r1.56 *** configure 27 Jul 2007 13:33:41 -0000 1.55 --- configure 27 Jul 2007 14:11:57 -0000 1.56 *************** *** 5968,5972 **** relsym="STE_""RELEASE""_VERSION" ! COMPCHECK_MSG="if wxStEdit (version >= $minversion) ($_WX_STEDIT_LIBNAME) is available" --- 5968,5972 ---- relsym="STE_""RELEASE""_VERSION" ! COMPCHECK_MSG="if wxStEdit (version >= $minversion) ($wx_temp) is available" |
|
From: John L. <jr...@us...> - 2007-07-27 13:33:45
|
Update of /cvsroot/wxlua/wxLua/build/autoconf In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv3851/wxLua/build/autoconf Modified Files: aclocal.m4 acregen.sh Added Files: wxwin.m4 Log Message: Added wxwin.m4, use local copy using aclocal -I ./ Edit by hand BAKEFILE_BAKEFILE_M4_VERSION="0.2.2" from 0.2.0 in configure Index: acregen.sh =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/autoconf/acregen.sh,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** acregen.sh 8 Dec 2006 13:19:57 -0000 1.3 --- acregen.sh 27 Jul 2007 13:33:41 -0000 1.4 *************** *** 72,75 **** current=$(pwd) cd $path ! aclocal && autoconf && mv configure ../.. cd $current --- 72,77 ---- current=$(pwd) cd $path ! echo $path ! ! aclocal -I ./ && autoconf && mv configure ../.. cd $current Index: aclocal.m4 =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/autoconf/aclocal.m4,v retrieving revision 1.46 retrieving revision 1.47 diff -C2 -d -r1.46 -r1.47 *** aclocal.m4 16 Jul 2007 20:29:51 -0000 1.46 --- aclocal.m4 27 Jul 2007 13:33:41 -0000 1.47 *************** *** 1565,1566 **** --- 1565,1567 ---- ]) + m4_include([wxwin.m4]) --- NEW FILE: wxwin.m4 --- dnl --------------------------------------------------------------------------- dnl Author: wxWidgets development team, dnl Francesco Montorsi, dnl Bob McCown (Mac-testing) dnl Creation date: 24/11/2001 dnl RCS-ID: $Id: wxwin.m4,v 1.1 2007/07/27 13:33:41 jrl1 Exp $ dnl --------------------------------------------------------------------------- dnl =========================================================================== dnl Table of Contents of this macro dnl ------------------------------------- dnl dnl SECTION A: wxWidgets main macros dnl - WX_CONFIG_OPTIONS dnl - WX_CONFIG_CHECK dnl - WXRC_CHECK dnl - WX_STANDARD_OPTIONS dnl - WX_CONVERT_STANDARD_OPTIONS_TO_WXCONFIG_FLAGS dnl - WX_DETECT_STANDARD_OPTION_VALUES [...1011 lines suppressed...] [ WX_STANDARD_OPTIONS_SUMMARY_MSG echo echo " Now, just run make." echo " ----------------------------------------------------------------" echo ]) dnl --------------------------------------------------------------------------- dnl Deprecated macro wrappers dnl --------------------------------------------------------------------------- AC_DEFUN([AM_OPTIONS_WXCONFIG], [WX_CONFIG_OPTIONS]) AC_DEFUN([AM_PATH_WXCONFIG], [ WX_CONFIG_CHECK([$1],[$2],[$3],[$4],[$5]) ]) |
|
From: John L. <jr...@us...> - 2007-07-27 13:33:45
|
Update of /cvsroot/wxlua/wxLua In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv3851/wxLua Modified Files: configure Log Message: Added wxwin.m4, use local copy using aclocal -I ./ Edit by hand BAKEFILE_BAKEFILE_M4_VERSION="0.2.2" from 0.2.0 in configure Index: configure =================================================================== RCS file: /cvsroot/wxlua/wxLua/configure,v retrieving revision 1.54 retrieving revision 1.55 diff -C2 -d -r1.54 -r1.55 *** configure 16 Jul 2007 20:29:50 -0000 1.54 --- configure 27 Jul 2007 13:33:41 -0000 1.55 *************** *** 675,678 **** --- 675,694 ---- ac_ct_CXX WXLIBS_REQUIRED + WX_CONFIG_PATH + WX_CPPFLAGS + WX_CFLAGS + WX_CXXFLAGS + WX_CFLAGS_ONLY + WX_CXXFLAGS_ONLY + WX_LIBS [...1741 lines suppressed...] ! fi ! ! ! if test "x$WX_SHARED" = "x1" ; then ! echo " - SHARED mode" ! elif test "x$WX_SHARED" = "x0" ; then ! echo " - STATIC mode" ! else ! echo "WX_SHARED is $WX_SHARED" ! fi ! ! echo " - VERSION: $WX_VERSION_FULL" ! echo " - PORT: $WX_PORT" ! ! echo ! echo " Now, just run make." ! echo " ----------------------------------------------------------------" ! echo ! |
|
From: John L. <jr...@us...> - 2007-07-27 01:11:15
|
Update of /cvsroot/wxlua/wxLua/build/autoconf In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv6300/autoconf Modified Files: configure.ac Log Message: Add back the include for utils.m4 Index: configure.ac =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/autoconf/configure.ac,v retrieving revision 1.44 retrieving revision 1.45 diff -C2 -d -r1.44 -r1.45 *** configure.ac 16 Jul 2007 20:29:51 -0000 1.44 --- configure.ac 27 Jul 2007 01:11:10 -0000 1.45 *************** *** 16,19 **** --- 16,20 ---- #DBG_CONFIGURE=1 + m4_include(utils.m4) m4_include(wxcodecheck.m4) |
|
From: Francesco M. <fr...@us...> - 2007-07-26 22:36:20
|
Update of /cvsroot/wxlua/wxLua/build/bakefiles In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv10344 Modified Files: Bakefiles.bkgen Log Message: fix include path for local copy of wxpresets Index: Bakefiles.bkgen =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/Bakefiles.bkgen,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** Bakefiles.bkgen 24 Apr 2007 14:29:46 -0000 1.12 --- Bakefiles.bkgen 26 Jul 2007 22:36:17 -0000 1.13 *************** *** 16,21 **** </input> ! <!-- we want to use our local copy of wxWidgets presets: --> ! <add-flags>-Iwxpresets</add-flags> --- 16,27 ---- </input> ! <!-- we want to use our local copy of wxWidgets presets; since we will ! include the presets using the "presets/wx.bkl" syntax, then we ! need to add current path to the list of paths to search for. ! ! NOTE: in reality, this is not needed as bakefile_gen has current ! path in include search paths automatically. ! --> ! <add-flags>-I.</add-flags> |
|
From: Francesco M. <fr...@us...> - 2007-07-26 22:08:37
|
Update of /cvsroot/wxlua/wxLua/build/autoconf In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv31205/build/autoconf Added Files: utils.m4 wxcodecheck.m4 Log Message: added the M4 macro files which were missing --- NEW FILE: utils.m4 --- dnl --------------------------------------------------------------------------- dnl Author: Francesco Montorsi dnl Creation date: 20/3/2007 dnl RCS-ID: $Id: utils.m4,v 1.1 2007/07/26 22:08:11 frm Exp $ dnl Purpose: Some generic M4 utilities dnl --------------------------------------------------------------------------- dnl --------------------------------------------------------------------------- dnl UTILS_YESNO_OPTCHECK([name of the boolean variable to set], dnl [name of the --enable-option variable with yes/no values], dnl [name of the --enable option]) dnl dnl Converts the $3 variable, suppose to contain a yes/no value to a 1/0 dnl boolean variable and saves the result into $1. dnl Outputs also the standard checking-option message. dnl --------------------------------------------------------------------------- AC_DEFUN([UTILS_YESNO_OPTCHECK], [ AC_MSG_CHECKING([for the $3 option]) if [[ "x$$2" = "xyes" ]]; then AC_MSG_RESULT([yes]) $1=1 else AC_MSG_RESULT([no]) $1=0 fi ]) dnl --------------------------------------------------------------------------- dnl UTILS_BOOLOPT_SUMMARY([name of the boolean variable to show summary for], dnl [what to print when var is 1], dnl [what to print when var is 0]) dnl dnl Prints $2 when variable $1 == 1 and prints $3 when variable $1 == 0. dnl This macro mainly exists just to make configure.ac scripts more readable. dnl dnl NOTE: you need to use the [" my message"] syntax for 2nd and 3rd arguments dnl if you want that M4 avoid to throw away the spaces prefixed to the dnl argument value. dnl --------------------------------------------------------------------------- AC_DEFUN([UTILS_BOOLOPT_SUMMARY], [ if [[ "x$$1" = "x1" ]]; then echo $2 elif [[ "x$$1" = "x0" ]]; then echo $3 else echo "$1 is $$1" fi ]) # same as UTILS_BOOLOPT_SUMMARY but takes 2 bool options AC_DEFUN([UTILS_2BOOLOPT_SUMMARY], [ if [[ "x$$1" = "x1" -a "x$$2" = "x1" ]]; then echo $3 elif [[ "x$$1" = "x0" -o "x$$2" = "x0" ]]; then echo $4 else echo "$1 is $$1; $2 is $$2" fi ]) # same as UTILS_BOOLOPT_SUMMARY but takes 3 bool options AC_DEFUN([UTILS_3BOOLOPT_SUMMARY], [ if [[ "x$$1" = "x1" -a "x$$2" = "x1" -a "x$$3" = "x1" ]]; then echo $4 elif [[ "x$$1" = "x0" -o "x$$2" = "x0" -o "x$$3" = "x0" ]]; then echo $5 else echo "$1 is $$1; $2 is $$2; $3 is $$3" fi ]) dnl --------------------------------------------------------------------------- dnl UTILS_SAVE_COREVAR() dnl dnl Saves the CPPFLAGS, CXXFLAGS, CFLAGS and LIBS variables in some helper dnl variables which are used to restore them later (see UTILS_RESTORE_COREVAR) dnl --------------------------------------------------------------------------- AC_DEFUN([UTILS_SAVE_COREVAR], [ SAVED_CPPFLAGS="$CPPFLAGS" SAVED_CXXFLAGS="$CXXFLAGS" SAVED_CFLAGS="$CFLAGS" SAVED_LIBS="$LIBS" ]) dnl --------------------------------------------------------------------------- dnl UTILS_RESTORE_COREVAR() dnl dnl Loads into the CPPFLAGS, CXXFLAGS, CFLAGS and LIBS variables the values dnl of the helper variables set by UTILS_SAVE_COREVAR dnl --------------------------------------------------------------------------- AC_DEFUN([UTILS_RESTORE_COREVAR], [ CPPFLAGS="$SAVED_CPPFLAGS" CXXFLAGS="$SAVED_CXXFLAGS" CFLAGS="$SAVED_CFLAGS" LIBS="$SAVED_LIBS" ]) --- NEW FILE: wxcodecheck.m4 --- dnl --------------------------------------------------------------------------- dnl Author: Francesco Montorsi dnl Creation date: 14/9/2005 dnl RCS-ID: $Id: wxcodecheck.m4,v 1.1 2007/07/26 22:08:11 frm Exp $ dnl Purpose: Contains M4 macros intended to be used also by external dnl projects which depends from a wxCode component dnl --------------------------------------------------------------------------- dnl --------------------------------------------------------------------------- dnl AM_SAVE_COREVAR() dnl dnl Saves the CPPFLAGS, CXXFLAGS, CFLAGS and LIBS variables in some helper dnl variables which are used to restore them later (see AM_RESTORE_COREVAR) dnl --------------------------------------------------------------------------- AC_DEFUN([AM_SAVE_COREVAR], [ SAVED_CPPFLAGS="$CPPFLAGS" SAVED_CXXFLAGS="$CXXFLAGS" SAVED_CFLAGS="$CFLAGS" SAVED_LIBS="$LIBS" ]) dnl --------------------------------------------------------------------------- dnl AM_RESTORE_COREVAR() dnl dnl Loads into the CPPFLAGS, CXXFLAGS, CFLAGS and LIBS variables the values dnl of the helper variables set by AM_SAVE_COREVAR dnl --------------------------------------------------------------------------- AC_DEFUN([AM_RESTORE_COREVAR], [ CPPFLAGS="$SAVED_CPPFLAGS" CXXFLAGS="$SAVED_CXXFLAGS" CFLAGS="$SAVED_CFLAGS" LIBS="$SAVED_LIBS" ]) dnl --------------------------------------------------------------------------- dnl AM_WXCODE_CHECKFOR_COMPONENT( dnl [name (mixed case) of the component to check], dnl [name of a header of the component to check (with 'wx/' prefix and '.h' suffix)], dnl [name of the library of the component to check (without 'lib' prefix and without .a/.so suffix)], dnl [a C++ line of code that forces the test program to be linked against the component in order to work], dnl [action if found], dnl [action if not found]) dnl dnl Creates a little test program to check for presence of a wxCode component. dnl Note that this macro does not automatically adds anything to the CPPFLAGS, dnl CFLAGS or LIBS variables. dnl --------------------------------------------------------------------------- AC_DEFUN([AM_WXCODE_CHECKFOR_COMPONENT], [ dnl save original flags into support variables AM_SAVE_COREVAR() dnl add to the compilation & link flags the wxWidgets flags dnl (we assume they have been set by AM_WXPRESETS) dnl dnl NOTE: this is very important since the test program dnl we will compile needs to be linked against wx dnl and the configure script will use these *FLAGS dnl variables and it cannot be told to use other flags. dnl dnl NOTE2: we don't want to put into *FLAGS variables the dnl WX_* variable values since the Makefile.in for dnl a wxpresets-based application already merges dnl the *FLAGS contents with WX_* vars dnl dnl NOTE3: the CXXFLAGS are merged with CPPFLAGS and dnl thus we don't need to add the WX_CPPFLAGS to both CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" dnl before WX_LIBS we want the lib of the component to check LIBS="$LIBS -l$3 $WX_LIBS" dnl check for this component presence if test -z "$COMPCHECK_MSG"; then dnl allow customized messages COMPCHECK_MSG="if $1 is available" fi AC_MSG_CHECKING([$COMPCHECK_MSG]) AC_LINK_IFELSE([ AC_LANG_PROGRAM([#include <$2>], [$4]) ], [$1_PRESENCE=1], [$1_PRESENCE=0]) if test "$$1_PRESENCE" = "1"; then AC_MSG_RESULT([yes]) $5 else AC_MSG_RESULT([no]) $6 fi dnl restore the original flags AM_RESTORE_COREVAR() ]) dnl --------------------------------------------------------------------------- dnl AM_WXCODE_CHECKFOR_COMPONENT_VERSION( dnl [name (mixed case) of the component to check], dnl [name of a header of the component to check (with 'wx/' prefix and '.h' suffix)], dnl [name of the library of the component to check (without 'lib' prefix and without .a/.so suffix)], dnl [a C++ line of code that forces the test program to be linked against the component in order to work], dnl * [major-version.minor-version], dnl * [versionsym-prefix], dnl * [versionsym-postfix], dnl [action if found], dnl [action if not found]) dnl dnl Like AM_WXCODE_CHECKFOR_COMPONENT (the only new arguments it takes are marked dnl with *) but also includes a version check against the component to check for. dnl Note that the given version MUST be composed of three digits separed by a dot, dnl i.e. a string in form "1.2.3" which will be checked against the string dnl dnl [versionsym-prefix]MAJOR[versionsym-postfix].\ dnl [versionsym-prefix]MINOR[versionsym-postfix].\ dnl [versionsym-prefix]RELEASE[versionsym-postfix] dnl dnl where *MAJOR*, *MINOR* and *RELEASE* are three symbols which should have dnl been #defined in the compdef.h header file (see template/include/wx/mycompdef.h). dnl --------------------------------------------------------------------------- AC_DEFUN([AM_WXCODE_CHECKFOR_COMPONENT_VERSION], [ dnl break version string in single digits major=`echo $5 | sed 's/\([[0-9]]\).\([[0-9]]\).\([[0-9]]\)/\1/'` minor=`echo $5 | sed 's/\([[0-9]]\).\([[0-9]]\).\([[0-9]]\)/\2/'` release=`echo $5 | sed 's/\([[0-9]]\).\([[0-9]]\).\([[0-9]]\)/\3/'` dnl cache the symbol names majsym="$6""MAJOR""$7" minsym="$6""MINOR""$7" relsym="$6""RELEASE""$7" dnl call our base macro adding the version check COMPCHECK_MSG="if $1 (version >= $5) is available" AM_WXCODE_CHECKFOR_COMPONENT([$1], [$2], [$3], [ $4 // version check #if defined($majsym) && defined($minsym) && defined($relsym) #if ($majsym > ($major) || \ ($majsym == ($major) && $minsym > ($minor)) || \ ($majsym == ($major) && $minsym == ($minor) && $relsym >= ($release))) // this component is recent enough #else #error $1 is too old ! At least version $5 is required #endif #else #error $1 does not define its version symbols $majsym, $minsym, $relsym #endif ], [$8], [$9]) ]) |
|
From: John L. <jr...@us...> - 2007-07-26 19:36:04
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv16448/wxLua/modules/wxlua/src Modified Files: wxlbind.cpp wxlcallb.cpp wxlstate.cpp Log Message: Update authors to include John Labenski and Ray Gilbert Remove code attribution to LuaPlus since we don't use anything from it Code cleanup Index: wxlstate.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlstate.cpp,v retrieving revision 1.123 retrieving revision 1.124 diff -C2 -d -r1.123 -r1.124 *** wxlstate.cpp 22 Jul 2007 04:38:29 -0000 1.123 --- wxlstate.cpp 26 Jul 2007 18:56:39 -0000 1.124 *************** *** 7,27 **** ///////////////////////////////////////////////////////////////////////////// - /* **************************************************************************** - - Portions of code in this file have been taken from LuaPlus. - LuaPlus was written and maintained by Joshua Jensen (jj...@wo...) - and resides as http://wwhiz.com/LuaPlus/index.html . LuaPlus is distributed - with the Lua Licence as described below. - - Lua License - ----------- - Lua is licensed under the terms of the MIT license reproduced below. - This mean that Lua is free software and can be used for both academic and - commercial purposes at absolutely no cost. - - For details, see http://www.lua.org/license.html . - - **************************************************************************** */ - // For compilers that support precompilation, includes "wx/wx.h" #include "wx/wxprec.h" --- 7,10 ---- *************** *** 108,111 **** --- 91,96 ---- wxlState.SendEvent(event); } + else if (!msg.IsEmpty()) + wxPrintf(wxT("%s\n"), msg.c_str()); return 0; // no items put onto stack Index: wxlbind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlbind.cpp,v retrieving revision 1.87 retrieving revision 1.88 diff -C2 -d -r1.87 -r1.88 *** wxlbind.cpp 26 Jul 2007 02:51:37 -0000 1.87 --- wxlbind.cpp 26 Jul 2007 18:56:39 -0000 1.88 *************** *** 542,548 **** m_functionCount(0), m_functionArray(NULL), m_bindings_registered(false), ! m_startTag(0), ! m_lastTag(0), ! m_wxLuaTable(-1) { } --- 542,548 ---- m_functionCount(0), m_functionArray(NULL), m_bindings_registered(false), ! m_start_tag(0), ! m_last_tag(0), ! m_luaTable_tag(-1) { } *************** *** 638,642 **** // create a tag for the wxLua table if (registerTypes) ! m_wxLuaTable = wxlState.tnewtag(); // create the wxLua table --- 638,642 ---- // create a tag for the wxLua table if (registerTypes) ! m_luaTable_tag = wxlState.tnewtag(); // create the wxLua table *************** *** 645,652 **** // set the table tag ! wxlState.tsettag(m_wxLuaTable); // prevent changes from lua scripts ! //wxlState.tsettagmethod(m_wxLuaTable, "__newindex", wxlua_tableErrorHandler); // FIXME allow this? } else --- 645,652 ---- // set the table tag ! wxlState.tsettag(m_luaTable_tag); // prevent changes from lua scripts ! //wxlState.tsettagmethod(m_luaTable_tag, "__newindex", wxlua_tableErrorHandler); // FIXME allow this? } else *************** *** 658,662 **** wxLuaBinding* namedBinding = NULL; ! // find the m_wxLuaTable of the previously loaded binding (start at last) wxLuaBindingList::compatibility_iterator node = wxlState.GetLuaBindingList()->GetFirst(); for (; node; node = node->GetNext()) --- 658,662 ---- wxLuaBinding* namedBinding = NULL; ! // find the m_luaTable_tag of the previously loaded binding (start at last) wxLuaBindingList::compatibility_iterator node = wxlState.GetLuaBindingList()->GetFirst(); for (; node; node = node->GetNext()) *************** *** 664,673 **** wxLuaBinding* binding = node->GetData(); ! if ((binding->GetLuaNamespace() == m_nameSpace) && (binding->m_wxLuaTable >= 0)) namedBinding = binding; } if (namedBinding) ! m_wxLuaTable = namedBinding->m_wxLuaTable; } --- 664,673 ---- wxLuaBinding* binding = node->GetData(); ! if ((binding->GetLuaNamespace() == m_nameSpace) && (binding->m_luaTable_tag >= 0)) namedBinding = binding; } if (namedBinding) ! m_luaTable_tag = namedBinding->m_luaTable_tag; } *************** *** 699,705 **** if (registerTypes) ! m_startTag = wxlState.tnewtag(); ! int iTag = m_startTag; // install the classes, functions and methods, creating new tags --- 699,705 ---- if (registerTypes) ! m_start_tag = wxlState.tnewtag(); ! int iTag = m_start_tag; // install the classes, functions and methods, creating new tags *************** *** 871,875 **** } ! m_lastTag = iTag; // register all the builtin functions, global C style functions --- 871,875 ---- } ! m_last_tag = iTag; // register all the builtin functions, global C style functions *************** *** 929,936 **** return false; ! for (size_t n = 0; n < m_classCount; ++n) { - wxLuaBindClass* baseClass = m_classArray + n; // potential base class - if (strcmp(baseClass->name, wxlClass->baseclassName) == 0) { --- 929,935 ---- return false; ! wxLuaBindClass* baseClass = m_classArray; // potential base class ! for (size_t n = 0; n < m_classCount; ++n, ++baseClass) { if (strcmp(baseClass->name, wxlClass->baseclassName) == 0) { *************** *** 967,972 **** { int class_tag = class_tag_; ! wxLuaBindClass classItem = { 0, 0, 0, 0, 0, 0, 0, 0, 0 }; ! classItem.class_tag = &class_tag; // this relies on LUA allocating tags in ascending order of definition --- 966,971 ---- { int class_tag = class_tag_; ! wxLuaBindClass classItem = { 0, 0, 0, 0, &class_tag, 0, 0, 0, 0 }; ! //classItem.class_tag = &class_tag; // this relies on LUA allocating tags in ascending order of definition *************** *** 1064,1099 **** && (strcmp(wxlMethod->name, methodName) == 0)) { - /* // NOTE: This is now implemented in wxLuaState::RegisterBindings - - - // iterate through the base classes to find if this function is - // an overload, but only if we haven't checked already. - if (!WXLUA_HASBIT(wxlMethod->type, WXLUAMETHOD_OVERLOAD_BASE|WXLUAMETHOD_DELETE)) - { - wxLuaBindClass *baseClass = wxlClass->baseclass; - wxLuaBindMethod *parentMethod = wxlMethod; - - while (baseClass) - { - parentMethod->type |= WXLUAMETHOD_OVERLOAD_BASE; // have checked this - - wxLuaBindMethod* baseMethod = GetClassMethod(baseClass, methodName, false); - if (baseMethod) - { - if (!WXLUA_HASBIT(baseMethod->type, WXLUAMETHOD_DELETE)) - { - parentMethod->basemethod = baseMethod; - parentMethod = baseMethod; - } - - // we have already checked the base classes below this - if (WXLUA_HASBIT(baseMethod->type, WXLUAMETHOD_OVERLOAD_BASE)) - break; - } - - baseClass = baseClass->baseclass; - } - } - */ return wxlMethod; } --- 1063,1066 ---- Index: wxlcallb.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlcallb.cpp,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** wxlcallb.cpp 26 Jul 2007 02:51:37 -0000 1.34 --- wxlcallb.cpp 26 Jul 2007 18:56:39 -0000 1.35 *************** *** 2,6 **** // Name: wxlcallb.cpp // Purpose: wxLuaCallback and wxLuaWinDestroyCallback ! // Author: Francis Irving // Created: 11/05/2002 // Copyright: (c) 2002 Creature Labs. All rights reserved. --- 2,6 ---- // Name: wxlcallb.cpp // Purpose: wxLuaCallback and wxLuaWinDestroyCallback ! // Author: Francis Irving, John Labenski // Created: 11/05/2002 // Copyright: (c) 2002 Creature Labs. All rights reserved. |
|
From: John L. <jr...@us...> - 2007-07-26 19:35:54
|
Update of /cvsroot/wxlua/wxLua/modules/wxluadebug/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv16448/wxLua/modules/wxluadebug/include Modified Files: wxlstack.h Log Message: Update authors to include John Labenski and Ray Gilbert Remove code attribution to LuaPlus since we don't use anything from it Code cleanup Index: wxlstack.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/include/wxlstack.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** wxlstack.h 18 Jun 2007 14:55:05 -0000 1.4 --- wxlstack.h 26 Jul 2007 18:56:39 -0000 1.5 *************** *** 2,6 **** // Name: wxLuaStackTree.h // Purpose: Interface to display the lua stack in wxLua ! // Author: J. Winwood // Created: April 2002 // Copyright: (c) 2002. Lomtick Software. All rights reserved. --- 2,6 ---- // Name: wxLuaStackTree.h // Purpose: Interface to display the lua stack in wxLua ! // Author: J. Winwood, John Labenski // Created: April 2002 // Copyright: (c) 2002. Lomtick Software. All rights reserved. |
|
From: John L. <jr...@us...> - 2007-07-26 19:35:53
|
Update of /cvsroot/wxlua/wxLua/modules/wxluasocket/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv16448/wxLua/modules/wxluasocket/src Modified Files: wxldserv.cpp wxldtarg.cpp wxlsock.cpp Log Message: Update authors to include John Labenski and Ray Gilbert Remove code attribution to LuaPlus since we don't use anything from it Code cleanup Index: wxldtarg.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxldtarg.cpp,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** wxldtarg.cpp 16 Jun 2007 06:21:47 -0000 1.38 --- wxldtarg.cpp 26 Jul 2007 18:56:40 -0000 1.39 *************** *** 1,5 **** ///////////////////////////////////////////////////////////////////////////// // Purpose: Implements the client end of wxLua debugging session ! // Author: J. Winwood // Created: May 2002 // RCS-ID: $Id$ --- 1,5 ---- ///////////////////////////////////////////////////////////////////////////// // Purpose: Implements the client end of wxLua debugging session ! // Author: J. Winwood, John Labenski, Ray Gilbert // Created: May 2002 // RCS-ID: $Id$ Index: wxldserv.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxldserv.cpp,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -d -r1.45 -r1.46 *** wxldserv.cpp 16 Jun 2007 06:21:47 -0000 1.45 --- wxldserv.cpp 26 Jul 2007 18:56:40 -0000 1.46 *************** *** 1,6 **** ///////////////////////////////////////////////////////////////////////////// ! // Name: wxLuaDebuggerServer.cpp // Purpose: Provide remote debugging support for wxLua. ! // Author: J. Winwood // Created: May 2002. // Copyright: (c) 2002 Lomtick Software. All rights reserved. --- 1,6 ---- ///////////////////////////////////////////////////////////////////////////// ! // Name: wxldserv.cpp // Purpose: Provide remote debugging support for wxLua. ! // Author: J. Winwood, John Labenski, Ray Gilbert // Created: May 2002. // Copyright: (c) 2002 Lomtick Software. All rights reserved. *************** *** 104,108 **** { if (m_luaDebugger != NULL) ! m_luaDebugger->CleanupDebugReferences(); } --- 104,108 ---- { if (m_luaDebugger != NULL) ! m_luaDebugger->ClearDebugReferences(); } *************** *** 345,353 **** } ! bool wxLuaDebuggerBase::CleanupDebugReferences() { ! return CheckSocketConnected(true, wxT("Debugger CleanupDebugReferences")) && CheckSocketWrite( GetSocketBase()->WriteCmd(wxLUASOCKET_DEBUGGER_CMD_CLEAR_DEBUG_REFERENCES), ! wxT("Debugger CleanupDebugReferences")); } --- 345,353 ---- } ! bool wxLuaDebuggerBase::ClearDebugReferences() { ! return CheckSocketConnected(true, wxT("Debugger ClearDebugReferences")) && CheckSocketWrite( GetSocketBase()->WriteCmd(wxLUASOCKET_DEBUGGER_CMD_CLEAR_DEBUG_REFERENCES), ! wxT("Debugger ClearDebugReferences")); } Index: wxlsock.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxlsock.cpp,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** wxlsock.cpp 16 Jun 2007 06:21:47 -0000 1.30 --- wxlsock.cpp 26 Jul 2007 18:56:40 -0000 1.31 *************** *** 2,6 **** // Name: wxlsock.cpp // Purpose: Socket class for wxLua. ! // Author: J. Winwood // Created: February 2002 // Copyright: (c) 2002 Lomtick Software. All rights reserved. --- 2,6 ---- // Name: wxlsock.cpp // Purpose: Socket class for wxLua. ! // Author: J. Winwood, John Labenski, Ray Gilbert // Created: February 2002 // Copyright: (c) 2002 Lomtick Software. All rights reserved. *************** *** 49,52 **** --- 49,54 ---- "wxLUASOCKET_DEBUGGER_CMD_ADD_BREAKPOINT", "wxLUASOCKET_DEBUGGER_CMD_REMOVE_BREAKPOINT", + "wxLUASOCKET_DEBUGGER_CMD_DISABLE_BREAKPOINT", + "wxLUASOCKET_DEBUGGER_CMD_ENABLE_BREAKPOINT", "wxLUASOCKET_DEBUGGER_CMD_CLEAR_ALL_BREAKPOINTS", "wxLUASOCKET_DEBUGGER_CMD_RUN_BUFFER", *************** *** 56,67 **** "wxLUASOCKET_DEBUGGER_CMD_DEBUG_CONTINUE", "wxLUASOCKET_DEBUGGER_CMD_DEBUG_BREAK", "wxLUASOCKET_DEBUGGER_CMD_ENUMERATE_STACK", "wxLUASOCKET_DEBUGGER_CMD_ENUMERATE_STACK_ENTRY", "wxLUASOCKET_DEBUGGER_CMD_ENUMERATE_TABLE_REF", - "wxLUASOCKET_DEBUGGER_CMD_EVALUATE_EXPR", - "wxLUASOCKET_DEBUGGER_CMD_RESET", "wxLUASOCKET_DEBUGGER_CMD_CLEAR_DEBUG_REFERENCES", ! "wxLUASOCKET_DEBUGGER_CMD_DISABLE_BREAKPOINT", ! "wxLUASOCKET_DEBUGGER_CMD_ENABLE_BREAKPOINT" }; --- 58,67 ---- "wxLUASOCKET_DEBUGGER_CMD_DEBUG_CONTINUE", "wxLUASOCKET_DEBUGGER_CMD_DEBUG_BREAK", + "wxLUASOCKET_DEBUGGER_CMD_RESET", "wxLUASOCKET_DEBUGGER_CMD_ENUMERATE_STACK", "wxLUASOCKET_DEBUGGER_CMD_ENUMERATE_STACK_ENTRY", "wxLUASOCKET_DEBUGGER_CMD_ENUMERATE_TABLE_REF", "wxLUASOCKET_DEBUGGER_CMD_CLEAR_DEBUG_REFERENCES", ! "wxLUASOCKET_DEBUGGER_CMD_EVALUATE_EXPR", }; |
|
From: John L. <jr...@us...> - 2007-07-26 18:58:44
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv16448/wxLua/modules/wxlua/include Modified Files: wxlbind.h wxlcallb.h wxlstate.h Log Message: Update authors to include John Labenski and Ray Gilbert Remove code attribution to LuaPlus since we don't use anything from it Code cleanup Index: wxlcallb.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlcallb.h,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** wxlcallb.h 26 Jul 2007 02:51:37 -0000 1.17 --- wxlcallb.h 26 Jul 2007 18:56:38 -0000 1.18 *************** *** 2,6 **** // Name: wxlcallb.h // Purpose: wxLuaCallback and wxLuaWinDestroyCallback ! // Author: Francis Irving // Created: 21/01/2002 // Copyright: (c) 2002 Creature Labs. All rights reserved. --- 2,6 ---- // Name: wxlcallb.h // Purpose: wxLuaCallback and wxLuaWinDestroyCallback ! // Author: Francis Irving, John Labenski // Created: 21/01/2002 // Copyright: (c) 2002 Creature Labs. All rights reserved. Index: wxlbind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlbind.h,v retrieving revision 1.56 retrieving revision 1.57 diff -C2 -d -r1.56 -r1.57 *** wxlbind.h 26 Jul 2007 02:51:37 -0000 1.56 --- wxlbind.h 26 Jul 2007 18:56:38 -0000 1.57 *************** *** 393,402 **** // Is this tag defined as something in this binding? ! bool IsTag(int tag) { return (tag >= m_startTag) && (tag <= m_lastTag); } // Look for the base class of the input wxLuaBindClass in this binding using the // baseclassName of the input and if found, set the wxLuaBindClass::baseclass ! // member of the input. This function is called by the wxLuaState during ! // creation and should not be called afterwards. bool SetBaseClass(wxLuaBindClass *pClass); --- 393,402 ---- // Is this tag defined as something in this binding? ! bool IsTag(int tag) { return (tag >= m_start_tag) && (tag <= m_last_tag); } // Look for the base class of the input wxLuaBindClass in this binding using the // baseclassName of the input and if found, set the wxLuaBindClass::baseclass ! // member of the input. ! // This is called by the wxLuaState during creation and should not be called afterwards. bool SetBaseClass(wxLuaBindClass *pClass); *************** *** 468,474 **** wxString m_nameSpace; // lua table namespace e.g. "wx" bool m_bindings_registered; // Is the binding registered ! int m_startTag; // The first wxLua allocated lua tag ! int m_lastTag; // The last wxLua lua tag of registered classes ! int m_wxLuaTable; // The lua tag for the wxLua private tables static wxLuaBindingList sm_bindingList; --- 468,474 ---- wxString m_nameSpace; // lua table namespace e.g. "wx" bool m_bindings_registered; // Is the binding registered ! int m_start_tag; // The first wxLua allocated lua tag ! int m_last_tag; // The last wxLua lua tag of registered classes ! int m_luaTable_tag; // The lua tag for the wxLua private tables static wxLuaBindingList sm_bindingList; Index: wxlstate.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlstate.h,v retrieving revision 1.87 retrieving revision 1.88 diff -C2 -d -r1.87 -r1.88 *** wxlstate.h 22 Jul 2007 04:38:29 -0000 1.87 --- wxlstate.h 26 Jul 2007 18:56:38 -0000 1.88 *************** *** 7,27 **** ///////////////////////////////////////////////////////////////////////////// - /* **************************************************************************** - - Portions of code in this file have been taken from LuaPlus. - LuaPlus was written and maintained by Joshua Jensen (jj...@wo...) - and resides as http://wwhiz.com/LuaPlus/index.html . LuaPlus is distributed - with the Lua Licence as described below. - - Lua License - ----------- - Lua is licensed under the terms of the MIT license reproduced below. - This mean that Lua is free software and can be used for both academic and - commercial purposes at absolutely no cost. - - For details, see http://www.lua.org/license.html . - - **************************************************************************** */ - #ifndef _WXLSTATE_H_ #define _WXLSTATE_H_ --- 7,10 ---- |
|
From: John L. <jr...@us...> - 2007-07-26 18:58:42
|
Update of /cvsroot/wxlua/wxLua/modules/wxluasocket/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv16448/wxLua/modules/wxluasocket/include Modified Files: wxldserv.h wxldtarg.h wxlsock.h Log Message: Update authors to include John Labenski and Ray Gilbert Remove code attribution to LuaPlus since we don't use anything from it Code cleanup Index: wxldserv.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/include/wxldserv.h,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** wxldserv.h 16 Jun 2007 06:21:47 -0000 1.37 --- wxldserv.h 26 Jul 2007 18:56:39 -0000 1.38 *************** *** 1,5 **** ///////////////////////////////////////////////////////////////////////////// // Purpose: Implements the debugger end of wxLua debugging session ! // Author: J. Winwood // Created: May 2002 // Copyright: (c) 2002 Lomtick Software. All rights reserved. --- 1,5 ---- ///////////////////////////////////////////////////////////////////////////// // Purpose: Implements the debugger end of wxLua debugging session ! // Author: J. Winwood, John Labenski, Ray Gilbert // Created: May 2002 // Copyright: (c) 2002 Lomtick Software. All rights reserved. *************** *** 66,69 **** --- 66,71 ---- wxLUASOCKET_DEBUGGER_CMD_ADD_BREAKPOINT = 100, // shifted for debugging wxLUASOCKET_DEBUGGER_CMD_REMOVE_BREAKPOINT, + wxLUASOCKET_DEBUGGER_CMD_DISABLE_BREAKPOINT, + wxLUASOCKET_DEBUGGER_CMD_ENABLE_BREAKPOINT, wxLUASOCKET_DEBUGGER_CMD_CLEAR_ALL_BREAKPOINTS, wxLUASOCKET_DEBUGGER_CMD_RUN_BUFFER, *************** *** 73,84 **** wxLUASOCKET_DEBUGGER_CMD_DEBUG_CONTINUE, wxLUASOCKET_DEBUGGER_CMD_DEBUG_BREAK, wxLUASOCKET_DEBUGGER_CMD_ENUMERATE_STACK, wxLUASOCKET_DEBUGGER_CMD_ENUMERATE_STACK_ENTRY, wxLUASOCKET_DEBUGGER_CMD_ENUMERATE_TABLE_REF, - wxLUASOCKET_DEBUGGER_CMD_EVALUATE_EXPR, - wxLUASOCKET_DEBUGGER_CMD_RESET, wxLUASOCKET_DEBUGGER_CMD_CLEAR_DEBUG_REFERENCES, ! wxLUASOCKET_DEBUGGER_CMD_DISABLE_BREAKPOINT, ! wxLUASOCKET_DEBUGGER_CMD_ENABLE_BREAKPOINT }; --- 75,84 ---- wxLUASOCKET_DEBUGGER_CMD_DEBUG_CONTINUE, wxLUASOCKET_DEBUGGER_CMD_DEBUG_BREAK, + wxLUASOCKET_DEBUGGER_CMD_RESET, wxLUASOCKET_DEBUGGER_CMD_ENUMERATE_STACK, wxLUASOCKET_DEBUGGER_CMD_ENUMERATE_STACK_ENTRY, wxLUASOCKET_DEBUGGER_CMD_ENUMERATE_TABLE_REF, wxLUASOCKET_DEBUGGER_CMD_CLEAR_DEBUG_REFERENCES, ! wxLUASOCKET_DEBUGGER_CMD_EVALUATE_EXPR, }; *************** *** 181,185 **** bool EnumerateStackEntry(int stackEntry); bool EnumerateTable(int tableRef, int nIndex, long nItemNode); ! bool CleanupDebugReferences(); bool EvaluateExpr(int exprRef, const wxString &strExpression); --- 181,185 ---- bool EnumerateStackEntry(int stackEntry); bool EnumerateTable(int tableRef, int nIndex, long nItemNode); ! bool ClearDebugReferences(); bool EvaluateExpr(int exprRef, const wxString &strExpression); Index: wxlsock.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/include/wxlsock.h,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** wxlsock.h 21 May 2007 01:08:00 -0000 1.22 --- wxlsock.h 26 Jul 2007 18:56:40 -0000 1.23 *************** *** 2,6 **** // Name: wxlsock.h // Purpose: wxLua Socket interfaces ! // Author: J. Winwood // Created: March 2002 // Copyright: (c) 2002 Lomtick Software. All rights reserved. --- 2,6 ---- // Name: wxlsock.h // Purpose: wxLua Socket interfaces ! // Author: J. Winwood, John Labenski, Ray Gilbert // Created: March 2002 // Copyright: (c) 2002 Lomtick Software. All rights reserved. Index: wxldtarg.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/include/wxldtarg.h,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** wxldtarg.h 23 May 2007 02:48:31 -0000 1.23 --- wxldtarg.h 26 Jul 2007 18:56:40 -0000 1.24 *************** *** 1,5 **** ///////////////////////////////////////////////////////////////////////////// // Purpose: Implements the client end of wxLua debugging session ! // Author: J. Winwood // Created: May 2002 // RCS-ID: $Id$ --- 1,5 ---- ///////////////////////////////////////////////////////////////////////////// // Purpose: Implements the client end of wxLua debugging session ! // Author: J. Winwood, John Labenski, Ray Gilbert // Created: May 2002 // RCS-ID: $Id$ |
|
From: John L. <jr...@us...> - 2007-07-26 18:58:42
|
Update of /cvsroot/wxlua/wxLua/samples In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv16448/wxLua/samples Modified Files: wxluasudoku.wx.lua Log Message: Update authors to include John Labenski and Ray Gilbert Remove code attribution to LuaPlus since we don't use anything from it Code cleanup Index: wxluasudoku.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/wxluasudoku.wx.lua,v retrieving revision 1.73 retrieving revision 1.74 diff -C2 -d -r1.73 -r1.74 *** wxluasudoku.wx.lua 16 Jul 2007 19:35:32 -0000 1.73 --- wxluasudoku.wx.lua 26 Jul 2007 18:56:40 -0000 1.74 *************** *** 1725,1729 **** <ul> ! <li><b>New...</b> : Clear to whole puzzle to an uninitialized state so that you can then "Create" it from scratch. --- 1725,1729 ---- <ul> ! <li><b>New...</b> : Clear the whole puzzle to an uninitialized state so that you can then "Create" it from scratch. *************** *** 1763,1767 **** <ul> ! <li>After opening the program will try to solve the puzzle and let you know if there is a problem, such as a non unique solution. You can just cancel out if you'd like to skip this check. --- 1763,1767 ---- <ul> ! <li>After opening, the program will try to solve the puzzle and let you know if there is a problem, such as a non unique solution. You can just cancel out if you'd like to skip this check. |
|
From: John L. <jr...@us...> - 2007-07-26 18:58:42
|
Update of /cvsroot/wxlua/wxLua/modules/wxluadebug/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv16448/wxLua/modules/wxluadebug/src Modified Files: wxldebug.cpp wxlstack.cpp Log Message: Update authors to include John Labenski and Ray Gilbert Remove code attribution to LuaPlus since we don't use anything from it Code cleanup Index: wxlstack.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/src/wxlstack.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** wxlstack.cpp 19 Jul 2007 03:09:47 -0000 1.12 --- wxlstack.cpp 26 Jul 2007 18:56:39 -0000 1.13 *************** *** 2,6 **** // Name: StackTree.cpp // Purpose: Display the lua stack in a dialog. ! // Author: J. Winwood // Created: February 2002 // Copyright: (c) 2002 Lomtick Software. All rights reserved. --- 2,6 ---- // Name: StackTree.cpp // Purpose: Display the lua stack in a dialog. ! // Author: J. Winwood, John Labenski // Created: February 2002 // Copyright: (c) 2002 Lomtick Software. All rights reserved. Index: wxldebug.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/src/wxldebug.cpp,v retrieving revision 1.39 retrieving revision 1.40 diff -C2 -d -r1.39 -r1.40 *** wxldebug.cpp 19 Jul 2007 03:09:47 -0000 1.39 --- wxldebug.cpp 26 Jul 2007 18:56:39 -0000 1.40 *************** *** 2,6 **** // Name: wxLuaDebug.cpp // Purpose: Debugging I/O functions for wxLua ! // Author: J. Winwood, Ray Gilbert // Created: May 2002 // Copyright: (c) 2002 Lomtick Software. All rights reserved. --- 2,6 ---- // Name: wxLuaDebug.cpp // Purpose: Debugging I/O functions for wxLua ! // Author: J. Winwood, Ray Gilbert, John Labenski // Created: May 2002 // Copyright: (c) 2002 Lomtick Software. All rights reserved. |
|
From: John L. <jr...@us...> - 2007-07-26 02:51:42
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv1312/wxLua/modules/wxlua/src Modified Files: wxlbind.cpp wxlcallb.cpp Log Message: Update comments Index: wxlbind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlbind.cpp,v retrieving revision 1.86 retrieving revision 1.87 diff -C2 -d -r1.86 -r1.87 *** wxlbind.cpp 22 Jul 2007 04:38:29 -0000 1.86 --- wxlbind.cpp 26 Jul 2007 02:51:37 -0000 1.87 *************** *** 266,270 **** // If the method is a function method push a wxLuaFunction object // onto the lua stack, setting its metatable so that when lua calls __call ! // the wxLuaFunction will run it. // ---------------------------------------------------------------------------- --- 266,270 ---- // If the method is a function method push a wxLuaFunction object // onto the lua stack, setting its metatable so that when lua calls __call ! // the wxLuaFunction will run the actual method we set for it. // ---------------------------------------------------------------------------- *************** *** 530,534 **** // ---------------------------------------------------------------------------- ! IMPLEMENT_DYNAMIC_CLASS(wxLuaBinding, wxObject) wxLuaBindingList wxLuaBinding::sm_bindingList; --- 530,534 ---- // ---------------------------------------------------------------------------- ! IMPLEMENT_ABSTRACT_CLASS(wxLuaBinding, wxObject) wxLuaBindingList wxLuaBinding::sm_bindingList; *************** *** 560,564 **** { // Also sort the member functions for each class ! qsort(wxlClass->methods, wxlClass->methods_n, sizeof(wxLuaBindMethod), wxLuaBindMethodArrayCompareFnInit); // And their enums if (wxlClass->enums && (wxlClass->enums_n > 0)) --- 560,565 ---- { // Also sort the member functions for each class ! if (wxlClass->methods && (wxlClass->methods_n > 0)) ! qsort(wxlClass->methods, wxlClass->methods_n, sizeof(wxLuaBindMethod), wxLuaBindMethodArrayCompareFnInit); // And their enums if (wxlClass->enums && (wxlClass->enums_n > 0)) Index: wxlcallb.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlcallb.cpp,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** wxlcallb.cpp 19 Jul 2007 03:09:46 -0000 1.33 --- wxlcallb.cpp 26 Jul 2007 02:51:37 -0000 1.34 *************** *** 32,36 **** m_evtHandler(evtHandler), m_id(winId), m_lastId(lastId), m_wxlBindEvent(NULL) ! //m_eventType(eventType) { wxCHECK_RET(m_wxlState.Ok(), wxT("Invalid wxLuaState")); --- 32,36 ---- m_evtHandler(evtHandler), m_id(winId), m_lastId(lastId), m_wxlBindEvent(NULL) ! { wxCHECK_RET(m_wxlState.Ok(), wxT("Invalid wxLuaState")); |
|
From: John L. <jr...@us...> - 2007-07-26 02:51:41
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv1312/wxLua/modules/wxlua/include Modified Files: wxlbind.h wxlcallb.h Log Message: Update comments Index: wxlcallb.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlcallb.h,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** wxlcallb.h 12 Jun 2007 00:08:42 -0000 1.16 --- wxlcallb.h 26 Jul 2007 02:51:37 -0000 1.17 *************** *** 16,24 **** // ---------------------------------------------------------------------------- // wxLuaCallback - Forward events from C++ wxWidgets wxEvtHandlers to lua functions ! // // The wxLuaCallback is created with the wxLuaState, the stack index of the ! // lua function to call when an event is received, the window id ranges, and ! // the wxEventType to connect to the wxEvtHandler with this as the callback ! // user data for event. // // Do NOT delete this, the wxEvtHandler deletes the callback user data itself. --- 16,24 ---- // ---------------------------------------------------------------------------- // wxLuaCallback - Forward events from C++ wxWidgets wxEvtHandlers to lua functions ! // // The wxLuaCallback is created with the wxLuaState, the stack index of the ! // lua function to call when an event is received, the window id ranges, and ! // the wxEventType to connect to the wxEvtHandler with this as the callback ! // user data for event. // // Do NOT delete this, the wxEvtHandler deletes the callback user data itself. *************** *** 50,62 **** // Central event handler that calls CallFunction() for the actual ! // wxLuaCallback callback user data. This function is treated like a // static function that all handlers of this class will call. void EventHandler(wxEvent& event); ! // Handle the event by calling the lua function to handle the event. // The lua function will receive a single parameter, the type of event. virtual void CallFunction(wxEvent *event); ! protected: int m_routine; // ref to the lua routine to call in the wxLuaReferences registry table wxLuaState m_wxlState; // store it since we're added to a list of it's callbacks. --- 50,62 ---- // Central event handler that calls CallFunction() for the actual ! // wxLuaCallback callback user data. This function is treated like a // static function that all handlers of this class will call. void EventHandler(wxEvent& event); ! // Handle the event by calling the lua function to handle the event. // The lua function will receive a single parameter, the type of event. virtual void CallFunction(wxEvent *event); ! protected: int m_routine; // ref to the lua routine to call in the wxLuaReferences registry table wxLuaState m_wxlState; // store it since we're added to a list of it's callbacks. *************** *** 71,75 **** // ---------------------------------------------------------------------------- ! // wxLuaWinDestroyCallback - Handle the wxEVT_DESTROY event from wxWindows. // // Removes the reference to the window so lua won't delete it. --- 71,75 ---- // ---------------------------------------------------------------------------- ! // wxLuaWinDestroyCallback - Handle the wxEVT_DESTROY event from wxWindows. // // Removes the reference to the window so lua won't delete it. *************** *** 97,104 **** void EventHandler(wxWindowDestroyEvent& event); ! // Handle the event by clearing the metatable for the window virtual void OnDestroy(wxWindowDestroyEvent& event); ! protected: wxLuaState m_wxlState; // store it since we're added to a list of it's callbacks. wxEvtHandler* m_evtHandler; --- 97,104 ---- void EventHandler(wxWindowDestroyEvent& event); ! // Handle the event by clearing the metatable for the window virtual void OnDestroy(wxWindowDestroyEvent& event); ! protected: wxLuaState m_wxlState; // store it since we're added to a list of it's callbacks. wxEvtHandler* m_evtHandler; Index: wxlbind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlbind.h,v retrieving revision 1.55 retrieving revision 1.56 diff -C2 -d -r1.55 -r1.56 *** wxlbind.h 25 Jun 2007 23:04:00 -0000 1.55 --- wxlbind.h 26 Jul 2007 02:51:37 -0000 1.56 *************** *** 116,122 **** int maxargs; // total number of args allowed wxLuaArgTag* argtags; // array of lua tags representing each argument, zero terminated ! // NOTE: there may less argtags than maxargs if this is an // overloaded function since the argtags == s_wxluaargArray_None ! // but the maxargs is the maxargs of all the overloaded functions }; --- 116,122 ---- int maxargs; // total number of args allowed wxLuaArgTag* argtags; // array of lua tags representing each argument, zero terminated ! // NOTE: there may be less argtags than minargs if this is an // overloaded function since the argtags == s_wxluaargArray_None ! // but the minargs are the min of minargs of all the overloaded functions }; *************** *** 194,199 **** void *GetObject() const { return m_pObject; } ! wxLuaBindMethod *m_wxlMethod; ! void *m_pObject; }; --- 194,199 ---- void *GetObject() const { return m_pObject; } ! wxLuaBindMethod *m_wxlMethod; // Method to call for Lua's __call ! void *m_pObject; // the actual object wrapped by a Lua userdata }; *************** *** 257,265 **** private: ! wxLuaState* m_wxlState; // a pointer due to include recursion. ! int m_reference; ! wxLuaObject_Type m_alloc_flag; ! union { bool m_bool; --- 257,266 ---- private: ! wxLuaState* m_wxlState; // a pointer due to include recursion. ! int m_reference; // reference in wxLuaReferences registry table ! wxLuaObject_Type m_alloc_flag; // type of object for wxValidator interface ! ! union // object stored for wxValidator interface { bool m_bool; *************** *** 396,400 **** // Look for the base class of the input wxLuaBindClass in this binding using the // baseclassName of the input and if found, set the wxLuaBindClass::baseclass ! // member of the input. bool SetBaseClass(wxLuaBindClass *pClass); --- 397,402 ---- // Look for the base class of the input wxLuaBindClass in this binding using the // baseclassName of the input and if found, set the wxLuaBindClass::baseclass ! // member of the input. This function is called by the wxLuaState during ! // creation and should not be called afterwards. bool SetBaseClass(wxLuaBindClass *pClass); *************** *** 472,476 **** static wxLuaBindingList sm_bindingList; ! DECLARE_DYNAMIC_CLASS(wxLuaBinding) }; --- 474,478 ---- static wxLuaBindingList sm_bindingList; ! DECLARE_ABSTRACT_CLASS(wxLuaBinding) }; |
|
From: John L. <jr...@us...> - 2007-07-22 04:39:04
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv12109/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: Add parameter to wxLuaState::RemoveTrackedObject to select how we untrack it Fixes removing derived methods for the %ungc binding tag Index: wxadv_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxadv_bind.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** wxadv_bind.h 17 Jul 2007 03:30:22 -0000 1.2 --- wxadv_bind.h 22 Jul 2007 04:38:28 -0000 1.3 *************** *** 21,27 **** // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 15 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 15 // --------------------------------------------------------------------------- --- 21,27 ---- // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 16 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 16 // --------------------------------------------------------------------------- Index: wxcore_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxcore_bind.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** wxcore_bind.h 17 Jul 2007 03:30:22 -0000 1.2 --- wxcore_bind.h 22 Jul 2007 04:38:28 -0000 1.3 *************** *** 38,44 **** // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 15 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 15 // --------------------------------------------------------------------------- --- 38,44 ---- // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 16 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 16 // --------------------------------------------------------------------------- Index: wxrichtext_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxrichtext_bind.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** wxrichtext_bind.h 17 Jul 2007 03:30:22 -0000 1.2 --- wxrichtext_bind.h 22 Jul 2007 04:38:28 -0000 1.3 *************** *** 21,27 **** // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 15 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 15 // --------------------------------------------------------------------------- --- 21,27 ---- // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 16 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 16 // --------------------------------------------------------------------------- Index: wxxrc_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxxrc_bind.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** wxxrc_bind.h 17 Jul 2007 03:30:22 -0000 1.2 --- wxxrc_bind.h 22 Jul 2007 04:38:28 -0000 1.3 *************** *** 21,27 **** // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 15 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 15 // --------------------------------------------------------------------------- --- 21,27 ---- // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 16 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 16 // --------------------------------------------------------------------------- Index: wxnet_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxnet_bind.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** wxnet_bind.h 17 Jul 2007 03:30:22 -0000 1.2 --- wxnet_bind.h 22 Jul 2007 04:38:28 -0000 1.3 *************** *** 21,27 **** // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 15 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 15 // --------------------------------------------------------------------------- --- 21,27 ---- // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 16 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 16 // --------------------------------------------------------------------------- Index: wxbase_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxbase_bind.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** wxbase_bind.h 17 Jul 2007 03:30:22 -0000 1.2 --- wxbase_bind.h 22 Jul 2007 04:38:28 -0000 1.3 *************** *** 20,26 **** // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 15 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 15 // --------------------------------------------------------------------------- --- 20,26 ---- // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 16 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 16 // --------------------------------------------------------------------------- Index: wxmedia_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxmedia_bind.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** wxmedia_bind.h 17 Jul 2007 03:30:22 -0000 1.2 --- wxmedia_bind.h 22 Jul 2007 04:38:28 -0000 1.3 *************** *** 22,28 **** // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 15 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 15 // --------------------------------------------------------------------------- --- 22,28 ---- // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 16 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 16 // --------------------------------------------------------------------------- Index: wxgl_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxgl_bind.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** wxgl_bind.h 17 Jul 2007 03:30:22 -0000 1.2 --- wxgl_bind.h 22 Jul 2007 04:38:28 -0000 1.3 *************** *** 21,27 **** // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 15 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 15 // --------------------------------------------------------------------------- --- 21,27 ---- // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 16 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 16 // --------------------------------------------------------------------------- Index: wxstc_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxstc_bind.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** wxstc_bind.h 17 Jul 2007 03:30:22 -0000 1.2 --- wxstc_bind.h 22 Jul 2007 04:38:28 -0000 1.3 *************** *** 21,27 **** // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 15 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 15 // --------------------------------------------------------------------------- --- 21,27 ---- // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 16 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 16 // --------------------------------------------------------------------------- Index: wxaui_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxaui_bind.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** wxaui_bind.h 17 Jul 2007 03:30:22 -0000 1.2 --- wxaui_bind.h 22 Jul 2007 04:38:28 -0000 1.3 *************** *** 21,27 **** // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 15 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 15 // --------------------------------------------------------------------------- --- 21,27 ---- // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 16 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 16 // --------------------------------------------------------------------------- Index: wxhtml_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxhtml_bind.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** wxhtml_bind.h 17 Jul 2007 03:30:22 -0000 1.2 --- wxhtml_bind.h 22 Jul 2007 04:38:28 -0000 1.3 *************** *** 21,27 **** // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 15 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 15 // --------------------------------------------------------------------------- --- 21,27 ---- // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 16 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 16 // --------------------------------------------------------------------------- Index: wxxml_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxxml_bind.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** wxxml_bind.h 17 Jul 2007 03:30:22 -0000 1.2 --- wxxml_bind.h 22 Jul 2007 04:38:28 -0000 1.3 *************** *** 21,27 **** // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 15 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 15 // --------------------------------------------------------------------------- --- 21,27 ---- // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 16 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 16 // --------------------------------------------------------------------------- |
|
From: John L. <jr...@us...> - 2007-07-22 04:39:02
|
Update of /cvsroot/wxlua/wxLua/apps/wxluacan/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv12109/wxLua/apps/wxluacan/src Modified Files: wxluacan.h Log Message: Add parameter to wxLuaState::RemoveTrackedObject to select how we untrack it Fixes removing derived methods for the %ungc binding tag Index: wxluacan.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/wxluacan.h,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** wxluacan.h 16 Jul 2007 19:34:12 -0000 1.32 --- wxluacan.h 22 Jul 2007 04:38:27 -0000 1.33 *************** *** 18,24 **** // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 15 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 15 // --------------------------------------------------------------------------- --- 18,24 ---- // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 16 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 16 // --------------------------------------------------------------------------- |
|
From: John L. <jr...@us...> - 2007-07-22 04:39:02
|
Update of /cvsroot/wxlua/wxLua/build In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv12109/wxLua/build Modified Files: Makefile_wx-config.in Log Message: Add parameter to wxLuaState::RemoveTrackedObject to select how we untrack it Fixes removing derived methods for the %ungc binding tag Index: Makefile_wx-config.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/Makefile_wx-config.in,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Makefile_wx-config.in 16 Jul 2007 19:34:28 -0000 1.2 --- Makefile_wx-config.in 22 Jul 2007 04:38:28 -0000 1.3 *************** *** 84,87 **** --- 84,88 ---- WXLUABINDALL_LIBS = -l$(WXLUABINDXRC_LIB) -l$(WXLUABINDXML_LIB) -l$(WXLUABINDSTC_LIB) -l$(WXLUABINDRICHTEXT_LIB) -l$(WXLUABINDNET_LIB) -l$(WXLUABINDMEDIA_LIB) -l$(WXLUABINDHTML_LIB) -l$(WXLUABINDGL_LIB) -l$(WXLUABINDCORE_LIB) -l$(WXLUABINDBASE_LIB) -l$(WXLUABINDAUI_LIB) -l$(WXLUABINDADV_LIB) + WXLUABINDSTD_LIBS = -l$(WXLUABINDNET_LIB) -l$(WXLUABINDCORE_LIB) -l$(WXLUABINDBASE_LIB) -l$(WXLUABINDADV_LIB) # ---------------------------------------------------------------------------- |
|
From: John L. <jr...@us...> - 2007-07-22 04:39:02
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv12109/wxLua/bindings/wxwidgets Modified Files: wxbase_override.hpp wxcore_override.hpp Log Message: Add parameter to wxLuaState::RemoveTrackedObject to select how we untrack it Fixes removing derived methods for the %ungc binding tag Index: wxbase_override.hpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxbase_override.hpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** wxbase_override.hpp 16 Jul 2007 19:34:24 -0000 1.1 --- wxbase_override.hpp 22 Jul 2007 04:38:28 -0000 1.2 *************** *** 180,184 **** // we may not be tracked, but delete us anyway ! if (!wxlState.RemoveTrackedObject(self)) delete self; --- 180,184 ---- // we may not be tracked, but delete us anyway ! if (!wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS)) delete self; Index: wxcore_override.hpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxcore_override.hpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** wxcore_override.hpp 16 Jul 2007 19:34:25 -0000 1.1 --- wxcore_override.hpp 22 Jul 2007 04:38:28 -0000 1.2 *************** *** 2438,2443 **** // we must disconnect them from our tracking list if (printoutForPrinting != NULL) ! wxlState.RemoveTrackedObject(printoutForPrinting, false); ! wxlState.RemoveTrackedObject(printout, false); // call constructor --- 2438,2443 ---- // we must disconnect them from our tracking list if (printoutForPrinting != NULL) ! wxlState.RemoveTrackedObject(printoutForPrinting, wxLuaState::UNDELETE); ! wxlState.RemoveTrackedObject(printout, wxLuaState::UNDELETE); // call constructor |
|
From: John L. <jr...@us...> - 2007-07-22 04:39:01
|
Update of /cvsroot/wxlua/wxLua/bindings In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv12109/wxLua/bindings Modified Files: genwxbind.lua Log Message: Add parameter to wxLuaState::RemoveTrackedObject to select how we untrack it Fixes removing derived methods for the %ungc binding tag Index: genwxbind.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.lua,v retrieving revision 1.144 retrieving revision 1.145 diff -C2 -d -r1.144 -r1.145 *** genwxbind.lua 16 Jul 2007 19:34:13 -0000 1.144 --- genwxbind.lua 22 Jul 2007 04:38:27 -0000 1.145 *************** *** 18,22 **** -- --------------------------------------------------------------------------- ! WXLUA_BINDING_VERSION = 15 -- Used to verify that the bindings are updated -- This must match modules/wxlua/include/wxldefs.h -- otherwise a compile time error will be generated. --- 18,22 ---- -- --------------------------------------------------------------------------- ! WXLUA_BINDING_VERSION = 16 -- Used to verify that the bindings are updated -- This must match modules/wxlua/include/wxldefs.h -- otherwise a compile time error will be generated. *************** *** 3246,3250 **** end elseif param.UnGC then ! table.insert(gcList, " if (wxlState.IsTrackedObject("..argName..")) wxlState.RemoveTrackedObject("..argName..", false);\n") end --- 3246,3250 ---- end elseif param.UnGC then ! table.insert(gcList, " if (wxlState.IsTrackedObject("..argName..")) wxlState.RemoveTrackedObject("..argName..", wxLuaState::UNDELETE);\n") end *************** *** 3585,3589 **** if parseObject.UnGCThis then ! table.insert(codeList, " wxlState.RemoveTrackedObject(self, false);\n") elseif parseObject.GCThis then if parseObject.Encapsulate then --- 3585,3589 ---- if parseObject.UnGCThis then ! table.insert(codeList, " wxlState.RemoveTrackedObject(self, wxLuaState::UNDELETE);\n") elseif parseObject.GCThis then if parseObject.Encapsulate then *************** *** 3665,3669 **** end elseif member.UnGC then ! table.insert(codeList, " if (wxlState.IsTrackedObject(returns)) wxlState.RemoveTrackedObject(returns, false);\n") end --- 3665,3669 ---- end elseif member.UnGC then ! table.insert(codeList, " if (wxlState.IsTrackedObject(returns)) wxlState.RemoveTrackedObject(returns, wxLuaState::UNDELETE);\n") end *************** *** 3836,3840 **** table.insert(codeList, " "..parseObject.Name.." * self = ("..parseObject.Name.." *)wxlState.GetUserDataType(1, s_wxluatag_"..MakeClassVar(parseObject.Name)..");\n") CommentBindingTable(codeList, " // if removed from tracked mem list, reset the tag so that gc() is not called on this object.\n") ! table.insert(codeList, " if ((self != NULL) && wxlState.RemoveTrackedObject(self))\n") table.insert(codeList, " {\n") table.insert(codeList, " lua_pushnil(L);\n") --- 3836,3840 ---- table.insert(codeList, " "..parseObject.Name.." * self = ("..parseObject.Name.." *)wxlState.GetUserDataType(1, s_wxluatag_"..MakeClassVar(parseObject.Name)..");\n") CommentBindingTable(codeList, " // if removed from tracked mem list, reset the tag so that gc() is not called on this object.\n") ! table.insert(codeList, " if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))\n") table.insert(codeList, " {\n") table.insert(codeList, " lua_pushnil(L);\n") |
|
From: John L. <jr...@us...> - 2007-07-22 04:38:37
|
Update of /cvsroot/wxlua/wxLua/modules/wxluasocket/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv12109/wxLua/modules/wxluasocket/src Modified Files: wxluasocket.cpp Log Message: Add parameter to wxLuaState::RemoveTrackedObject to select how we untrack it Fixes removing derived methods for the %ungc binding tag Index: wxluasocket.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxluasocket.cpp,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** wxluasocket.cpp 14 Jun 2007 23:59:48 -0000 1.29 --- wxluasocket.cpp 22 Jul 2007 04:38:30 -0000 1.30 *************** *** 390,394 **** wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerServer); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self)) { lua_pushnil(L); --- 390,394 ---- wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerServer); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS)) { lua_pushnil(L); *************** *** 537,541 **** wxLuaDebuggerEvent * self = (wxLuaDebuggerEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerEvent); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self)) { lua_pushnil(L); --- 537,541 ---- wxLuaDebuggerEvent * self = (wxLuaDebuggerEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerEvent); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS)) { lua_pushnil(L); |
|
From: John L. <jr...@us...> - 2007-07-22 04:38:37
|
Update of /cvsroot/wxlua/wxLua/modules/wxluasocket/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv12109/wxLua/modules/wxluasocket/include Modified Files: wxluasocket_bind.h Log Message: Add parameter to wxLuaState::RemoveTrackedObject to select how we untrack it Fixes removing derived methods for the %ungc binding tag Index: wxluasocket_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/include/wxluasocket_bind.h,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** wxluasocket_bind.h 16 Jul 2007 19:35:31 -0000 1.24 --- wxluasocket_bind.h 22 Jul 2007 04:38:30 -0000 1.25 *************** *** 21,27 **** // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 15 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 15 // --------------------------------------------------------------------------- --- 21,27 ---- // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 16 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 16 // --------------------------------------------------------------------------- |
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv12109/wxLua/modules/wxbind/src Modified Files: wxadv_adv.cpp wxadv_grid.cpp wxaui_aui.cpp wxbase_base.cpp wxbase_config.cpp wxbase_data.cpp wxbase_datetime.cpp wxbase_file.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 wxhtml_html.cpp wxmedia_media.cpp wxnet_net.cpp wxstc_stc.cpp wxxml_xml.cpp wxxrc_xrc.cpp Log Message: Add parameter to wxLuaState::RemoveTrackedObject to select how we untrack it Fixes removing derived methods for the %ungc binding tag Index: wxnet_net.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxnet_net.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** wxnet_net.cpp 16 Jul 2007 19:35:23 -0000 1.1 --- wxnet_net.cpp 22 Jul 2007 04:38:29 -0000 1.2 *************** *** 787,791 **** wxSocketClient * self = (wxSocketClient *)wxlState.GetUserDataType(1, s_wxluatag_wxSocketClient); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self)) { lua_pushnil(L); --- 787,791 ---- wxSocketClient * self = (wxSocketClient *)wxlState.GetUserDataType(1, s_wxluatag_wxSocketClient); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS)) { lua_pushnil(L); *************** *** 922,926 **** wxSocketServer * self = (wxSocketServer *)wxlState.GetUserDataType(1, s_wxluatag_wxSocketServer); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self)) { lua_pushnil(L); --- 922,926 ---- wxSocketServer * self = (wxSocketServer *)wxlState.GetUserDataType(1, s_wxluatag_wxSocketServer); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS)) { lua_pushnil(L); *************** *** 1044,1048 **** wxSocketEvent * self = (wxSocketEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxSocketEvent); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self)) { lua_pushnil(L); --- 1044,1048 ---- wxSocketEvent * self = (wxSocketEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxSocketEvent); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS)) { lua_pushnil(L); *************** *** 1316,1320 **** wxIPaddress * self = (wxIPaddress *)wxlState.GetUserDataType(1, s_wxluatag_wxIPaddress); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self)) { lua_pushnil(L); --- 1316,1320 ---- wxIPaddress * self = (wxIPaddress *)wxlState.GetUserDataType(1, s_wxluatag_wxIPaddress); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS)) { lua_pushnil(L); *************** *** 1427,1431 **** wxIPV4address * self = (wxIPV4address *)wxlState.GetUserDataType(1, s_wxluatag_wxIPV4address); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self)) { lua_pushnil(L); --- 1427,1431 ---- wxIPV4address * self = (wxIPV4address *)wxlState.GetUserDataType(1, s_wxluatag_wxIPV4address); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS)) { lua_pushnil(L); *************** *** 1660,1664 **** wxProtocol * self = (wxProtocol *)wxlState.GetUserDataType(1, s_wxluatag_wxProtocol); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self)) { lua_pushnil(L); --- 1660,1664 ---- wxProtocol * self = (wxProtocol *)wxlState.GetUserDataType(1, s_wxluatag_wxProtocol); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS)) { lua_pushnil(L); *************** *** 1767,1771 **** wxHTTP * self = (wxHTTP *)wxlState.GetUserDataType(1, s_wxluatag_wxHTTP); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self)) { lua_pushnil(L); --- 1767,1771 ---- wxHTTP * self = (wxHTTP *)wxlState.GetUserDataType(1, s_wxluatag_wxHTTP); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS)) { lua_pushnil(L); *************** *** 2201,2205 **** wxFTP * self = (wxFTP *)wxlState.GetUserDataType(1, s_wxluatag_wxFTP); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self)) { lua_pushnil(L); --- 2201,2205 ---- wxFTP * self = (wxFTP *)wxlState.GetUserDataType(1, s_wxluatag_wxFTP); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS)) { lua_pushnil(L); *************** *** 2718,2722 **** wxURI * self = (wxURI *)wxlState.GetUserDataType(1, s_wxluatag_wxURI); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self)) { lua_pushnil(L); --- 2718,2722 ---- wxURI * self = (wxURI *)wxlState.GetUserDataType(1, s_wxluatag_wxURI); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS)) { lua_pushnil(L); *************** *** 3023,3027 **** wxURL * self = (wxURL *)wxlState.GetUserDataType(1, s_wxluatag_wxURL); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self)) { lua_pushnil(L); --- 3023,3027 ---- wxURL * self = (wxURL *)wxlState.GetUserDataType(1, s_wxluatag_wxURL); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS)) { lua_pushnil(L); Index: wxstc_stc.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxstc_stc.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** wxstc_stc.cpp 16 Jul 2007 19:35:23 -0000 1.1 --- wxstc_stc.cpp 22 Jul 2007 04:38:29 -0000 1.2 *************** *** 9335,9339 **** wxStyledTextEvent * self = (wxStyledTextEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxStyledTextEvent); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self)) { lua_pushnil(L); --- 9335,9339 ---- wxStyledTextEvent * self = (wxStyledTextEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxStyledTextEvent); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS)) { lua_pushnil(L); Index: wxxrc_xrc.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxxrc_xrc.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** wxxrc_xrc.cpp 16 Jul 2007 19:35:24 -0000 1.1 --- wxxrc_xrc.cpp 22 Jul 2007 04:38:29 -0000 1.2 *************** *** 480,484 **** // wxXmlResource res wxXmlResource * res = (wxXmlResource *)wxlState.GetUserDataType(1, s_wxluatag_wxXmlResource); ! if (wxlState.IsTrackedObject(res)) wxlState.RemoveTrackedObject(res, false); // call Set returns = (wxXmlResource *)wxXmlResource::Set(res); --- 480,484 ---- // wxXmlResource res wxXmlResource * res = (wxXmlResource *)wxlState.GetUserDataType(1, s_wxluatag_wxXmlResource); ! if (wxlState.IsTrackedObject(res)) wxlState.RemoveTrackedObject(res, wxLuaState::UNDELETE); // call Set returns = (wxXmlResource *)wxXmlResource::Set(res); *************** *** 552,556 **** wxXmlResource * self = (wxXmlResource *)wxlState.GetUserDataType(1, s_wxluatag_wxXmlResource); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self)) { lua_pushnil(L); --- 552,556 ---- wxXmlResource * self = (wxXmlResource *)wxlState.GetUserDataType(1, s_wxluatag_wxXmlResource); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS)) { lua_pushnil(L); Index: wxcore_core.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxcore_core.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** wxcore_core.cpp 16 Jul 2007 19:35:18 -0000 1.1 --- wxcore_core.cpp 22 Jul 2007 04:38:29 -0000 1.2 *************** *** 43,47 **** wxLogGui * self = (wxLogGui *)wxlState.GetUserDataType(1, s_wxluatag_wxLogGui); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self)) { lua_pushnil(L); --- 43,47 ---- wxLogGui * self = (wxLogGui *)wxlState.GetUserDataType(1, s_wxluatag_wxLogGui); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS)) { lua_pushnil(L); *************** *** 101,105 **** wxLogTextCtrl * self = (wxLogTextCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxLogTextCtrl); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self)) { lua_pushnil(L); --- 101,105 ---- wxLogTextCtrl * self = (wxLogTextCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxLogTextCtrl); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS)) { lua_pushnil(L); *************** *** 208,212 **** wxLogWindow * self = (wxLogWindow *)wxlState.GetUserDataType(1, s_wxluatag_wxLogWindow); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self)) { lua_pushnil(L); --- 208,212 ---- wxLogWindow * self = (wxLogWindow *)wxlState.GetUserDataType(1, s_wxluatag_wxLogWindow); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS)) { lua_pushnil(L); *************** *** 693,697 **** wxTextValidator * self = (wxTextValidator *)wxlState.GetUserDataType(1, s_wxluatag_wxTextValidator); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self)) { lua_pushnil(L); --- 693,697 ---- wxTextValidator * self = (wxTextValidator *)wxlState.GetUserDataType(1, s_wxluatag_wxTextValidator); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS)) { lua_pushnil(L); *************** *** 777,781 **** wxGenericValidator * self = (wxGenericValidator *)wxlState.GetUserDataType(1, s_wxluatag_wxGenericValidator); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self)) { lua_pushnil(L); --- 777,781 ---- wxGenericValidator * self = (wxGenericValidator *)wxlState.GetUserDataType(1, s_wxluatag_wxGenericValidator); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS)) { lua_pushnil(L); Index: wxcore_clipdrag.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxcore_clipdrag.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** wxcore_clipdrag.cpp 16 Jul 2007 19:35:18 -0000 1.1 --- wxcore_clipdrag.cpp 22 Jul 2007 04:38:29 -0000 1.2 *************** *** 46,50 **** // wxDataObject data wxDataObject * data = (wxDataObject *)wxlState.GetUserDataType(2, s_wxluatag_wxDataObject); ! if (wxlState.IsTrackedObject(data)) wxlState.RemoveTrackedObject(data, false); // get this wxClipboard * self = (wxClipboard *)wxlState.GetUserDataType(1, s_wxluatag_wxClipboard); --- 46,50 ---- // wxDataObject data wxDataObject * data = (wxDataObject *)wxlState.GetUserDataType(2, s_wxluatag_wxDataObject); ! if (wxlState.IsTrackedObject(data)) wxlState.RemoveTrackedObject(data, wxLuaState::UNDELETE); // get this wxClipboard * self = (wxClipboard *)wxlState.GetUserDataType(1, s_wxluatag_wxClipboard); *************** *** 221,225 **** // wxDataObject data wxDataObject * data = (wxDataObject *)wxlState.GetUserDataType(2, s_wxluatag_wxDataObject); ! if (wxlState.IsTrackedObject(data)) wxlState.RemoveTrackedObject(data, false); // get this wxClipboard * self = (wxClipboard *)wxlState.GetUserDataType(1, s_wxluatag_wxClipboard); --- 221,225 ---- // wxDataObject data wxDataObject * data = (wxDataObject *)wxlState.GetUserDataType(2, s_wxluatag_wxDataObject); ! if (wxlState.IsTrackedObject(data)) wxlState.RemoveTrackedObject(data, wxLuaState::UNDELETE); // get this wxClipboard * self = (wxClipboard *)wxlState.GetUserDataType(1, s_wxluatag_wxClipboard); *************** *** 312,316 **** wxClipboardTextEvent * self = (wxClipboardTextEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxClipboardTextEvent); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self)) { lua_pushnil(L); --- 312,316 ---- wxClipboardTextEvent * self = (wxClipboardTextEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxClipboardTextEvent); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS)) { lua_pushnil(L); *************** *** 447,451 **** wxDataFormat * self = (wxDataFormat *)wxlState.GetUserDataType(1, s_wxluatag_wxDataFormat); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self)) { lua_pushnil(L); --- 447,451 ---- wxDataFormat * self = (wxDataFormat *)wxlState.GetUserDataType(1, s_wxluatag_wxDataFormat); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS)) { lua_pushnil(L); *************** *** 899,903 **** wxDataObjectSimple * self = (wxDataObjectSimple *)wxlState.GetUserDataType(1, s_wxluatag_wxDataObjectSimple); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self)) { lua_pushnil(L); --- 899,903 ---- wxDataObjectSimple * self = (wxDataObjectSimple *)wxlState.GetUserDataType(1, s_wxluatag_wxDataObjectSimple); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS)) { lua_pushnil(L); *************** *** 972,976 **** // wxDataObjectSimple dataObject wxDataObjectSimple * dataObject = (wxDataObjectSimple *)wxlState.GetUserDataType(2, s_wxluatag_wxDataObjectSimple); ! if (wxlState.IsTrackedObject(dataObject)) wxlState.RemoveTrackedObject(dataObject, false); // get this wxDataObjectComposite * self = (wxDataObjectComposite *)wxlState.GetUserDataType(1, s_wxluatag_wxDataObjectComposite); --- 972,976 ---- // wxDataObjectSimple dataObject wxDataObjectSimple * dataObject = (wxDataObjectSimple *)wxlState.GetUserDataType(2, s_wxluatag_wxDataObjectSimple); ! if (wxlState.IsTrackedObject(dataObject)) wxlState.RemoveTrackedObject(dataObject, wxLuaState::UNDELETE); // get this wxDataObjectComposite * self = (wxDataObjectComposite *)wxlState.GetUserDataType(1, s_wxluatag_wxDataObjectComposite); *************** *** 1014,1018 **** wxDataObjectComposite * self = (wxDataObjectComposite *)wxlState.GetUserDataType(1, s_wxluatag_wxDataObjectComposite); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self)) { lua_pushnil(L); --- 1014,1018 ---- wxDataObjectComposite * self = (wxDataObjectComposite *)wxlState.GetUserDataType(1, s_wxluatag_wxDataObjectComposite); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS)) { lua_pushnil(L); *************** *** 1120,1124 **** wxFileDataObject * self = (wxFileDataObject *)wxlState.GetUserDataType(1, s_wxluatag_wxFileDataObject); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self)) { lua_pushnil(L); --- 1120,1124 ---- wxFileDataObject * self = (wxFileDataObject *)wxlState.GetUserDataType(1, s_wxluatag_wxFileDataObject); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS)) { lua_pushnil(L); *************** *** 1237,1241 **** wxTextDataObject * self = (wxTextDataObject *)wxlState.GetUserDataType(1, s_wxluatag_wxTextDataObject); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self)) { lua_pushnil(L); --- 1237,1241 ---- wxTextDataObject * self = (wxTextDataObject *)wxlState.GetUserDataType(1, s_wxluatag_wxTextDataObject); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS)) { lua_pushnil(L); *************** *** 1344,1348 **** wxBitmapDataObject * self = (wxBitmapDataObject *)wxlState.GetUserDataType(1, s_wxluatag_wxBitmapDataObject); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self)) { lua_pushnil(L); --- 1344,1348 ---- wxBitmapDataObject * self = (wxBitmapDataObject *)wxlState.GetUserDataType(1, s_wxluatag_wxBitmapDataObject); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS)) { lua_pushnil(L); *************** *** 1453,1457 **** wxURLDataObject * self = (wxURLDataObject *)wxlState.GetUserDataType(1, s_wxluatag_wxURLDataObject); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self)) { lua_pushnil(L); --- 1453,1457 ---- wxURLDataObject * self = (wxURLDataObject *)wxlState.GetUserDataType(1, s_wxluatag_wxURLDataObject); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS)) { lua_pushnil(L); *************** *** 1643,1647 **** wxDropSource * self = (wxDropSource *)wxlState.GetUserDataType(1, s_wxluatag_wxDropSource); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self)) { lua_pushnil(L); --- 1643,1647 ---- wxDropSource * self = (wxDropSource *)wxlState.GetUserDataType(1, s_wxluatag_wxDropSource); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS)) { lua_pushnil(L); *************** *** 1936,1940 **** wxDropFilesEvent * self = (wxDropFilesEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxDropFilesEvent); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self)) { lua_pushnil(L); --- 1936,1940 ---- wxDropFilesEvent * self = (wxDropFilesEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxDropFilesEvent); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS)) { lua_pushnil(L); *************** *** 2048,2052 **** wxMetafile * self = (wxMetafile *)wxlState.GetUserDataType(1, s_wxluatag_wxMetafile); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self)) { lua_pushnil(L); --- 2048,2052 ---- wxMetafile * self = (wxMetafile *)wxlState.GetUserDataType(1, s_wxluatag_wxMetafile); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS)) { lua_pushnil(L); *************** *** 2140,2144 **** wxMetafileDC * self = (wxMetafileDC *)wxlState.GetUserDataType(1, s_wxluatag_wxMetafileDC); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self)) { lua_pushnil(L); --- 2140,2144 ---- wxMetafileDC * self = (wxMetafileDC *)wxlState.GetUserDataType(1, s_wxluatag_wxMetafileDC); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS)) { lua_pushnil(L); Index: wxcore_help.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxcore_help.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** wxcore_help.cpp 16 Jul 2007 19:35:19 -0000 1.1 --- wxcore_help.cpp 22 Jul 2007 04:38:29 -0000 1.2 *************** *** 81,85 **** wxContextHelp * self = (wxContextHelp *)wxlState.GetUserDataType(1, s_wxluatag_wxContextHelp); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self)) { lua_pushnil(L); --- 81,85 ---- wxContextHelp * self = (wxContextHelp *)wxlState.GetUserDataType(1, s_wxluatag_wxContextHelp); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS)) { lua_pushnil(L); *************** *** 279,283 **** // wxHelpProvider helpProvider wxHelpProvider * helpProvider = (wxHelpProvider *)wxlState.GetUserDataType(1, s_wxluatag_wxHelpProvider); ! if (wxlState.IsTrackedObject(helpProvider)) wxlState.RemoveTrackedObject(helpProvider, false); // call Set returns = (wxHelpProvider *)wxHelpProvider::Set(helpProvider); --- 279,283 ---- // wxHelpProvider helpProvider wxHelpProvider * helpProvider = (wxHelpProvider *)wxlState.GetUserDataType(1, s_wxluatag_wxHelpProvider); ! if (wxlState.IsTrackedObject(helpProvider)) wxlState.RemoveTrackedObject(helpProvider, wxLuaState::UNDELETE); // call Set returns = (wxHelpProvider *)wxHelpProvider::Set(helpProvider); *************** *** 345,349 **** wxHelpProvider * self = (wxHelpProvider *)wxlState.GetUserDataType(1, s_wxluatag_wxHelpProvider); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self)) { lua_pushnil(L); --- 345,349 ---- wxHelpProvider * self = (wxHelpProvider *)wxlState.GetUserDataType(1, s_wxluatag_wxHelpProvider); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS)) { lua_pushnil(L); *************** *** 395,399 **** wxSimpleHelpProvider * self = (wxSimpleHelpProvider *)wxlState.GetUserDataType(1, s_wxluatag_wxSimpleHelpProvider); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self)) { lua_pushnil(L); --- 395,399 ---- wxSimpleHelpProvider * self = (wxSimpleHelpProvider *)wxlState.GetUserDataType(1, s_wxluatag_wxSimpleHelpProvider); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS)) { lua_pushnil(L); *************** *** 488,492 **** wxHelpControllerHelpProvider * self = (wxHelpControllerHelpProvider *)wxlState.GetUserDataType(1, s_wxluatag_wxHelpControllerHelpProvider); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self)) { lua_pushnil(L); --- 488,492 ---- wxHelpControllerHelpProvider * self = (wxHelpControllerHelpProvider *)wxlState.GetUserDataType(1, s_wxluatag_wxHelpControllerHelpProvider); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS)) { lua_pushnil(L); *************** *** 878,882 **** wxHelpControllerBase * self = (wxHelpControllerBase *)wxlState.GetUserDataType(1, s_wxluatag_wxHelpControllerBase); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self)) { lua_pushnil(L); --- 878,882 ---- wxHelpControllerBase * self = (wxHelpControllerBase *)wxlState.GetUserDataType(1, s_wxluatag_wxHelpControllerBase); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS)) { lua_pushnil(L); *************** *** 971,975 **** wxHelpController * self = (wxHelpController *)wxlState.GetUserDataType(1, s_wxluatag_wxHelpController); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self)) { lua_pushnil(L); --- 971,975 ---- wxHelpController * self = (wxHelpController *)wxlState.GetUserDataType(1, s_wxluatag_wxHelpController); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS)) { lua_pushnil(L); *************** *** 1029,1033 **** wxWinHelpController * self = (wxWinHelpController *)wxlState.GetUserDataType(1, s_wxluatag_wxWinHelpController); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self)) { lua_pushnil(L); --- 1029,1033 ---- wxWinHelpController * self = (wxWinHelpController *)wxlState.GetUserDataType(1, s_wxluatag_wxWinHelpController); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS)) { lua_pushnil(L); *************** *** 1087,1091 **** wxBestHelpController * self = (wxBestHelpController *)wxlState.GetUserDataType(1, s_wxluatag_wxBestHelpController); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self)) { lua_pushnil(L); --- 1087,1091 ---- wxBestHelpController * self = (wxBestHelpController *)wxlState.GetUserDataType(1, s_wxluatag_wxBestHelpController); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS)) { lua_pushnil(L); *************** *** 1152,1156 **** wxExtHelpController * self = (wxExtHelpController *)wxlState.GetUserDataType(1, s_wxluatag_wxExtHelpController); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self)) { lua_pushnil(L); --- 1152,1156 ---- wxExtHelpController * self = (wxExtHelpController *)wxlState.GetUserDataType(1, s_wxluatag_wxExtHelpController); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS)) { lua_pushnil(L); Index: wxcore_gdi.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxcore_gdi.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** wxcore_gdi.cpp 16 Jul 2007 19:35:19 -0000 1.1 --- wxcore_gdi.cpp 22 Jul 2007 04:38:29 -0000 1.2 *************** *** 144,148 **** wxPoint * self = (wxPoint *)wxlState.GetUserDataType(1, s_wxluatag_wxPoint); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self)) { lua_pushnil(L); --- 144,148 ---- wxPoint * self = (wxPoint *)wxlState.GetUserDataType(1, s_wxluatag_wxPoint); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS)) { lua_pushnil(L); *************** *** 835,839 **** wxSize * self = (wxSize *)wxlState.GetUserDataType(1, s_wxluatag_wxSize); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self)) { lua_pushnil(L); --- 835,839 ---- wxSize * self = (wxSize *)wxlState.GetUserDataType(1, s_wxluatag_wxSize); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS)) { lua_pushnil(L); *************** *** 1973,1977 **** wxRect * self = (wxRect *)wxlState.GetUserDataType(1, s_wxluatag_wxRect); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self)) { lua_pushnil(L); --- 1973,1977 ---- wxRect * self = (wxRect *)wxlState.GetUserDataType(1, s_wxluatag_wxRect); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS)) { lua_pushnil(L); *************** *** 2353,2357 **** wxGDIObject * self = (wxGDIObject *)wxlState.GetUserDataType(1, s_wxluatag_wxGDIObject); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self)) { lua_pushnil(L); --- 2353,2357 ---- wxGDIObject * self = (wxGDIObject *)wxlState.GetUserDataType(1, s_wxluatag_wxGDIObject); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS)) { lua_pushnil(L); *************** *** 3072,3076 **** wxRegion * self = (wxRegion *)wxlState.GetUserDataType(1, s_wxluatag_wxRegion); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self)) { lua_pushnil(L); --- 3072,3076 ---- wxRegion * self = (wxRegion *)wxlState.GetUserDataType(1, s_wxluatag_wxRegion); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS)) { lua_pushnil(L); *************** *** 3611,3615 **** wxRegionIterator * self = (wxRegionIterator *)wxlState.GetUserDataType(1, s_wxluatag_wxRegionIterator); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self)) { lua_pushnil(L); --- 3611,3615 ---- wxRegionIterator * self = (wxRegionIterator *)wxlState.GetUserDataType(1, s_wxluatag_wxRegionIterator); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS)) { lua_pushnil(L); *************** *** 4207,4211 **** wxFont * self = (wxFont *)wxlState.GetUserDataType(1, s_wxluatag_wxFont); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self)) { lua_pushnil(L); --- 4207,4211 ---- wxFont * self = (wxFont *)wxlState.GetUserDataType(1, s_wxluatag_wxFont); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS)) { lua_pushnil(L); *************** *** 4873,4877 **** wxNativeFontInfo * self = (wxNativeFontInfo *)wxlState.GetUserDataType(1, s_wxluatag_wxNativeFontInfo); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self)) { lua_pushnil(L); --- 4873,4877 ---- wxNativeFontInfo * self = (wxNativeFontInfo *)wxlState.GetUserDataType(1, s_wxluatag_wxNativeFontInfo); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS)) { lua_pushnil(L); *************** *** 5190,5194 **** wxFontEnumerator * self = (wxFontEnumerator *)wxlState.GetUserDataType(1, s_wxluatag_wxFontEnumerator); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self)) { lua_pushnil(L); --- 5190,5194 ---- wxFontEnumerator * self = (wxFontEnumerator *)wxlState.GetUserDataType(1, s_wxluatag_wxFontEnumerator); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS)) { lua_pushnil(L); *************** *** 5960,5964 **** wxColour * self = (wxColour *)wxlState.GetUserDataType(1, s_wxluatag_wxColour); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self)) { lua_pushnil(L); --- 5960,5964 ---- wxColour * self = (wxColour *)wxlState.GetUserDataType(1, s_wxluatag_wxColour); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS)) { lua_pushnil(L); *************** *** 6294,6298 **** wxColourDatabase * self = (wxColourDatabase *)wxlState.GetUserDataType(1, s_wxluatag_wxColourDatabase); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self)) { lua_pushnil(L); --- 6294,6298 ---- wxColourDatabase * self = (wxColourDatabase *)wxlState.GetUserDataType(1, s_wxluatag_wxColourDatabase); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS)) { lua_pushnil(L); *************** *** 6629,6633 **** wxPen * self = (wxPen *)wxlState.GetUserDataType(1, s_wxluatag_wxPen); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self)) { lua_pushnil(L); --- 6629,6633 ---- wxPen * self = (wxPen *)wxlState.GetUserDataType(1, s_wxluatag_wxPen); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS)) { lua_pushnil(L); *************** *** 7144,7148 **** wxBrush * self = (wxBrush *)wxlState.GetUserDataType(1, s_wxluatag_wxBrush); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self)) { lua_pushnil(L); --- 7144,7148 ---- wxBrush * self = (wxBrush *)wxlState.GetUserDataType(1, s_wxluatag_wxBrush); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS)) { lua_pushnil(L); *************** *** 7776,7780 **** wxPalette * self = (wxPalette *)wxlState.GetUserDataType(1, s_wxluatag_wxPalette); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self)) { lua_pushnil(L); --- 7776,7780 ---- wxPalette * self = (wxPalette *)wxlState.GetUserDataType(1, s_wxluatag_wxPalette); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS)) { lua_pushnil(L); *************** *** 8048,8052 **** wxIcon * self = (wxIcon *)wxlState.GetUserDataType(1, s_wxluatag_wxIcon); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self)) { lua_pushnil(L); --- 8048,8052 ---- wxIcon * self = (wxIcon *)wxlState.GetUserDataType(1, s_wxluatag_wxIcon); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS)) { lua_pushnil(L); *************** *** 8274,8278 **** wxIconBundle * self = (wxIconBundle *)wxlState.GetUserDataType(1, s_wxluatag_wxIconBundle); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self)) { lua_pushnil(L); --- 8274,8278 ---- wxIconBundle * self = (wxIconBundle *)wxlState.GetUserDataType(1, s_wxluatag_wxIconBundle); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS)) { lua_pushnil(L); *************** *** 8802,8806 **** // wxMask mask wxMask * mask = (wxMask *)wxlState.GetUserDataType(2, s_wxluatag_wxMask); ! if (wxlState.IsTrackedObject(mask)) wxlState.RemoveTrackedObject(mask, false); // get this wxBitmap * self = (wxBitmap *)wxlState.GetUserDataType(1, s_wxluatag_wxBitmap); --- 8802,8806 ---- // wxMask mask wxMask * mask = (wxMask *)wxlState.GetUserDataType(2, s_wxluatag_wxMask); ! if (wxlState.IsTrackedObject(mask)) wxlState.RemoveTrackedObject(mask, wxLuaState::UNDELETE); // get this wxBitmap * self = (wxBitmap *)wxlState.GetUserDataType(1, s_wxluatag_wxBitmap); *************** *** 8858,8862 **** wxBitmap * self = (wxBitmap *)wxlState.GetUserDataType(1, s_wxluatag_wxBitmap); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self)) { lua_pushnil(L); --- 8858,8862 ---- wxBitmap * self = (wxBitmap *)wxlState.GetUserDataType(1, s_wxluatag_wxBitmap); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS)) { lua_pushnil(L); *************** *** 9270,9274 **** wxCursor * self = (wxCursor *)wxlState.GetUserDataType(1, s_wxluatag_wxCursor); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self)) { lua_pushnil(L); --- 9270,9274 ---- wxCursor * self = (wxCursor *)wxlState.GetUserDataType(1, s_wxluatag_wxCursor); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS)) { lua_pushnil(L); *************** *** 9539,9543 **** wxMask * self = (wxMask *)wxlState.GetUserDataType(1, s_wxluatag_wxMask); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self)) { lua_pushnil(L); --- 9539,9543 ---- wxMask * self = (wxMask *)wxlState.GetUserDataType(1, s_wxluatag_wxMask); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS)) { lua_pushnil(L); *************** *** 10062,10066 **** wxImageList * self = (wxImageList *)wxlState.GetUserDataType(1, s_wxluatag_wxImageList); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self)) { lua_pushnil(L); --- 10062,10066 ---- wxImageList * self = (wxImageList *)wxlState.GetUserDataType(1, s_wxluatag_wxImageList); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS)) { lua_pushnil(L); *************** *** 11986,11990 **** wxDC * self = (wxDC *)wxlState.GetUserDataType(1, s_wxluatag_wxDC); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self)) { lua_pushnil(L); --- 11986,11990 ---- wxDC * self = (wxDC *)wxlState.GetUserDataType(1, s_wxluatag_wxDC); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS)) { lua_pushnil(L); *************** *** 12314,12318 **** wxMemoryDC * self = (wxMemoryDC *)wxlState.GetUserDataType(1, s_wxluatag_wxMemoryDC); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self)) { lua_pushnil(L); --- 12314,12318 ---- wxMemoryDC * self = (wxMemoryDC *)wxlState.GetUserDataType(1, s_wxluatag_wxMemoryDC); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS)) { lua_pushnil(L); *************** *** 12380,12384 **** wxWindowDC * self = (wxWindowDC *)wxlState.GetUserDataType(1, s_wxluatag_wxWindowDC); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self)) { lua_pushnil(L); --- 12380,12384 ---- wxWindowDC * self = (wxWindowDC *)wxlState.GetUserDataType(1, s_wxluatag_wxWindowDC); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS)) { lua_pushnil(L); *************** *** 12441,12445 **** wxClientDC * self = (wxClientDC *)wxlState.GetUserDataType(1, s_wxluatag_wxClientDC); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self)) { lua_pushnil(L); --- 12441,12445 ---- wxClientDC * self = (wxClientDC *)wxlState.GetUserDataType(1, s_wxluatag_wxClientDC); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS)) { lua_pushnil(L); *************** *** 12502,12506 **** wxPaintDC * self = (wxPaintDC *)wxlState.GetUserDataType(1, s_wxluatag_wxPaintDC); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self)) { lua_pushnil(L); --- 12502,12506 ---- wxPaintDC * self = (wxPaintDC *)wxlState.GetUserDataType(1, s_wxluatag_wxPaintDC); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS)) { lua_pushnil(L); *************** *** 12619,12623 **** wxScreenDC * self = (wxScreenDC *)wxlState.GetUserDataType(1, s_wxluatag_wxScreenDC); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self)) { lua_pushnil(L); --- 12619,12623 ---- wxScreenDC * self = (wxScreenDC *)wxlState.GetUserDataType(1, s_wxluatag_wxScreenDC); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS)) { lua_pushnil(L); *************** *** 12758,12762 **** wxBufferedDC * self = (wxBufferedDC *)wxlState.GetUserDataType(1, s_wxluatag_wxBufferedDC); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self)) { lua_pushnil(L); --- 12758,12762 ---- wxBufferedDC * self = (wxBufferedDC *)wxlState.GetUserDataType(1, s_wxluatag_wxBufferedDC); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS)) { lua_pushnil(L); *************** *** 12937,12941 **** wxBufferedPaintDC * self = (wxBufferedPaintDC *)wxlState.GetUserDataType(1, s_wxluatag_wxBufferedPaintDC); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self)) { lua_pushnil(L); --- 12937,12941 ---- wxBufferedPaintDC * self = (wxBufferedPaintDC *)wxlState.GetUserDataType(1, s_wxluatag_wxBufferedPaintDC); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS)) { lua_pushnil(L); *************** *** 13059,13063 **** wxAutoBufferedPaintDC * self = (wxAutoBufferedPaintDC *)wxlState.GetUserDataType(1, s_wxluatag_wxAutoBufferedPaintDC); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self)) { lua_pushnil(L); --- 13059,13063 ---- wxAutoBufferedPaintDC * self = (wxAutoBufferedPaintDC *)wxlState.GetUserDataType(1, s_wxluatag_wxAutoBufferedPaintDC); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS)) { lua_pushnil(L); *************** *** 13120,13124 **** wxMirrorDC * self = (wxMirrorDC *)wxlState.GetUserDataType(1, s_wxluatag_wxMirrorDC); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self)) { lua_pushnil(L); --- 13120,13124 ---- wxMirrorDC * self = (wxMirrorDC *)wxlState.GetUserDataType(1, s_wxluatag_wxMirrorDC); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS)) { lua_pushnil(L); *************** *** 13183,13187 **** wxDCClipper * self = (wxDCClipper *)wxlState.GetUserDataType(1, s_wxluatag_wxDCClipper); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self)) { lua_pushnil(L); --- 13183,13187 ---- wxDCClipper * self = (wxDCClipper *)wxlState.GetUserDataType(1, s_wxluatag_wxDCClipper); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS)) { lua_pushnil(L); *************** *** 13643,13647 **** wxCaret * self = (wxCaret *)wxlState.GetUserDataType(1, s_wxluatag_wxCaret); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self)) { lua_pushnil(L); --- 13643,13647 ---- wxCaret * self = (wxCaret *)wxlState.GetUserDataType(1, s_wxluatag_wxCaret); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS)) { lua_pushnil(L); *************** *** 13879,13883 **** wxCaretSuspend * self = (wxCaretSuspend *)wxlState.GetUserDataType(1, s_wxluatag_wxCaretSuspend); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self)) { lua_pushnil(L); --- 13879,13883 ---- wxCaretSuspend * self = (wxCaretSuspend *)wxlState.GetUserDataType(1, s_wxluatag_wxCaretSuspend); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS)) { lua_pushnil(L); *************** *** 14034,14038 **** wxVideoMode * self = (wxVideoMode *)wxlState.GetUserDataType(1, s_wxluatag_wxVideoMode); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self)) { lua_pushnil(L); --- 14034,14038 ---- wxVideoMode * self = (wxVideoMode *)wxlState.GetUserDataType(1, s_wxluatag_wxVideoMode); // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS)) { lua_pushnil(L); *************** *** 14336,14340 **** wxArrayVideoModes *... [truncated message content] |
