This commit was manufactured by cvs2svn to create tag 'wxGTK_2_1_13'.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/tags/wxGTK_2_1_13@5627 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

configure.in

@@ -409,7 +409,7 @@ dnl WX_INTERFACE_AGE = 0
 
 WX_MAJOR_VERSION_NUMBER=2
 WX_MINOR_VERSION_NUMBER=1
-WX_RELEASE_NUMBER=12
+WX_RELEASE_NUMBER=13
 
 WX_INTERFACE_AGE=0
 WX_BINARY_AGE=0
@@ -429,6 +429,8 @@ dnl ------------------------------------------------------------------------
 dnl assume Unix
 USE_UNIX=1
 USE_WIN32=0
+USE_BEOS=0
+
 USE_LINUX=
 USE_SGI=
 USE_HPUX=
@@ -454,7 +456,7 @@ dnl than checking it during run-time
 NEEDS_D_REENTRANT_FOR_R_FUNCS=0
 
 dnl the list of all available toolkits
-ALL_TOOLKITS="CYGWIN GTK MINGW MOTIF WINE"
+ALL_TOOLKITS="CYGWIN GTK MINGW MOTIF WINE PM"
 
 dnl NB: these wxUSE_XXX constants have value of 0 or 1 unlike all the other ones
 dnl     which are either yes or no
@@ -462,6 +464,7 @@ DEFAULT_wxUSE_GTK=0
 DEFAULT_wxUSE_MOTIF=0
 DEFAULT_wxUSE_MSW=0
 DEFAULT_wxUSE_WINE=0
+DEFAULT_wxUSE_PM=0
 
 dnl these are the values which are really default for the given platform -
 dnl they're not cached and are only used if no --with-toolkit was given *and*
@@ -470,7 +473,12 @@ DEFAULT_DEFAULT_wxUSE_GTK=0
 DEFAULT_DEFAULT_wxUSE_MOTIF=0
 DEFAULT_DEFAULT_wxUSE_MSW=0
 DEFAULT_DEFAULT_wxUSE_WINE=0
+DEFAULT_DEFAULT_wxUSE_PM=0
 
+dnl to support a new system, you need to add its canonical name (as determined
+dnl by config.sub or specified by the configure command line) to this "case"
+dnl and also define the shared library flags below - search for
+dnl SHARED_LIB_SETUP to find the exact place
 case "${host}" in
   *-hp-hpux* )
     USE_HPUX=1
@@ -566,6 +574,13 @@ case "${host}" in
 
   *-pc-os2_emx )
     AC_DEFINE(__EMX__)
+    DEFAULT_DEFAULT_wxUSE_PM=1
+  ;;
+
+  *-*-beos* )
+    dnl leave USE_UNIX on - BeOS is sufficiently Unix-like for this
+    USE_BEOS=1
+    AC_DEFINE(__BEOS__)
   ;;
 
   *)
@@ -573,10 +588,16 @@ case "${host}" in
 esac
 
 if test "$USE_UNIX" = 1 ; then
-  wxUSE_UNIX=yes
-  AC_DEFINE(__UNIX__)
-  SRC_SUBDIRS="$SRC_SUBDIRS unix"
-  INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS unix"
+    wxUSE_UNIX=yes
+    AC_DEFINE(__UNIX__)
+
+    SRC_SUBDIRS="$SRC_SUBDIRS unix"
+    INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS unix"
+fi
+
+if test "$USE_BEOS" = 1; then
+    SRC_SUBDIRS="$SRC_SUBDIRS be"
+    INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS be"
 fi
 
 dnl Linux: test for libc5/glibc2: glibc2 has gettext() included
@@ -862,97 +883,30 @@ dnl ---------------------------------------------------------------------------
 
 WX_ARG_ENABLE(gui,         [  --enable-gui            use GUI classes], wxUSE_GUI)
 
-dnl disable everything GUI related then
-if test "$wxUSE_GUI" = "no"; then
-  DEFAULT_wxUSE_ZLIB=no
-  DEFAULT_wxUSE_LIBPNG=no
-  DEFAULT_wxUSE_LIBJPEG=no
-  DEFAULT_wxUSE_LIBTIFF=no
-  DEFAULT_wxUSE_SOCKETS=no
-  DEFAULT_wxUSE_JOYSTICK=no
-  DEFAULT_wxUSE_AFM_FOR_POSTSCRIPT=no
-  DEFAULT_wxUSE_NORMALIZED_PS_FONTS=no
-  DEFAULT_wxUSE_POSTSCRIPT=no
-  DEFAULT_wxUSE_X_RESOURCES=no
-  DEFAULT_wxUSE_CLIPBOARD=no
-  DEFAULT_wxUSE_TOOLTIPS=no
-  DEFAULT_wxUSE_DRAG_AND_DROP=no
-  DEFAULT_wxUSE_SPLINES=no
-  DEFAULT_wxUSE_MDI_ARCHITECTURE=no
-  DEFAULT_wxUSE_DOC_VIEW_ARCHITECTURE=no
-  DEFAULT_wxUSE_PRINTING_ARCHITECTURE=no
-  DEFAULT_wxUSE_PROLOGIO=no
-  DEFAULT_wxUSE_RESOURCES=no
-  DEFAULT_wxUSE_CONSTRAINTS=no
-  DEFAULT_wxUSE_IPC=no
-  DEFAULT_wxUSE_HELP=no
-  DEFAULT_wxUSE_WXTREE=no
-  DEFAULT_wxUSE_METAFILE=no
-  DEFAULT_wxUSE_COMMONDLGS=no
-  DEFAULT_wxUSE_DIRDLG=no
-  DEFAULT_wxUSE_TEXTDLG=no
-  DEFAULT_wxUSE_STARTUP_TIPS=no
-  DEFAULT_wxUSE_PROGRESSDLG=no
-  DEFAULT_wxUSE_MINIFRAME=no
-  DEFAULT_wxUSE_HTML=no
-  DEFAULT_wxUSE_FS_INET=no
-  DEFAULT_wxUSE_FS_ZIP=no
-  DEFAULT_wxUSE_BUSYINFO=no
-  DEFAULT_wxUSE_ZIPSTREAM=no
-  DEFAULT_wxUSE_VALIDATORS=no
-  DEFAULT_wxUSE_ACCEL=no
-  DEFAULT_wxUSE_CARET=no
-  DEFAULT_wxUSE_BMPBUTTON=no
-  DEFAULT_wxUSE_CHECKBOX=no
-  DEFAULT_wxUSE_CHECKLST=no
-  DEFAULT_wxUSE_CHOICE=no
-  DEFAULT_wxUSE_COMBOBOX=no
-  DEFAULT_wxUSE_GAUGE=no
-  DEFAULT_wxUSE_GRID=no
-  DEFAULT_wxUSE_NEW_GRID=no
-  DEFAULT_wxUSE_IMAGLIST=no
-  DEFAULT_wxUSE_LISTBOX=no
-  DEFAULT_wxUSE_LISTCTRL=no
-  DEFAULT_wxUSE_NOTEBOOK=no
-  DEFAULT_wxUSE_RADIOBOX=no
-  DEFAULT_wxUSE_RADIOBTN=no
-  DEFAULT_wxUSE_SASH=no
-  DEFAULT_wxUSE_SCROLLBAR=no
-  DEFAULT_wxUSE_SLIDER=no
-  DEFAULT_wxUSE_SPINBTN=no
-  DEFAULT_wxUSE_SPINCTRL=no
-  DEFAULT_wxUSE_SPLITTER=no
-  DEFAULT_wxUSE_STATBMP=no
-  DEFAULT_wxUSE_STATBOX=no
-  DEFAULT_wxUSE_STATLINE=no
-  DEFAULT_wxUSE_STATUSBAR=no
-  DEFAULT_wxUSE_TABDIALOG=no
-  DEFAULT_wxUSE_TOOLBAR=no
-  DEFAULT_wxUSE_TOOLBAR_NATIVE=no
-  DEFAULT_wxUSE_TOOLBAR_SIMPLE=no
-  DEFAULT_wxUSE_TREECTRL=no
-  DEFAULT_wxUSE_GIF=no
-  DEFAULT_wxUSE_PCX=no
-  DEFAULT_wxUSE_PNM=no
-fi
+if test "$wxUSE_GUI" = "yes"; then
 
 AC_ARG_WITH(gtk,           [  --with-gtk              use GTK+], [wxUSE_GTK="$withval" CACHE_GTK=1 TOOLKIT_GIVEN=1])
 AC_ARG_WITH(motif,         [  --with-motif            use Motif/Lesstif], [wxUSE_MOTIF="$withval" CACHE_MOTIF=1 TOOLKIT_GIVEN=1])
 AC_ARG_WITH(wine,          [  --with-wine             use WINE], [wxUSE_WINE="$withval" CACHE_WINE=1 TOOLKIT_GIVEN=1])
 AC_ARG_WITH(cygwin,        [  --with-cygwin           use Cygwin for MS-Windows], [wxUSE_CYGWIN="$withval" CACHE_CYGWIN=1 TOOLKIT_GIVEN=1])
 AC_ARG_WITH(mingw,         [  --with-mingw            use GCC Minimal MS-Windows], [wxUSE_MINGW="$withval" CACHE_MINGW=1 TOOLKIT_GIVEN=1])
+AC_ARG_WITH(pm,            [  --with-pm               use OS/2 Presentation Manager], [wxUSE_PM="$withval" CACHE_PM=1 TOOLKIT_GIVEN=1])
 
 AC_ARG_WITH(gtk-prefix,    [  --with-gtk-prefix=PFX   Prefix where GTK is installed],
             gtk_config_prefix="$withval", gtk_config_prefix="")
 AC_ARG_WITH(gtk-exec-prefix, [  --with-gtk-exec-prefix=PFX  Exec prefix where GTK is installed],
             gtk_config_exec_prefix="$withval", gtk_config_exec_prefix="")
 
-WX_ARG_WITH(dmalloc,       [  --with-dmalloc          use dmalloc library (www.letters.com/dmalloc)], wxUSE_DMALLOC)
-WX_ARG_WITH(zlib,          [  --with-zlib             use zlib for LZW compression], wxUSE_ZLIB)
 WX_ARG_WITH(libpng,        [  --with-libpng           use libpng (PNG image format)], wxUSE_LIBPNG)
 WX_ARG_WITH(libjpeg,       [  --with-libjpeg          use libjpeg (JPEG file format)], wxUSE_LIBJPEG)
 WX_ARG_WITH(libtiff,       [  --with-libtiff          use libtiff (TIFF file format)], wxUSE_LIBTIFF)
 WX_ARG_WITH(opengl,        [  --with-opengl           use OpenGL (or Mesa)], wxUSE_OPENGL)
+
+fi
+dnl for GUI only
+
+WX_ARG_WITH(dmalloc,       [  --with-dmalloc          use dmalloc library (www.letters.com/dmalloc)], wxUSE_DMALLOC)
+WX_ARG_WITH(zlib,          [  --with-zlib             use zlib for LZW compression], wxUSE_ZLIB)
 WX_ARG_WITH(odbc,          [  --with-odbc             use the IODBC and wxODBC classes], wxUSE_ODBC)
 
 dnl ====================
@@ -992,7 +946,14 @@ dnl ---------------------------------------------------------------------------
 
 WX_ARG_ENABLE(intl,          [  --enable-intl           use internationalization system], wxUSE_INTL)
 WX_ARG_ENABLE(config,        [  --enable-config         use wxConfig (and derived) classes], wxUSE_CONFIG)
+
+dnl can't use sockets without GUI so far
+if test "$wxUSE_GUI" = "yes"; then
 WX_ARG_ENABLE(sockets,       [  --enable-sockets        use socket/network classes], wxUSE_SOCKETS)
+else
+wxUSE_SOCKETS=no
+fi
+
 WX_ARG_ENABLE(dialupman,     [  --enable-dialupman      use dialup network classes], wxUSE_DIALUP_MANAGER)
 WX_ARG_ENABLE(ipc,           [  --enable-ipc            use interprocess communication (wxSocket etc.)], wxUSE_IPC)
 WX_ARG_ENABLE(apple_ieee,    [  --enable-apple_ieee     use the Apple IEEE codec], wxUSE_APPLE_IEEE)
@@ -1021,6 +982,8 @@ dnl ---------------------------------------------------------------------------
 WX_ARG_ENABLE(threads,     [  --enable-threads        use threads], wxUSE_THREADS)
 WX_ARG_ENABLE(serial,      [  --enable-serial         use class serialization], wxUSE_SERIAL)
 
+if test "$wxUSE_GUI" = "yes"; then
+
 dnl ---------------------------------------------------------------------------
 dnl "big" GUI options
 dnl ---------------------------------------------------------------------------
@@ -1191,6 +1154,9 @@ WX_ARG_ENABLE(gif,         [  --enable-gif            use gif images (GIF file f
 WX_ARG_ENABLE(pcx,         [  --enable-pcx            use pcx images (PCX file format)], wxUSE_PCX)
 WX_ARG_ENABLE(pnm,         [  --enable-pnm            use pnm images (PNM file format)], wxUSE_PNM)
 
+fi
+dnl for GUI only
+
 dnl cache the options values before (may be) aborting below
 WX_ARG_CACHE_FLUSH
 
@@ -1201,6 +1167,10 @@ AC_MSG_CHECKING(for toolkit)
 
 if test "$wxUSE_GUI" = "yes"; then
 
+if test "$USE_BEOS" = 1; then
+    AC_MSG_ERROR([BeOS GUI is not supported yet, use --disable-gui])
+fi
+
 if test "$TOOLKIT_GIVEN" = 1; then
   dnl convert "yes" to 1 and "no" to 0
   for toolkit in `echo $ALL_TOOLKITS`; do
@@ -1222,6 +1192,17 @@ fi
 
 dnl we suppose that expr exists...
 NUM_TOOLKITS=`expr ${wxUSE_GTK:-0} + ${wxUSE_MOTIF:-0} + ${wxUSE_WINE:-0} + ${wxUSE_MINGW:-0} + ${wxUSE_CYGWIN:-0}`
+case "${host}" in
+  *-pc-os2_emx )
+    NUM_TOOLKITS=`expr ${NUM_TOOLKITS} + ${wxUSE_PM:-0}`
+    # PATH_IFS is autodetected by OS/2's configure (usually ';')
+    LEX_STEM="lexyy"
+  ;;
+  *)
+    PATH_IFS=':'
+    LEX_STEM="lex.yy"
+  ;;
+esac
 
 case "$NUM_TOOLKITS" in
   1)
@@ -1428,6 +1409,8 @@ SEARCH_INCLUDE="\
     /usr/x386/include         \
     /usr/XFree86/include/X11  \
                               \
+    X:/XFree86/include/X11    \
+                              \
     /usr/include/gtk          \
     /usr/local/include/gtk    \
     /usr/include/glib         \
@@ -1462,8 +1445,12 @@ dnl ----------------------------------------------------------------
 dnl search for toolkit (widget sets)
 dnl ----------------------------------------------------------------
 
+AFMINSTALL=
+
 if test "$wxUSE_GUI" = "yes"; then
 
+USE_GUI=1
+
 TOOLKIT=
 TOOLKIT_INCLUDE=
 
@@ -1475,6 +1462,7 @@ GUI_TK_LIBRARY=
 GUI_TK_LINK=
 
 WXGTK12=
+WXGTK13=
 
 WXWINE=
 
@@ -1518,14 +1506,24 @@ if test "$wxUSE_CYGWIN" = 1 || test "$wxUSE_MINGW" = 1 ; then
 fi
 
 if test "$wxUSE_GTK" = 1; then
-    dnl avoid calling AM_PATH_GTK twice, so check first for the newer version and
-    dnl only then, if it wasn't found, for an older one
-    AM_PATH_GTK(1.2.1, WXGTK12=1, AC_MSG_ERROR(Is gtk-config in path and GTK+ is version 1.2.1 or above?))
+    dnl avoid calling AM_PATH_GTK twice, so check first for the newer version
+    dnl and only then, if it wasn't found, for an older one
+    AM_PATH_GTK(1.2.3, WXGTK12=1, AC_MSG_ERROR(Is gtk-config in path and GTK+ is version 1.2.3 or above?))
+dnl it doesn't really work with 1.3.0 now...
+dnl    AM_PATH_GTK(1.3.0,
+dnl        WXGTK13=1,
+dnl        AM_PATH_GTK(1.2.1,
+dnl            WXGTK12=1,
+dnl            AC_MSG_ERROR(Is gtk-config in path and GTK+ is version 1.2.1 or above?)
+dnl        )
+dnl    )
 
     TOOLKIT_INCLUDE="$GTK_CFLAGS"
-    GUI_TK_LIBRARY="$GTK_LIBS"
+    GUI_TK_LIBRARY="$GTK_LIBS -lgthread"
     TOOLKIT=GTK
 
+    AFMINSTALL=afminstall
+
     GUIOBJS="\$(GTK_GUIOBJS)"
     GUIHEADERS="\$(GTK_HEADERS)"
     COMMONOBJS="\$(GTK_COMMONOBJS)"
@@ -1606,6 +1604,8 @@ if test "$wxUSE_MOTIF" = 1; then
     GUI_TK_LIBRARY="$X_LIBS"
     TOOLKIT_INCLUDE="$X_CFLAGS"
 
+    AFMINSTALL=afminstall
+
     dnl manual check for X11 headers/libs
     dnl
     dnl    AC_MSG_CHECKING(for X11 headers)
@@ -1695,8 +1695,27 @@ if test "$wxUSE_MOTIF" = 1; then
     GUIDIST=MOTIF_DIST
 fi
 
+if test "$wxUSE_PM" = 1; then
+    TOOLKIT=PM
+
+    GUIOBJS="\$(PM_GUIOBJS)"
+    GUIHEADERS="\$(PM_HEADERS)"
+    COMMONOBJS="\$(PM_COMMONOBJS)"
+    GENERICOBJS="\$(PM_GENERICOBJS)"
+    GUIDEPS="\$(PM_GUIDEPS)"
+    COMMONDEPS="\$(PM_COMMONDEPS)"
+    GENERICDEPS="\$(PM_GENERICDEPS)"
+    UNIXOBJS=
+    UNIXDEPS=
+    GUIDIST=GTK_DIST
+fi
+
 dnl the name of the directory where the files for this toolkit live
-TOOLKIT_DIR=`echo ${TOOLKIT} | tr "A-Z" "a-z"`
+if test "$TOOLKIT" != "PM" ; then
+    TOOLKIT_DIR=`echo ${TOOLKIT} | tr "[[A-Z]]" "[[a-z]]"`
+else
+    TOOLKIT_DIR="os2"
+fi
 
 dnl the symbol which allows conditional compilation for the given toolkit
 TOOLKIT_DEF="-D__WX${TOOLKIT}__"
@@ -1723,6 +1742,8 @@ WX_LIBRARY="wx_${TOOLKIT_DIR}"
 else
     dnl leave all TOOLKIT_XXX vars empty
 
+    USE_GUI=0
+
     dnl the sources, their dependenices and the headers
     ALL_OBJECTS="\$(BASE_OBJS)"
     ALL_DEPFILES="\${BASE_DEPS}"
@@ -1753,6 +1774,8 @@ WX_ALL=
 WX_ALL_INSTALLED=
 BURNT_LIBRARY_NAME=
 
+dnl --- the marker for quick search, leave it here: SHARED_LIB_SETUP ---
+
 if test "$wxUSE_SHARED" = "yes"; then
     case "${host}" in
       *-hp-hpux* )
@@ -1766,12 +1789,14 @@ if test "$wxUSE_SHARED" = "yes"; then
         WX_LIBRARY_NAME_SHARED="libwx_${TOOLKIT_DIR}.sl"
         WX_ALL=${WX_LIBRARY_NAME_SHARED}
       ;;
+
+      dnl in fact, these settings are for any platform using gcc
       *-*-linux* )
         SHARED_LD="${CC} -shared -o"
         PIC_FLAG="-fPIC"
         WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
         WX_ALL="CREATE_LINKS"
-	dnl BURNT_LIBRARY_NAME="-Wl,-soname -Wl,${WX_LIBRARY_NAME_SHARED}"
+        dnl BURNT_LIBRARY_NAME="-Wl,-soname -Wl,${WX_LIBRARY_NAME_SHARED}"
       ;;
       *-*-irix5* | *-*-irix6* )
         if test "$GCC" = yes ; then
@@ -1833,12 +1858,23 @@ if test "$wxUSE_SHARED" = "yes"; then
         WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_STATIC}"
         WX_ALL="${WX_LIBRARY_NAME_STATIC}"
       ;;
-        *-*-mingw32* )
+      *-*-mingw32* )
         dnl only static for now
         WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_STATIC}"
         WX_ALL="${WX_LIBRARY_NAME_STATIC}"
       ;;
       *-pc-os2_emx )
+        dnl only static for now
+        WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_STATIC}"
+        WX_ALL="${WX_LIBRARY_NAME_STATIC}"
+      ;;
+      *-*-beos* )
+        dnl can't use gcc under BeOS for shared library creation because it
+        dnl complains about missing 'main'
+        SHARED_LD="${LD} -shared -o"
+        PIC_FLAG="-fPIC"
+        WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
+        WX_ALL="CREATE_LINKS"
       ;;
       *)
         AC_MSG_ERROR(unknown system type ${host}.)
@@ -1893,6 +1929,26 @@ dnl ---------------------------------------------------------------------------
 dnl Checks for structures
 dnl ---------------------------------------------------------------------------
 
+dnl does passwd struct has the pw_gecos field?
+AC_CACHE_CHECK([for pw_gecos in struct passwd], wx_cv_struct_pw_gecos,
+    [
+        AC_TRY_COMPILE([#include <pwd.h>],
+             [
+                char *p;
+                struct passwd *pw;
+                p = pw->pw_gecos;
+             ],
+             [
+                wx_cv_struct_pw_gecos=yes
+                AC_DEFINE(HAVE_PW_GECOS)
+             ],
+             [
+                wx_cv_struct_pw_gecos=no
+             ]
+        )
+    ]
+)
+
 dnl ---------------------------------------------------------------------------
 dnl Checks for compiler characteristics
 dnl ---------------------------------------------------------------------------
@@ -1996,17 +2052,33 @@ AC_CHECK_FUNCS(vfork)
 dnl check for timegm() used by datetime.cpp
 AC_CHECK_FUNCS(timegm)
 
-POSIX4_LINK=
-AC_CHECK_FUNCS(nanosleep, AC_DEFINE(HAVE_NANOSLEEP), [
-    AC_CHECK_LIB(posix4, nanosleep, [
-      AC_DEFINE(HAVE_NANOSLEEP)
-      POSIX4_LINK="-lposix4"
-    ], [
-    AC_CHECK_FUNCS(usleep,
-        AC_DEFINE(HAVE_USLEEP),
-        AC_MSG_WARN([wxSleep() function will not work]))
-    ])
-])
+HAVE_SOME_SLEEP_FUNC=0
+if test "$USE_BEOS" = 1; then
+    dnl BeOS has its own (wonder where did they get it from) sleep() function
+    dnl in unistd.h
+    AC_DEFINE(HAVE_SLEEP)
+    HAVE_SOME_SLEEP_FUNC=1
+fi
+
+if test "$HAVE_SOME_SLEEP_FUNC" != 1; then
+    dnl try nanosleep() in libc and libposix4, if this fails - usleep()
+    POSIX4_LINK=
+    AC_CHECK_FUNCS(nanosleep,
+        AC_DEFINE(HAVE_NANOSLEEP),
+        [
+            AC_CHECK_LIB(posix4, nanosleep,
+                [
+                    AC_DEFINE(HAVE_NANOSLEEP)
+                    POSIX4_LINK="-lposix4"
+                ],
+                [
+                    AC_CHECK_FUNCS(usleep)
+                    AC_MSG_WARN([wxSleep() function will not work])
+                ]
+            )
+        ]
+    )
+fi
 
 dnl check for uname (POSIX) and gethostname (BSD)
 AC_CHECK_FUNCS(uname gethostname, break)
@@ -2069,6 +2141,9 @@ if test "$wxUSE_THREADS" = "yes" ; then
     if test "$wxUSE_WINE" = 1 ; then
         AC_MSG_WARN([Threads are not supported under WINE])
         wxUSE_THREADS="no"
+    elif test "$USE_BEOS" = 1; then
+        AC_MSG_WARN([BeOS threads are not yet supported])
+        wxUSE_THREADS="no"
     fi
 fi
 
@@ -2177,7 +2252,7 @@ if test "$wxUSE_THREADS" = "yes"; then
 
   SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS thread"
 else
-  dnl on some systems, _REENTRANT should bedefined if we want to use any _r()
+  dnl on some systems, _REENTRANT should be defined if we want to use any _r()
   dnl functions - add tests for other functions here as well
   if test "$ac_cv_func_strtok_r" = "yes"; then
     AC_MSG_CHECKING(if -D_REENTRANT is needed)
@@ -2191,6 +2266,11 @@ else
   fi
 fi
 
+if test "$WXGTK13" = 1 ; then
+  AC_DEFINE_UNQUOTED(__WXGTK13__,$WXGTK13)
+  WXGTK12=1
+fi
+
 if test "$WXGTK12" = 1 ; then
   AC_DEFINE_UNQUOTED(__WXGTK12__,$WXGTK12)
 fi
@@ -2240,16 +2320,16 @@ if test "$wxUSE_PROFILE" = "yes" ; then
 fi
 
 DEP_INFO_FLAGS=
+CODE_GEN_FLAGS=
 if test "$GCC" = yes ; then
     if test "$wxUSE_NO_RTTI" = "yes" ; then
-        WXDEBUG_DEFINE="$WXDEBUG_DEFINE -fno-rtti"
+        CODE_GEN_FLAGS="$CODE_GEN_FLAGS -fno-rtti"
     fi
     if test "$wxUSE_NO_EXCEPTIONS" = "yes" ; then
-        WXDEBUG_DEFINE="$WXDEBUG_DEFINE -fno-exceptions"
+        CODE_GEN_FLAGS="$CODE_GEN_FLAGS -fno-exceptions"
     fi
     if test "$wxUSE_PERMISSIVE" = "yes" ; then
-       CFLAGS="${CFLAGS} -fpermissive"
-       CXXFLAGS="${CXXFLAGS} -fpermissive"
+       CODE_GEN_FLAGS="$CODE_GEN_FLAGS -fpermissive"
     fi
     if test "$wxUSE_NO_DEPS" = "no" ; then
         DEP_INFO_FLAGS="-MMD"
@@ -2421,22 +2501,21 @@ fi
 
 if test "$wxUSE_DIALUP_MANAGER" = "yes" ; then
   AC_DEFINE(wxUSE_DIALUP_MANAGER)
-  SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS nettest"
+  SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dialup"
 fi
 
 if test "$wxUSE_STREAMS" = "yes" ; then
   AC_DEFINE(wxUSE_STREAMS)
 fi
 
-if test "$wxUSE_SERIAL" = "yes" ; then
-  AC_DEFINE(wxUSE_SERIAL)
-fi
-
 dnl ------------------------------------------------------------------------
 dnl time/date functions
 dnl ------------------------------------------------------------------------
 
 if test "$wxUSE_TIMEDATE" = "yes"; then
+    dnl check for strptime
+    AC_CHECK_FUNCS(strptime)
+
     dnl check for timezone variable
     AC_CACHE_CHECK(for timezone variable in <time.h>,
                    wx_cv_var_timezone,
@@ -2596,7 +2675,7 @@ if test "$wxUSE_SOCKETS" = "yes" ; then
     AC_LANG_RESTORE
 
     AC_DEFINE(wxUSE_SOCKETS)
-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS wxsocket"
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS sockets"
     INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS protocol"
 fi
 
@@ -2647,18 +2726,20 @@ if test "$wxUSE_DYNLIB_CLASS" = "yes"; then
     if test "$HAVE_DL_FUNCS" = 0; then
         if test "$HAVE_SHL_FUNCS" = 0; then
           if test "$USE_UNIX" = 1; then
-              AC_MSG_WARN("--with-dynlib and --with-odbc will be disabled due to missing shared library support")
-              wxUSE_ODBC=no
+              AC_MSG_WARN([Missing dynamic loading support, several features will be disabled])
               wxUSE_DYNLIB_CLASS=no
           else
-              AC_MSG_WARN("Cannot check dynlib requirements on non-Unix platforms. dynlib remains enabled.")
+              AC_MSG_WARN([Assuming wxLibrary class works on this platform])
           fi
         fi
     fi
 fi
 
 if test "$wxUSE_DYNLIB_CLASS" = "yes" ; then
-  AC_DEFINE(wxUSE_DYNLIB_CLASS)
+    AC_DEFINE(wxUSE_DYNLIB_CLASS)
+else
+    wxUSE_ODBC=no
+    wxUSE_SERIAL=no
 fi
 
 dnl ---------------------------------------------------------------------------
@@ -2677,6 +2758,14 @@ if test "$wxUSE_wxUSE_EXPERIMENTAL_PRINTF" = "yes"; then
   AC_DEFINE(wxUSE_EXPERIMENTAL_PRINTF)
 fi
 
+dnl ----------------------------------------------------------------
+dnl serialization support
+dnl ----------------------------------------------------------------
+
+if test "$wxUSE_SERIAL" = "yes" ; then
+    AC_DEFINE(wxUSE_SERIAL)
+fi
+
 dnl ----------------------------------------------------------------
 dnl iODBC support
 dnl ----------------------------------------------------------------
@@ -3093,9 +3182,12 @@ if test "$wxUSE_GUI" = "yes"; then
     dnl      library features they need are present)
 
     dnl TODO some samples are never built so far:
-    dnl      mfc, nativdlg, oleauto, ownerdrw, proplist
-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS bombs controls dialogs drawing dynamic \
-                     font forty fractal image minimal richedit wxpoem"
+    dnl      ipc, mfc, nativdlg, oleauto, ownerdrw, proplist
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS controls dialogs drawing dynamic \
+                     font fractal image minimal richedit"
+
+    dnl this is needed to be able to find AFM files
+    CPPFLAGS="$CPPFLAGS \$(EXTRADEFS)"
 else
     SAMPLES_SUBDIRS=""
 fi
@@ -3104,7 +3196,14 @@ dnl for convenience, sort the samples in alphabetical order
 dnl
 dnl FIXME For some mysterious reasons, sometimes the directories are duplicated
 dnl       in this list - hence uniq. But normally, this shouldn't be needed!
-SAMPLES_SUBDIRS="`echo $SAMPLES_SUBDIRS | tr -s ' ' | tr ' ' '\n' | sort | uniq | tr '\n' ' '`"
+dnl       Unfortunately, there is a bug in OS/2's tr, such that 
+dnl       tr ' ' '\n' introduces DOS-like line breaks, whereas tr '\n' ' '
+dnl       only removes the Unix-like part of the introduced line break.
+SAMPLES_SUBDIRS="`echo $SAMPLES_SUBDIRS | tr -s ' ' | tr ' ' '\n' | sort | uniq | tr '\n' ' '| tr -d '\r'`"
+
+dnl makefile variables
+AC_SUBST(LEX_STEM)
+AC_SUBST(PATH_IFS)
 
 dnl global options
 AC_SUBST(WX_MAJOR_VERSION_NUMBER)
@@ -3127,12 +3226,15 @@ AC_SUBST(WX_ALL_INSTALLED)
 AC_SUBST(SHARED_LD)
 AC_SUBST(PIC_FLAG)
 AC_SUBST(DEP_INFO_FLAGS)
+AC_SUBST(CODE_GEN_FLAGS)
 AC_SUBST(BURNT_LIBRARY_NAME)
 
 dnl debugging options
 AC_SUBST(WXDEBUG_DEFINE)
 
 dnl toolkit options
+AC_SUBST(USE_GUI)
+AC_SUBST(AFMINSTALL)
 AC_SUBST(TOOLKIT)
 AC_SUBST(TOOLKIT_DEF)
 AC_SUBST(TOOLKIT_DIR)
@@ -3165,6 +3267,7 @@ AC_SUBST(USER_SUBDIRS)
 dnl additional libraries and linker settings
 AC_SUBST(LDFLAGS)
 AC_SUBST(EXTRA_LIBS)
+AC_SUBST(EXTRADEFS)
 AC_SUBST(LIBS)
 AC_SUBST(LD_LIBS)
 
@@ -3194,9 +3297,15 @@ AC_OUTPUT([
             src/makeprog.env
             src/makelib.env
             Makefile
+            demos/Makefile
+            demos/bombs/Makefile
+            demos/forty/Makefile
+            demos/fractal/Makefile
+            demos/life/Makefile
+            demos/poem/Makefile
             samples/Makefile
-            samples/bombs/Makefile
             samples/caret/Makefile
+            samples/calendar/Makefile
             samples/checklst/Makefile
             samples/config/Makefile
             samples/controls/Makefile
@@ -3207,22 +3316,25 @@ AC_OUTPUT([
             samples/docvwmdi/Makefile
             samples/dnd/Makefile
             samples/drawing/Makefile
-            samples/forty/Makefile
+            samples/exec/Makefile
             samples/font/Makefile
-            samples/fractal/Makefile
+            samples/grid/Makefile
+            samples/help/Makefile
             samples/image/Makefile
             samples/internat/Makefile
+            samples/ipc/Makefile
             samples/layout/Makefile
             samples/listctrl/Makefile
             samples/mdi/Makefile
             samples/minifram/Makefile
             samples/minimal/Makefile
-            samples/nettest/Makefile
+            samples/dialup/Makefile
             samples/newgrid/Makefile
             samples/notebook/Makefile
             samples/png/Makefile
             samples/printing/Makefile
             samples/proplist/Makefile
+            samples/propsize/Makefile
             samples/richedit/Makefile
             samples/resource/Makefile
             samples/sashtest/Makefile
@@ -3235,8 +3347,7 @@ AC_OUTPUT([
             samples/treectrl/Makefile
             samples/typetest/Makefile
             samples/validate/Makefile
-            samples/wxpoem/Makefile
-            samples/wxsocket/Makefile
+            samples/sockets/Makefile
             samples/wizard/Makefile
             samples/html/Makefile
             samples/html/about/Makefile
@@ -3255,6 +3366,14 @@ AC_OUTPUT([
             utils/glcanvas/${GL_TOOLKIT_DIR}/Makefile
             utils/ogl/Makefile
             utils/ogl/src/Makefile
+            utils/makegen/Makefile
+            utils/HelpGen/Makefile
+            utils/HelpGen/src/Makefile
+            utils/tex2rtf/Makefile
+            utils/tex2rtf/src/Makefile
+            utils/hhp2cached/Makefile
+            utils/dialoged/Makefile
+            utils/dialoged/src/Makefile
           ],
           [
             chmod +x wx-config

demos/Makefile.in

@@ -0,0 +1,11 @@
+#
+# Makefile : Builds wxWindows demos for Unix.
+#
+
+DEMOS_SUBDIRS=bombs forty fractal life poem
+
+all:
+	@for d in $(DEMOS_SUBDIRS); do (cd $$d && make); done
+
+clean:
+	@for d in $(DEMOS_SUBDIRS); do (cd $$d && make clean); done

demos/bombs/Makefile.in

@@ -11,7 +11,7 @@
 
 top_srcdir = @top_srcdir@
 top_builddir = ../..
-program_dir = samples/bombs
+program_dir = demos/bombs
 
 PROGRAM=bombs
 

demos/forty/Makefile.in

@@ -11,7 +11,7 @@
 
 top_srcdir = @top_srcdir@
 top_builddir = ../..
-program_dir = samples/forty
+program_dir = demos/forty
 
 PROGRAM=forty
 

demos/forty/game.cpp

@@ -289,6 +289,7 @@ void Game::Redraw(wxDC& dc)
 		// Initialise the card bitmap to the background colour
 		wxMemoryDC memoryDC;
 		memoryDC.SelectObject(*m_bmapCard);
+        memoryDC.SetPen( *wxTRANSPARENT_PEN );
 		memoryDC.SetBrush(FortyApp::BackgroundBrush());
 		memoryDC.DrawRectangle(0, 0, CardWidth, CardHeight);
 		memoryDC.SelectObject(*m_bmap);
@@ -409,8 +410,8 @@ void Game::LButtonDblClk(wxDC& dc, int x, int y)
 			{
 				for(i = 0; i < 4; i++)
 				{
-					Card* m_topCard;
-					if ((m_topCard = m_foundations[i]->GetTopCard()))
+					Card* m_topCard = m_foundations[i]->GetTopCard();
+					if ( m_topCard )
                     {
 						if (m_topCard->GetSuit() == card->GetSuit() &&
                             m_foundations[i + 4] != pile &&
@@ -713,14 +714,14 @@ void Pack::Shuffle()
     }
     for (i = 0; i <= m_topCard; i++)
     {
-	int pos = rand() % (m_topCard + 1);
-	while (temp[pos])
-	{
-	    pos--;
-	    if (pos < 0) pos = m_topCard;
-	}
-	m_cards[i]->TurnCard(facedown);
-	temp[pos] = m_cards[i];
+	    int pos = rand() % (m_topCard + 1);
+	    while (temp[pos])
+	    {
+	        pos--;
+	        if (pos < 0) pos = m_topCard;
+	    }
+	    m_cards[i]->TurnCard(facedown);
+	    temp[pos] = m_cards[i];
         m_cards[i] = 0;
     }
 
@@ -729,12 +730,12 @@ void Pack::Shuffle()
         // unoccupied position after the random position.
     for (i = 0; i <= m_topCard; i++)
     {
-	int pos = rand() % (m_topCard + 1);
-	while (m_cards[pos])
-	{
-	    pos++;
+	    int pos = rand() % (m_topCard + 1);
+	    while (m_cards[pos])
+	    {
+	        pos++;
             if (pos > m_topCard) pos = 0;
-	}
+	    }
         m_cards[pos] = temp[i];
     }
 }
@@ -746,6 +747,7 @@ void Pack::Redraw(wxDC& dc)
     char str[10];
     sprintf(str, "%d  ", m_topCard + 1);
 
+    dc.SetBackgroundMode( wxSOLID );
 	dc.SetTextBackground(FortyApp::BackgroundColour());
 	dc.SetTextForeground(FortyApp::TextColour());
     dc.DrawText(str, m_x + CardWidth + 5, m_y + CardHeight / 2);
@@ -771,7 +773,7 @@ Pack::~Pack()
 {
     for (m_topCard = 0; m_topCard < NumCards; m_topCard++)
     {
-	delete m_cards[m_topCard];
+	    delete m_cards[m_topCard];
     }
 };
 
@@ -791,9 +793,9 @@ bool Base::AcceptCard(Card* card)
 
     if (m_topCard >= 0)
     {
-	if (m_cards[m_topCard]->GetSuit() == card->GetSuit() &&
-	    m_cards[m_topCard]->GetPipValue() - 1 == card->GetPipValue())
-	{
+	    if (m_cards[m_topCard]->GetSuit() == card->GetSuit() &&
+	        m_cards[m_topCard]->GetPipValue() - 1 == card->GetPipValue())
+	    {
             retval = TRUE;
         }
     }
@@ -825,15 +827,15 @@ bool Foundation::AcceptCard(Card* card)
 
     if (m_topCard >= 0)
     {
-	if (m_cards[m_topCard]->GetSuit() == card->GetSuit() &&
-	    m_cards[m_topCard]->GetPipValue() + 1 == card->GetPipValue())
-	{
+	    if (m_cards[m_topCard]->GetSuit() == card->GetSuit() &&
+	        m_cards[m_topCard]->GetPipValue() + 1 == card->GetPipValue())
+	    {
             retval = TRUE;
         }
     }
     else if (card->GetPipValue() == 1)
     {
-	// It's an ace and the pile is empty - ACCEPT
+	    // It's an ace and the pile is empty - ACCEPT
         retval = TRUE;
     }
     return retval;
@@ -857,22 +859,22 @@ void Discard::Redraw(wxDC& dc)
 {
     if (m_topCard >= 0)
     {
-	if (m_dx == 0 && m_dy == 0)
-	{
-            m_cards[m_topCard]->Draw(dc, m_x, m_y);
-	}
-	else
-	{
-	    int x = m_x;
-	    int y = m_y;
-	    for (int i = 0; i <= m_topCard; i++)
+	    if (m_dx == 0 && m_dy == 0)
 	    {
-		m_cards[i]->Draw(dc, x, y);
-		x += m_dx;
-		y += m_dy;
-		if (i == 31)
-		{
-		    x = m_x;
+            m_cards[m_topCard]->Draw(dc, m_x, m_y);
+	    }
+	    else
+	    {
+	        int x = m_x;
+	        int y = m_y;
+	        for (int i = 0; i <= m_topCard; i++)
+	        {
+		        m_cards[i]->Draw(dc, x, y);
+		        x += m_dx;
+		        y += m_dy;
+		        if (i == 31)
+		        {
+		            x = m_x;
                     y = m_y + CardHeight / 3;
                 }
             }
@@ -889,18 +891,18 @@ void Discard::GetTopCardPos(int& x, int& y)
 {
     if (m_topCard < 0)
     {
-	x = m_x;
-	y = m_y;
+	    x = m_x;
+	    y = m_y;
     }
     else if (m_topCard > 31)
     {
-	x = m_x + m_dx * (m_topCard - 32);
-	y = m_y + CardHeight / 3;
+	    x = m_x + m_dx * (m_topCard - 32);
+	    y = m_y + CardHeight / 3;
     }
     else
     {
-	x = m_x + m_dx * m_topCard;
-	y = m_y;
+	    x = m_x + m_dx * m_topCard;
+	    y = m_y;
     }
 }
 

demos/forty/makefile.unx

@@ -13,9 +13,9 @@
 # under Linux.
 #
 
-CC = gcc
+CC = g++
 
-PROGRAM = drawing
+PROGRAM = forty
 
 OBJECTS = $(PROGRAM).o canvas.o card.o game.o pile.o playerdg.o scoredg.o scorefil.o
 

demos/forty/playerdg.cpp

@@ -123,6 +123,8 @@ PlayerSelectionDialog::PlayerSelectionDialog(
 	}
 
 	Layout();
+    
+    CentreOnParent();
 }
 
 PlayerSelectionDialog::~PlayerSelectionDialog()

demos/forty/scorefil.cpp

@@ -138,8 +138,8 @@ void ScoreFile::ReadPlayersScore(
 						int& games,
 						int& score)
 {
-	long check;
-	long myWins, myGames, myScore;
+	long check = 0;
+	long myWins = 0, myGames = 0, myScore = 0;
 
 	games = wins = score = 0;
 
@@ -171,7 +171,7 @@ void ScoreFile::WritePlayersScore(const char* player, int wins, int games, int s
     if (player)
 	{
 		m_config->SetPath("/General");
-		m_config->Write("LastPlayer", player);
+		m_config->Write("LastPlayer", wxString(player)); // Without wxString tmp, thinks it's bool in VC++
 
 		m_config->SetPath("/Players");
 		m_config->SetPath(player);

demos/fractal/Makefile.in

@@ -11,7 +11,7 @@
 
 top_srcdir = @top_srcdir@
 top_builddir = ../..
-program_dir = samples/fractal
+program_dir = demos/fractal
 
 PROGRAM=fractal
 

demos/life/Makefile.in

@@ -11,11 +11,11 @@
 
 top_srcdir = @top_srcdir@
 top_builddir = ../..
-program_dir = samples/minifram
+program_dir = demos/life
 
-PROGRAM=test
+PROGRAM=life
 
-OBJECTS=$(PROGRAM).o
+OBJECTS=$(PROGRAM).o dialogs.o game.o
 
 include ../../src/makeprog.env
 

demos/life/bitmaps/play.xpm

@@ -0,0 +1,24 @@
+/* XPM */
+static char *play_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 2 1",
+"  c None",
+". c Black",
+/* pixels */
+"                ",
+"                ",
+"                ",
+"    .           ",
+"    ...         ",
+"    .....       ",
+"    .......     ",
+"    .........   ",
+"    .......     ",
+"    .....       ",
+"    ...         ",
+"    .           ",
+"                ",
+"                ",
+"                ",
+"                "
+};

demos/life/bitmaps/reset.xpm

@@ -0,0 +1,24 @@
+/* XPM */
+static char *reset_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 2 1",
+"  c None",
+". c Black",
+/* pixels */
+"                ",
+"                ",
+"                ",
+"   ..      ..   ",
+"   ...    ...   ",
+"    ...  ...    ",
+"     ......     ",
+"      ....      ",
+"      ....      ",
+"     ......     ",
+"    ...  ...    ",
+"   ...    ...   ",
+"   ..      ..   ",
+"                ",
+"                ",
+"                "
+};

demos/life/bitmaps/stop.xpm

@@ -0,0 +1,24 @@
+/* XPM */
+static char *stop_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 2 1",
+"  c None",
+". c Black",
+/* pixels */
+"                ",
+"                ",
+"                ",
+"    ........    ",
+"    ........    ",
+"    ........    ",
+"    ........    ",
+"    ........    ",
+"    ........    ",
+"    ........    ",
+"    ........    ",
+"    ........    ",
+"                ",
+"                ",
+"                ",
+"                "
+};

demos/life/dialogs.cpp

@@ -0,0 +1,212 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        dialogs.cpp
+// Purpose:     Life! dialogs
+// Author:      Guillermo Rodriguez Garcia, <guille@iies.es>
+// Modified by:
+// Created:     Jan/2000
+// RCS-ID:      $Id$
+// Copyright:   (c) 2000, Guillermo Rodriguez Garcia
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// ==========================================================================
+// declarations
+// ==========================================================================
+
+// --------------------------------------------------------------------------
+// headers
+// --------------------------------------------------------------------------
+
+#ifdef __GNUG__
+    #pragma implementation "dialogs.h"
+#endif
+
+// for compilers that support precompilation, includes "wx/wx.h"
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+// for all others, include the necessary headers
+#ifndef WX_PRECOMP
+    #include "wx/wx.h"
+#endif
+
+#include "wx/statline.h"
+#include "wx/spinctrl.h"
+
+#include "dialogs.h"
+#include "life.h"
+#include "game.h"
+
+// --------------------------------------------------------------------------
+// constants
+// --------------------------------------------------------------------------
+
+// IDs for the controls and the menu commands
+enum
+{
+    // listbox in samples dialog
+    ID_LISTBOX = 2001
+};
+
+// sample configurations
+#include "samples.inc"
+
+// --------------------------------------------------------------------------
+// event tables and other macros for wxWindows
+// --------------------------------------------------------------------------
+
+// Event tables
+BEGIN_EVENT_TABLE(LifeNewGameDialog, wxDialog)
+    EVT_BUTTON  (wxID_OK,    LifeNewGameDialog::OnOK)
+END_EVENT_TABLE()
+
+BEGIN_EVENT_TABLE(LifeSamplesDialog, wxDialog)
+    EVT_LISTBOX (ID_LISTBOX, LifeSamplesDialog::OnListBox)
+END_EVENT_TABLE()
+
+
+// ==========================================================================
+// implementation
+// ==========================================================================
+
+// --------------------------------------------------------------------------
+// LifeNewGameDialog
+// --------------------------------------------------------------------------
+
+LifeNewGameDialog::LifeNewGameDialog(wxWindow *parent, int *w, int *h)
+                 : wxDialog(parent, -1,
+                            _("New game"),
+                            wxDefaultPosition,
+                            wxDefaultSize,
+                            wxDEFAULT_DIALOG_STYLE | wxDIALOG_MODAL)
+{
+    m_w = w;
+    m_h = h;
+
+    // spin ctrls
+    m_spinctrlw = new wxSpinCtrl( this, -1 );
+    m_spinctrlw->SetValue(*m_w);
+    m_spinctrlw->SetRange(LIFE_MIN, LIFE_MAX);
+
+    m_spinctrlh = new wxSpinCtrl( this, -1 );
+    m_spinctrlh->SetValue(*m_h);
+    m_spinctrlh->SetRange(LIFE_MIN, LIFE_MAX);
+
+    // component layout
+    wxBoxSizer *inputsizer1 = new wxBoxSizer( wxHORIZONTAL );
+    inputsizer1->Add( new wxStaticText(this, -1, _("Width")), 1, wxCENTRE | wxLEFT, 20);
+    inputsizer1->Add( m_spinctrlw, 2, wxCENTRE | wxLEFT | wxRIGHT, 20 );
+
+    wxBoxSizer *inputsizer2 = new wxBoxSizer( wxHORIZONTAL );
+    inputsizer2->Add( new wxStaticText(this, -1, _("Height")), 1, wxCENTRE | wxLEFT, 20);
+    inputsizer2->Add( m_spinctrlh, 2, wxCENTRE | wxLEFT | wxRIGHT, 20 );
+
+    wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );
+    topsizer->Add( CreateTextSizer(_("Enter board dimensions")), 0, wxALL, 10 );
+    topsizer->Add( new wxStaticLine(this, -1), 0, wxGROW | wxLEFT | wxRIGHT | wxBOTTOM, 10);
+    topsizer->Add( inputsizer1, 1, wxGROW | wxLEFT | wxRIGHT, 5 );
+    topsizer->Add( inputsizer2, 1, wxGROW | wxLEFT | wxRIGHT, 5 );
+    topsizer->Add( new wxStaticLine(this, -1), 0, wxGROW | wxLEFT | wxRIGHT | wxTOP, 10);
+    topsizer->Add( CreateButtonSizer(wxOK | wxCANCEL), 0, wxCENTRE | wxALL, 10);
+
+    // activate
+    SetSizer(topsizer);
+    SetAutoLayout(TRUE);
+    topsizer->SetSizeHints(this);
+    topsizer->Fit(this);
+    Centre(wxBOTH);
+}
+
+void LifeNewGameDialog::OnOK(wxCommandEvent& WXUNUSED(event))
+{
+    *m_w = m_spinctrlw->GetValue();
+    *m_h = m_spinctrlh->GetValue();
+
+    EndModal(wxID_OK);
+}
+
+// --------------------------------------------------------------------------
+// LifeSamplesDialog
+// --------------------------------------------------------------------------
+
+LifeSamplesDialog::LifeSamplesDialog(wxWindow *parent)
+                 : wxDialog(parent, -1,
+                            _("Sample games"),
+                            wxDefaultPosition,
+                            wxDefaultSize,
+                            wxDEFAULT_DIALOG_STYLE | wxDIALOG_MODAL)
+{
+    m_value = 0;
+   
+    // create and populate the list of available samples
+    m_list = new wxListBox( this, ID_LISTBOX,
+        wxDefaultPosition,
+        wxDefaultSize,
+        0, NULL,
+        wxLB_SINGLE | wxLB_NEEDED_SB | wxLB_HSCROLL );
+
+    for (unsigned i = 0; i < (sizeof(g_shapes) / sizeof(LifeShape)); i++)
+        m_list->Append(g_shapes[i].m_name);
+
+    // descriptions
+    wxStaticBox *statbox = new wxStaticBox( this, -1, _("Description"));
+    m_life   = new Life( 16, 16 );
+    m_life->SetShape(g_shapes[0]);
+    m_canvas = new LifeCanvas( this, m_life, FALSE );
+    m_text   = new wxTextCtrl( this, -1,
+        g_shapes[0].m_desc,
+        wxDefaultPosition,
+        wxSize(300, 60),
+        wxTE_MULTILINE | wxTE_READONLY);
+
+    // layout components
+    wxStaticBoxSizer *sizer1 = new wxStaticBoxSizer( statbox, wxVERTICAL );
+    sizer1->Add( m_canvas, 2, wxGROW | wxCENTRE | wxALL, 5);
+    sizer1->Add( m_text, 1, wxGROW | wxCENTRE | wxALL, 5 );
+
+    wxBoxSizer *sizer2 = new wxBoxSizer( wxHORIZONTAL );
+    sizer2->Add( m_list, 0, wxGROW | wxCENTRE | wxALL, 5 );
+    sizer2->Add( sizer1, 1, wxGROW | wxCENTRE | wxALL, 5 );
+
+    wxBoxSizer *sizer3 = new wxBoxSizer( wxVERTICAL );
+    sizer3->Add( CreateTextSizer(_("Select one configuration")), 0, wxALL, 10 );
+    sizer3->Add( new wxStaticLine(this, -1), 0, wxGROW | wxLEFT | wxRIGHT, 10 );
+    sizer3->Add( sizer2, 1, wxGROW | wxCENTRE | wxALL, 5 );
+    sizer3->Add( new wxStaticLine(this, -1), 0, wxGROW | wxLEFT | wxRIGHT, 10 );
+    sizer3->Add( CreateButtonSizer(wxOK | wxCANCEL), 0, wxCENTRE | wxALL, 10 );
+
+    // activate
+    SetSizer(sizer3);
+    SetAutoLayout(TRUE);
+    sizer3->SetSizeHints(this);
+    sizer3->Fit(this);
+    Centre(wxBOTH);
+}
+
+LifeSamplesDialog::~LifeSamplesDialog()
+{
+    m_canvas->Destroy();
+    delete m_life;
+}
+
+int LifeSamplesDialog::GetValue()
+{
+    return m_value;
+}
+
+void LifeSamplesDialog::OnListBox(wxCommandEvent& event)
+{
+    if (event.GetSelection() != -1)
+    {
+        m_value = m_list->GetSelection();
+        m_text->SetValue(g_shapes[ event.GetSelection() ].m_desc);
+        m_life->SetShape(g_shapes[ event.GetSelection() ]);
+
+        m_canvas->DrawEverything(TRUE);     // force redraw everything
+        m_canvas->Refresh(FALSE);           // do not erase background
+    }
+}
+

demos/life/dialogs.h

@@ -0,0 +1,92 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        dialogs.h
+// Purpose:     Life! dialogs
+// Author:      Guillermo Rodriguez Garcia, <guille@iies.es>
+// Modified by:
+// Created:     Jan/2000
+// RCS-ID:      $Id$
+// Copyright:   (c) 2000, Guillermo Rodriguez Garcia
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _LIFE_DIALOGS_H_
+#define _LIFE_DIALOGS_H_
+
+#ifdef __GNUG__
+    #pragma interface "dialogs.h"
+#endif
+
+// for compilers that support precompilation, includes "wx/wx.h"
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+// for all others, include the necessary headers
+#ifndef WX_PRECOMP
+    #include "wx/wx.h"
+#endif
+
+#include "wx/spinctrl.h"
+
+#include "life.h"
+#include "game.h"
+
+
+// sample configurations
+extern LifeShape g_shapes[];
+
+
+// --------------------------------------------------------------------------
+// LifeNewGameDialog
+// --------------------------------------------------------------------------
+
+class LifeNewGameDialog : public wxDialog
+{
+public:
+    // ctor
+    LifeNewGameDialog(wxWindow *parent, int *w, int *h);
+
+    // event handlers
+    void OnOK(wxCommandEvent& event);
+
+private:
+    // any class wishing to process wxWindows events must use this macro
+    DECLARE_EVENT_TABLE();
+
+    int        *m_w;
+    int        *m_h;
+    wxSpinCtrl *m_spinctrlw;
+    wxSpinCtrl *m_spinctrlh;
+};
+
+// --------------------------------------------------------------------------
+// LifeSamplesDialog
+// --------------------------------------------------------------------------
+
+class LifeSamplesDialog : public wxDialog
+{
+public:
+    // ctor and dtor
+    LifeSamplesDialog(wxWindow *parent);
+    ~LifeSamplesDialog();
+
+    // members
+    int GetValue();
+
+    // event handlers
+    void OnListBox(wxCommandEvent &event);
+
+private:
+    // any class wishing to process wxWindows events must use this macro
+    DECLARE_EVENT_TABLE();
+
+    int         m_value;
+    wxListBox  *m_list;
+    wxTextCtrl *m_text;
+    LifeCanvas *m_canvas;
+    Life       *m_life;
+};
+
+#endif  // _LIFE_DIALOGS_H_

demos/life/game.cpp

@@ -0,0 +1,226 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        game.cpp
+// Purpose:     Life! game logic
+// Author:      Guillermo Rodriguez Garcia, <guille@iies.es>
+// Modified by:
+// Created:     Jan/2000
+// RCS-ID:      $Id$
+// Copyright:   (c) 2000, Guillermo Rodriguez Garcia
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// ==========================================================================
+// declarations
+// ==========================================================================
+
+// --------------------------------------------------------------------------
+// headers
+// --------------------------------------------------------------------------
+
+#ifdef __GNUG__
+    #pragma implementation "game.h"
+#endif
+
+// for compilers that support precompilation, includes "wx/wx.h"
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+// for all others, include the necessary headers
+#ifndef WX_PRECOMP
+    #include "wx/wx.h"
+#endif
+
+#include "game.h"
+
+// ==========================================================================
+// implementation
+// ==========================================================================
+
+// --------------------------------------------------------------------------
+// Life
+// --------------------------------------------------------------------------
+
+/* Format of the cell: (32 bit integer)
+ *
+ * 0yyyyyyy yyyyyy0x xxxxxxxxx xxx000ff
+ *
+ * y = y coordinate (13 bits)
+ * x = x coordinate (13 bits)
+ * f = flags (2 bits)
+ *
+ * OK, there is a reason for this, I promise :-). But I won't explain
+ * it now; it will be more clear when I implement the optimized life
+ * algorithm for large universes.
+ */
+
+Life::Life(int width, int height)
+{            
+    m_wrap = TRUE;
+    Create(width, height);
+}
+
+Life::~Life()
+{
+    Destroy();
+}
+
+void Life::Create(int width, int height)
+{
+    wxASSERT(width > 0 && height > 0 && m_cells.IsEmpty());
+
+    m_width = width;
+    m_height = height;
+
+    // preallocate memory to speed up initialization
+    m_cells.Alloc(m_width * m_height);
+    m_changed.Alloc(1000);
+
+    // add all cells
+    for (int j = 0; j < m_height; j++)
+        for (int i = 0; i < m_width; i++)
+            m_cells.Add( MakeCell(i, j, FALSE) );
+}
+
+void Life::Destroy()
+{
+    m_cells.Clear();
+    m_changed.Clear();
+}
+
+void Life::Clear()
+{
+    // set all cells in the array to dead
+    for (int j = 0; j < m_height; j++)
+        for (int i = 0; i < m_width; i++)
+            m_cells[j * m_width + i] &= ~CELL_ALIVE;
+}
+
+Cell Life::MakeCell(int i, int j, bool alive) const
+{
+    return (Cell)((j << 18) | (i << 5) | (alive? CELL_ALIVE : CELL_DEAD));
+}
+
+bool Life::IsAlive(int i, int j) const
+{
+    wxASSERT(i >= 0 && j >= 0 && i < m_width && j < m_height);
+
+    return (m_cells[j * m_width + i] & CELL_ALIVE);
+}
+
+bool Life::IsAlive(Cell c) const { return (c & CELL_ALIVE); };
+int  Life::GetX(Cell c) const    { return (c >> 5) & 0x1fff; };
+int  Life::GetY(Cell c) const    { return (c >> 18); };
+
+Cell Life::SetCell(int i, int j, bool alive)
+{
+    wxASSERT(i >= 0 && j >= 0 && i < m_width && j < m_height);
+
+    Cell c = MakeCell(i, j, alive);
+
+    m_cells[j * m_width + i] = c;
+    return c;
+}
+
+void Life::SetShape(LifeShape& shape)
+{
+    wxASSERT((m_width >= shape.m_width) && (m_height >= shape.m_height));
+
+    int i0  = (m_width - shape.m_width) / 2;
+    int j0  = (m_height - shape.m_height) / 2;
+    char *p = shape.m_data;
+
+    Clear();
+    for (int j = j0; j < j0 + shape.m_height; j++)
+        for (int i = i0; i < i0 + shape.m_width; i++)
+            SetCell(i, j, *(p++) == '*');
+}
+
+bool Life::NextTic()
+{
+    int i, j;
+
+    m_changed.Empty();
+
+    /* 1st pass. Find and mark deaths and births for this generation.
+     *
+     * Rules:
+     *   An organism with <= 1 neighbors will die due to isolation.
+     *   An organism with >= 4 neighbors will die due to starvation.
+     *   New organisms are born in cells with exactly 3 neighbors.
+     */
+    for (j = 0; j < m_height; j++)
+        for (i = 0; i < m_width; i++)
+        {
+            int neighbors = GetNeighbors(i, j);
+            bool alive    = IsAlive(i, j);
+
+            /* Set CELL_MARK if this cell must change, clear it
+             * otherwise. We cannot toggle the CELL_ALIVE bit yet
+             * because all deaths and births are simultaneous (it
+             * would affect neighbouring cells).
+             */
+            if ((!alive && neighbors == 3) ||
+                (alive && (neighbors <= 1 || neighbors >= 4)))
+            {
+                m_cells[j * m_width + i] |= CELL_MARK;
+                m_changed.Add( MakeCell(i, j, !alive) );
+            }
+            else
+                m_cells[j * m_width + i] &= ~CELL_MARK;
+        }
+
+    /* 2nd pass. Stabilize.
+     */
+    for (j = 0; j < m_height; j++)
+        for (i = 0; i < m_width; i++)
+        {
+            /* Toggle CELL_ALIVE for those cells marked in the
+             * previous pass. Do not clear the CELL_MARK bit yet;
+             * it is useful to know which cells have changed and
+             * thus must be updated in the screen.
+             */
+            if (m_cells[j * m_width + i] & CELL_MARK)
+                m_cells[j * m_width + i] ^= CELL_ALIVE;
+        }
+
+    return (!m_changed.IsEmpty());
+}
+
+int Life::GetNeighbors(int x, int y) const
+{
+    wxASSERT(x >= 0 && y >= 0 && x < m_width && y < m_height);
+
+    int neighbors = 0;
+
+    int i0 = (x)? (x - 1) : 0;
+    int j0 = (y)? (y - 1) : 0;
+    int i1 = (x < (m_width - 1))? (x + 1) : (m_width - 1);
+    int j1 = (y < (m_height - 1))? (y + 1) : (m_height - 1);
+
+    if (m_wrap && ( !x || !y || x == (m_width - 1) || y == (m_height - 1)))
+    {
+        // this is an outer cell and wraparound is on
+        for (int j = y - 1; j <= y + 1; j++)
+            for (int i = x - 1; i <= x + 1; i++)
+                if (IsAlive( ((i < 0)? (i + m_width ) : (i % m_width)),
+                             ((j < 0)? (j + m_height) : (j % m_height)) ))
+                     neighbors++;
+    }
+    else
+    {
+        // this is an inner cell, or wraparound is off
+        for (int j = j0; j <= j1; j++)
+            for (int i = i0; i <= i1; i++)
+                if (IsAlive(i, j))
+                     neighbors++;
+    }
+
+    // do not count ourselves
+    if (IsAlive(x, y)) neighbors--;
+
+    return neighbors;
+}
+

demos/life/game.h

@@ -0,0 +1,129 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        game.h
+// Purpose:     Life! game logic
+// Author:      Guillermo Rodriguez Garcia, <guille@iies.es>
+// Modified by:
+// Created:     Jan/2000
+// RCS-ID:      $Id$
+// Copyright:   (c) 2000, Guillermo Rodriguez Garcia
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _LIFE_GAME_H_
+#define _LIFE_GAME_H_
+
+#ifdef __GNUG__
+    #pragma interface "game.h"
+#endif
+
+// for compilers that support precompilation, includes "wx/wx.h"
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+// for all others, include the necessary headers
+#ifndef WX_PRECOMP
+    #include "wx/wx.h"
+#endif
+
+// --------------------------------------------------------------------------
+// constants
+// --------------------------------------------------------------------------
+
+// minimum and maximum table size, in each dimension
+#define LIFE_MIN 20
+#define LIFE_MAX 200
+
+// --------------------------------------------------------------------------
+// Cell and CellArray;
+// --------------------------------------------------------------------------
+
+typedef long        Cell;
+typedef wxArrayLong CellArray;
+
+// --------------------------------------------------------------------------
+// LifeShape
+// --------------------------------------------------------------------------
+
+class LifeShape
+{
+public:
+    LifeShape::LifeShape(wxString name,
+                         wxString desc,
+                         int width, int height, char *data,
+                         int fieldWidth = 20, int fieldHeight = 20,
+                         bool wrap = TRUE)
+    {
+        m_name        = name;
+        m_desc        = desc;
+        m_width       = width;
+        m_height      = height;
+        m_data        = data;
+        m_fieldWidth  = fieldWidth;
+        m_fieldHeight = fieldHeight;
+        m_wrap        = wrap;
+    }
+
+    wxString  m_name;
+    wxString  m_desc;
+    int       m_width;
+    int       m_height;
+    char     *m_data;
+    int       m_fieldWidth;
+    int       m_fieldHeight;
+    bool      m_wrap;
+};
+
+// --------------------------------------------------------------------------
+// Life
+// --------------------------------------------------------------------------
+
+class Life
+{
+public:
+    // ctor and dtor
+    Life(int width, int height);
+    ~Life();
+    void Create(int width, int height);
+    void Destroy();
+
+    // game field
+    inline int       GetWidth() const        { return m_width; };
+    inline int       GetHeight() const       { return m_height; };
+    inline void      SetBorderWrap(bool on)  { m_wrap = on; };
+
+    // cells
+    bool             IsAlive(int i, int j) const;
+    bool             IsAlive(Cell c) const;
+    int              GetX(Cell c) const;
+    int              GetY(Cell c) const;
+    const CellArray* GetCells() const        { return &m_cells; };
+    const CellArray* GetChangedCells() const { return &m_changed; };
+
+    // game logic
+    void Clear();
+    Cell SetCell(int i, int j, bool alive = TRUE);
+    void SetShape(LifeShape &shape);
+    bool NextTic();
+
+private:
+    int         GetNeighbors(int i, int j) const;
+    inline Cell MakeCell(int i, int j, bool alive) const;
+
+    enum CellFlags
+    {
+        CELL_DEAD    = 0x0000,  // is dead
+        CELL_ALIVE   = 0x0001,  // is alive
+        CELL_MARK    = 0x0002,  // will change / has changed
+    };
+
+    int       m_width;
+    int       m_height;
+    CellArray m_cells;
+    CellArray m_changed;
+    bool      m_wrap;
+};
+
+#endif  // _LIFE_GAME_H_

demos/life/life.cpp

@@ -0,0 +1,630 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        life.cpp
+// Purpose:     The game of life, created by J. H. Conway
+// Author:      Guillermo Rodriguez Garcia, <guille@iies.es>
+// Modified by:
+// Created:     Jan/2000
+// RCS-ID:      $Id$
+// Copyright:   (c) 2000, Guillermo Rodriguez Garcia
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// ==========================================================================
+// declarations
+// ==========================================================================
+
+// --------------------------------------------------------------------------
+// headers
+// --------------------------------------------------------------------------
+
+#ifdef __GNUG__
+    #pragma implementation "life.h"
+#endif
+
+// for compilers that support precompilation, includes "wx/wx.h"
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+// for all others, include the necessary headers
+#ifndef WX_PRECOMP
+    #include "wx/wx.h"
+#endif
+
+#include "wx/statline.h"
+
+#include "life.h"
+#include "game.h"
+#include "dialogs.h"
+
+// --------------------------------------------------------------------------
+// resources
+// --------------------------------------------------------------------------
+
+#if defined(__WXGTK__) || defined(__WXMOTIF__)
+    // the application icon
+    #include "mondrian.xpm"
+
+    // bitmap buttons for the toolbar
+    #include "bitmaps/reset.xpm"
+    #include "bitmaps/play.xpm"
+    #include "bitmaps/stop.xpm"
+#endif
+
+// --------------------------------------------------------------------------
+// constants
+// --------------------------------------------------------------------------
+
+// IDs for the controls and the menu commands
+enum
+{
+    // menu items and toolbar buttons
+    ID_NEWGAME = 1001,
+    ID_SAMPLES,
+    ID_ABOUT,
+    ID_EXIT,
+    ID_CLEAR,
+    ID_START,
+    ID_STEP,
+    ID_STOP,
+    ID_WRAP,
+
+    // speed selection slider
+    ID_SLIDER
+};
+
+// --------------------------------------------------------------------------
+// event tables and other macros for wxWindows
+// --------------------------------------------------------------------------
+
+// Event tables
+BEGIN_EVENT_TABLE(LifeFrame, wxFrame)
+    EVT_MENU           (ID_NEWGAME, LifeFrame::OnNewGame)
+    EVT_MENU           (ID_SAMPLES, LifeFrame::OnSamples)
+    EVT_MENU           (ID_ABOUT,   LifeFrame::OnMenu)
+    EVT_MENU           (ID_EXIT,    LifeFrame::OnMenu)
+    EVT_MENU           (ID_CLEAR,   LifeFrame::OnMenu)
+    EVT_MENU           (ID_START,   LifeFrame::OnMenu)
+    EVT_MENU           (ID_STEP,    LifeFrame::OnMenu)
+    EVT_MENU           (ID_STOP,    LifeFrame::OnMenu)
+    EVT_MENU           (ID_WRAP,    LifeFrame::OnMenu)
+    EVT_COMMAND_SCROLL (ID_SLIDER,  LifeFrame::OnSlider)
+END_EVENT_TABLE()
+
+BEGIN_EVENT_TABLE(LifeCanvas, wxScrolledWindow)
+    EVT_PAINT          (            LifeCanvas::OnPaint)
+    EVT_SIZE           (            LifeCanvas::OnSize)
+    EVT_MOUSE_EVENTS   (            LifeCanvas::OnMouse)
+END_EVENT_TABLE()
+
+
+// Create a new application object
+IMPLEMENT_APP(LifeApp)
+
+// ==========================================================================
+// implementation
+// ==========================================================================
+
+// some shortcuts
+#define ADD_TOOL(a, b, c, d) \
+    toolBar->AddTool(a, b, wxNullBitmap, FALSE, -1, -1, (wxObject *)0, c, d)
+
+#define GET_FRAME() \
+    ((LifeFrame *) wxGetApp().GetTopWindow())
+
+// --------------------------------------------------------------------------
+// LifeApp
+// --------------------------------------------------------------------------
+
+// `Main program' equivalent: the program execution "starts" here
+bool LifeApp::OnInit()
+{
+    // create the main application window
+    LifeFrame *frame = new LifeFrame();
+
+    // show it and tell the application that it's our main window
+    frame->Show(TRUE);
+    SetTopWindow(frame);
+
+    // enter the main message loop and run the app
+    return TRUE;
+}
+
+// --------------------------------------------------------------------------
+// LifeFrame
+// --------------------------------------------------------------------------
+
+// frame constructor
+LifeFrame::LifeFrame() : wxFrame((wxFrame *)0, -1, _("Life!"), wxPoint(50, 50))
+{
+    // frame icon
+    SetIcon(wxICON(mondrian));
+
+    // menu bar
+    wxMenu *menuFile = new wxMenu("", wxMENU_TEAROFF);
+    wxMenu *menuGame = new wxMenu("", wxMENU_TEAROFF);
+
+    menuFile->Append(ID_NEWGAME, _("New game..."), _("Start a new game"));
+    menuFile->Append(ID_SAMPLES, _("Sample game..."), _("Select a sample configuration"));
+    menuFile->AppendSeparator();
+    menuFile->Append(ID_ABOUT, _("&About...\tCtrl-A"), _("Show about dialog"));
+    menuFile->AppendSeparator();
+    menuFile->Append(ID_EXIT, _("E&xit\tAlt-X"), _("Quit this program"));
+
+    menuGame->Append(ID_CLEAR, _("&Clear\tCtrl-C"), _("Clear game field"));
+    menuGame->Append(ID_START, _("&Start\tCtrl-S"), _("Start"));
+    menuGame->Append(ID_STEP, _("&Next\tCtrl-N"), _("Single step"));
+    menuGame->Append(ID_STOP, _("S&top\tCtrl-T"), _("Stop"));
+    menuGame->Enable(ID_STOP, FALSE);
+    menuGame->AppendSeparator();
+    menuGame->Append(ID_WRAP, _("&Wraparound\tCtrl-W"), _("Wrap around borders"), TRUE);
+    menuGame->Check (ID_WRAP, TRUE);
+
+    wxMenuBar *menuBar = new wxMenuBar();
+    menuBar->Append(menuFile, _("&File"));
+    menuBar->Append(menuGame, _("&Game"));
+    SetMenuBar(menuBar);
+
+    // tool bar
+    wxBitmap tbBitmaps[3];
+
+    tbBitmaps[0] = wxBITMAP(reset);
+    tbBitmaps[1] = wxBITMAP(play);
+    tbBitmaps[2] = wxBITMAP(stop);
+
+    wxToolBar *toolBar = CreateToolBar();
+    toolBar->SetMargins(5, 5);
+    toolBar->SetToolBitmapSize(wxSize(16, 16));
+    ADD_TOOL(ID_CLEAR, tbBitmaps[0], _("Clear"), _("Clear game board"));
+    ADD_TOOL(ID_START, tbBitmaps[1], _("Start"), _("Start"));
+    ADD_TOOL(ID_STOP , tbBitmaps[2], _("Stop"),  _("Stop"));
+    toolBar->EnableTool(ID_STOP, FALSE);
+    toolBar->Realize();
+
+    // status bar
+    CreateStatusBar(2);
+    SetStatusText(_("Welcome to Life!"));
+
+    // game
+    wxPanel *panel = new wxPanel(this, -1);
+    m_life         = new Life(20, 20);
+    m_canvas       = new LifeCanvas(panel, m_life);
+    m_timer        = new LifeTimer();
+    m_interval     = 500;
+    m_tics         = 0;
+    m_text         = new wxStaticText(panel, -1, "");
+    UpdateInfoText();
+
+    // slider
+    wxSlider *slider = new wxSlider(panel, ID_SLIDER,
+        5, 1, 10,
+        wxDefaultPosition,
+        wxSize(200, -1),
+        wxSL_HORIZONTAL | wxSL_AUTOTICKS);
+
+    // component layout
+    wxBoxSizer *sizer = new wxBoxSizer(wxVERTICAL);
+    sizer->Add(new wxStaticLine(panel, -1), 0, wxGROW | wxCENTRE);
+    sizer->Add(m_canvas, 1, wxGROW | wxCENTRE | wxALL, 5);
+    sizer->Add(new wxStaticLine(panel, -1), 0, wxGROW | wxCENTRE);
+    sizer->Add(m_text, 0, wxCENTRE | wxTOP, 5);
+    sizer->Add(slider, 0, wxCENTRE | wxALL, 5);
+    panel->SetSizer(sizer);
+    panel->SetAutoLayout(TRUE);
+    sizer->Fit(this);
+    sizer->SetSizeHints(this);
+}
+
+LifeFrame::~LifeFrame()
+{
+    delete m_timer;
+    delete m_life;
+}
+
+void LifeFrame::UpdateInfoText()
+{
+    wxString msg;
+
+    msg.Printf(_("Generation: %u,  Interval: %u ms"), m_tics, m_interval);
+    m_text->SetLabel(msg);
+}
+
+// event handlers
+void LifeFrame::OnMenu(wxCommandEvent& event)
+{
+    switch (event.GetId())
+    {
+        case ID_START   : OnStart(); break;
+        case ID_STEP    : OnTimer(); break;
+        case ID_STOP    : OnStop(); break;
+        case ID_WRAP    :
+        {
+            bool checked = GetMenuBar()->GetMenu(1)->IsChecked(ID_WRAP);
+            m_life->SetBorderWrap(checked);
+            break;
+        }
+        case ID_CLEAR   : 
+        {
+            OnStop();
+            m_life->Clear();
+            m_canvas->DrawEverything(TRUE);
+            m_canvas->Refresh(FALSE);
+            m_tics = 0;
+            UpdateInfoText();
+            break;
+        }
+        case ID_ABOUT :
+        {
+            wxMessageBox(
+                _("This is the about dialog of the Life! sample.\n"
+                  "(c) 2000 Guillermo Rodriguez Garcia"),
+                _("About Life!"),
+                wxOK | wxICON_INFORMATION,
+                this);
+            break;
+        }
+        case ID_EXIT :
+        {
+            // TRUE is to force the frame to close
+            Close(TRUE);
+            break;
+        }
+    }
+}
+
+void LifeFrame::OnNewGame(wxCommandEvent& WXUNUSED(event))
+{
+    int w = m_life->GetWidth();
+    int h = m_life->GetHeight();
+
+    // stop if it was running
+    OnStop();
+
+    // dialog box
+    LifeNewGameDialog dialog(this, &w, &h);
+
+    // new game?
+    if (dialog.ShowModal() == wxID_OK)
+    {
+        // check dimensions
+        if (w >= LIFE_MIN && w <= LIFE_MAX &&
+            h >= LIFE_MIN && h <= LIFE_MAX)
+        {
+            // resize game field
+            m_life->Destroy();
+            m_life->Create(w, h);
+            
+            // tell the canvas
+            m_canvas->Reset();
+            m_canvas->Refresh();
+            m_tics = 0;
+            UpdateInfoText();
+        }
+        else
+        {
+            wxString msg;
+            msg.Printf(_("Both dimensions must be within %u and %u.\n"),
+                LIFE_MIN, LIFE_MAX);
+            wxMessageBox(msg, _("Error!"), wxOK | wxICON_EXCLAMATION, this);
+        }
+    }
+}
+
+void LifeFrame::OnSamples(wxCommandEvent& WXUNUSED(event))
+{
+    // stop if it was running
+    OnStop();
+
+    // dialog box
+    LifeSamplesDialog dialog(this);
+
+    // new game?
+    if (dialog.ShowModal() == wxID_OK)
+    {
+        int result = dialog.GetValue();
+
+        if (result == -1)
+            return;
+
+        int gw   = g_shapes[result].m_fieldWidth;
+        int gh   = g_shapes[result].m_fieldHeight;
+        int wrap = g_shapes[result].m_wrap;
+
+        // set wraparound (don't ask the user)
+        m_life->SetBorderWrap(wrap);
+        GetMenuBar()->GetMenu(1)->Check(ID_WRAP, wrap);
+
+        // need to resize the game field?
+        if (gw > m_life->GetWidth() || gh > m_life->GetHeight())
+        {
+            wxString s;
+            s.Printf(_("Your game field is too small for this configuration.\n"
+                       "It is recommended to resize it to %u x %u. Proceed?\n"),
+                       gw, gh);
+
+            if (wxMessageBox(s, _("Question"), wxYES_NO | wxICON_QUESTION, this) == wxYES)
+            {
+                m_life->Destroy();
+                m_life->Create(gw, gh);
+            }
+        }
+
+        // put the shape
+        m_life->SetShape(g_shapes[result]);
+
+        // tell the canvas about the change
+        m_canvas->Reset();
+        m_canvas->Refresh();
+        m_tics = 0;
+        UpdateInfoText();
+    }
+}
+
+void LifeFrame::OnStart()
+{
+    if (!m_running)
+    {
+        GetToolBar()->EnableTool(ID_START, FALSE);
+        GetToolBar()->EnableTool(ID_STOP,  TRUE);
+        GetMenuBar()->GetMenu(1)->Enable(ID_START, FALSE);
+        GetMenuBar()->GetMenu(1)->Enable(ID_STEP,  FALSE);
+        GetMenuBar()->GetMenu(1)->Enable(ID_STOP,  TRUE);
+
+        m_timer->Start(m_interval);
+        m_running = TRUE;
+    }
+}
+
+void LifeFrame::OnStop()
+{
+    if (m_running)
+    {
+        GetToolBar()->EnableTool(ID_START, TRUE);
+        GetToolBar()->EnableTool(ID_STOP,  FALSE);
+        GetMenuBar()->GetMenu(1)->Enable(ID_START, TRUE);
+        GetMenuBar()->GetMenu(1)->Enable(ID_STEP,  TRUE);
+        GetMenuBar()->GetMenu(1)->Enable(ID_STOP,  FALSE);
+        
+        m_timer->Stop();
+        m_running = FALSE;
+    }
+}
+
+void LifeFrame::OnTimer()
+{
+    if (m_life->NextTic())
+        m_tics++;
+    else
+        OnStop();
+
+    UpdateInfoText();
+    m_canvas->DrawEverything();
+    m_canvas->Refresh(FALSE);
+}
+
+void LifeFrame::OnSlider(wxScrollEvent& event)
+{
+    m_interval = event.GetPosition() * 100;
+
+    // restart timer if running, to set the new interval
+    if (m_running)
+    {
+        m_timer->Stop();
+        m_timer->Start(m_interval);
+    }
+
+    UpdateInfoText();
+}
+
+// --------------------------------------------------------------------------
+// LifeTimer
+// --------------------------------------------------------------------------
+
+void LifeTimer::Notify()
+{
+    GET_FRAME()->OnTimer();
+};
+
+// --------------------------------------------------------------------------
+// LifeCanvas
+// --------------------------------------------------------------------------
+
+// canvas constructor
+LifeCanvas::LifeCanvas(wxWindow *parent, Life *life, bool interactive)
+          : wxScrolledWindow(parent, -1, wxPoint(0, 0), wxSize(100, 100))
+{
+    m_life        = life;
+    m_interactive = interactive;
+    m_cellsize    = 8;
+    m_bmp         = NULL;
+    Reset();
+}
+
+LifeCanvas::~LifeCanvas()
+{
+    delete m_bmp;
+}
+
+void LifeCanvas::Reset()
+{
+    if (m_bmp)
+        delete m_bmp;
+
+    m_status   = MOUSE_NOACTION;
+    m_width    = CellToCoord(m_life->GetWidth()) + 1;
+    m_height   = CellToCoord(m_life->GetHeight()) + 1;
+    m_bmp      = new wxBitmap(m_width, m_height);
+    wxCoord w  = GetClientSize().GetX();
+    wxCoord h  = GetClientSize().GetY();
+    m_xoffset  = (w > m_width)?  ((w - m_width) / 2)  : 0;
+    m_yoffset  = (h > m_height)? ((h - m_height) / 2) : 0;
+
+    // redraw everything
+    DrawEverything(TRUE);
+    SetScrollbars(10, 10, (m_width + 9) / 10, (m_height + 9) / 10);
+}
+
+void LifeCanvas::DrawEverything(bool force)
+{
+    wxMemoryDC dc;
+
+    dc.SelectObject(*m_bmp);
+    dc.BeginDrawing();
+
+    // draw cells
+    const CellArray *cells =
+        force? m_life->GetCells() : m_life->GetChangedCells();
+
+    for (unsigned i = 0; i < cells->GetCount(); i++)
+        DrawCell(cells->Item(i), dc);
+
+    // bounding rectangle (always drawn - better than clipping region)
+    dc.SetPen(*wxBLACK_PEN);
+    dc.SetBrush(*wxTRANSPARENT_BRUSH);
+    dc.DrawRectangle(0, 0, m_width, m_height);
+
+    dc.EndDrawing();
+    dc.SelectObject(wxNullBitmap);
+}
+
+void LifeCanvas::DrawCell(Cell c)
+{
+    wxMemoryDC dc;
+
+    dc.SelectObject(*m_bmp);
+    dc.BeginDrawing();
+
+    dc.SetClippingRegion(1, 1, m_width - 2, m_height - 2);
+    DrawCell(c, dc);
+
+    dc.EndDrawing();
+    dc.SelectObject(wxNullBitmap);
+}
+
+void LifeCanvas::DrawCell(Cell c, wxDC &dc)
+{
+    if (m_life->IsAlive(c))
+    {
+        dc.SetPen(*wxBLACK_PEN);
+        dc.SetBrush(*wxBLACK_BRUSH);
+        dc.DrawRectangle(CellToCoord( m_life->GetX(c) ),
+                         CellToCoord( m_life->GetY(c) ),
+                         m_cellsize,
+                         m_cellsize);
+    }
+    else
+    {
+        dc.SetPen(*wxLIGHT_GREY_PEN);
+        dc.SetBrush(*wxTRANSPARENT_BRUSH);
+        dc.DrawRectangle(CellToCoord( m_life->GetX(c) ),
+                         CellToCoord( m_life->GetY(c) ),
+                         m_cellsize,
+                         m_cellsize);
+        dc.SetPen(*wxWHITE_PEN);
+        dc.SetBrush(*wxWHITE_BRUSH);
+        dc.DrawRectangle(CellToCoord( m_life->GetX(c) ) + 1,
+                         CellToCoord( m_life->GetY(c) ) + 1,
+                         m_cellsize - 1,
+                         m_cellsize - 1);
+    }
+}
+
+// event handlers
+void LifeCanvas::OnPaint(wxPaintEvent& event)
+{
+    wxPaintDC dc(this);
+    wxMemoryDC memdc;
+
+    wxRegionIterator upd(GetUpdateRegion());
+    wxCoord x, y, w, h, xx, yy;
+
+    dc.BeginDrawing();
+    memdc.SelectObject(*m_bmp);
+
+    while(upd)
+    {
+        x = upd.GetX();
+        y = upd.GetY();
+        w = upd.GetW();
+        h = upd.GetH();
+        CalcUnscrolledPosition(x, y, &xx, &yy);
+
+        dc.Blit(x, y, w, h, &memdc, xx - m_xoffset, yy - m_yoffset);
+        upd++;
+    }
+
+    memdc.SelectObject(wxNullBitmap);
+    dc.EndDrawing();
+}
+
+void LifeCanvas::OnMouse(wxMouseEvent& event)
+{
+    if (!m_interactive)
+        return;
+
+    int x, y, xx, yy, i, j;
+
+    // which cell are we pointing at?
+    x = event.GetX();
+    y = event.GetY();
+    CalcUnscrolledPosition(x, y, &xx, &yy);
+    i = CoordToCell( xx - m_xoffset );
+    j = CoordToCell( yy - m_yoffset );
+
+    // adjust x, y to point to the upper left corner of the cell
+    CalcScrolledPosition( CellToCoord(i) + m_xoffset,
+                          CellToCoord(j) + m_yoffset,
+                          &x, &y );
+
+    // set cursor shape and statusbar text
+    if (i < 0 || i >= m_life->GetWidth() ||
+        j < 0 || j >= m_life->GetHeight())
+    {
+        GET_FRAME()->SetStatusText(wxEmptyString, 1);
+        SetCursor(*wxSTANDARD_CURSOR);
+    }
+    else
+    {
+        wxString msg;
+        msg.Printf(_("Cell: (%u, %u)"), i, j);
+        GET_FRAME()->SetStatusText(msg, 1);
+        SetCursor(*wxCROSS_CURSOR);
+    }
+
+    // button pressed?
+    if (!event.LeftIsDown())
+    {
+        m_status = MOUSE_NOACTION;
+    }
+    else if (i >= 0 && i < m_life->GetWidth() &&
+             j >= 0 && j < m_life->GetHeight())
+    {
+        bool alive = m_life->IsAlive(i, j);
+
+        // if just pressed, update status
+        if (m_status == MOUSE_NOACTION)
+            m_status = (alive? MOUSE_ERASING : MOUSE_DRAWING);
+
+        // toggle cell and refresh if needed
+        if (((m_status == MOUSE_ERASING) && alive) ||
+            ((m_status == MOUSE_DRAWING) && !alive))
+        {
+            wxRect rect(x, y, m_cellsize + 1, m_cellsize + 1);
+            DrawCell( m_life->SetCell(i, j, !alive) );
+            Refresh(FALSE, &rect);
+        }
+    }
+}
+
+void LifeCanvas::OnSize(wxSizeEvent& event)
+{
+    wxCoord w = event.GetSize().GetX();
+    wxCoord h = event.GetSize().GetY();
+    m_xoffset = (w > m_width)?  ((w - m_width) / 2)  : 0;
+    m_yoffset = (h > m_height)? ((h - m_height) / 2) : 0;
+
+    // allow default processing
+    event.Skip();
+}

demos/life/life.def

@@ -1,5 +1,5 @@
-NAME         Menu
-DESCRIPTION  'Menu wxWindows sample'
+NAME         Life
+DESCRIPTION  'Life! wxWindows application'
 EXETYPE      WINDOWS
 CODE         PRELOAD MOVEABLE DISCARDABLE
 DATA         PRELOAD MOVEABLE MULTIPLE

demos/life/life.h

@@ -0,0 +1,136 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        life.h
+// Purpose:     The game of life, created by J. H. Conway
+// Author:      Guillermo Rodriguez Garcia, <guille@iies.es>
+// Modified by:
+// Created:     Jan/2000
+// RCS-ID:      $Id$
+// Copyright:   (c) 2000, Guillermo Rodriguez Garcia
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _LIFE_APP_H_
+#define _LIFE_APP_H_
+
+#ifdef __GNUG__
+    #pragma interface "life.h"
+#endif
+
+// for compilers that support precompilation, includes "wx/wx.h"
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+// for all others, include the necessary headers
+#ifndef WX_PRECOMP
+    #include "wx/wx.h"
+#endif
+
+#include "game.h"
+
+// --------------------------------------------------------------------------
+// LifeCanvas
+// --------------------------------------------------------------------------
+
+class LifeCanvas : public wxScrolledWindow
+{
+public:
+    // ctor and dtor
+    LifeCanvas(wxWindow* parent, Life* life, bool interactive = TRUE);
+    ~LifeCanvas();
+
+    // member functions
+    void Reset();
+    void DrawEverything(bool force = FALSE);
+    void DrawCell(Cell c);
+    void DrawCell(Cell c, wxDC &dc);
+    inline int CellToCoord(int i) const { return (i * m_cellsize); };
+    inline int CoordToCell(int x) const { return ((x >= 0)? (x / m_cellsize) : -1); };
+
+    // event handlers
+    void OnPaint(wxPaintEvent& event);
+    void OnMouse(wxMouseEvent& event);
+    void OnSize(wxSizeEvent& event);
+
+private:
+    // any class wishing to process wxWindows events must use this macro
+    DECLARE_EVENT_TABLE()
+
+    enum MouseStatus
+    {
+        MOUSE_NOACTION,
+        MOUSE_DRAWING,
+        MOUSE_ERASING
+    };
+
+    Life        *m_life;
+    wxBitmap    *m_bmp;
+    int          m_height;
+    int          m_width;
+    int          m_cellsize;
+    wxCoord      m_xoffset;
+    wxCoord      m_yoffset;
+    MouseStatus  m_status;
+    bool         m_interactive;
+};
+
+// --------------------------------------------------------------------------
+// LifeTimer
+// --------------------------------------------------------------------------
+
+// Life timer
+class LifeTimer : public wxTimer
+{
+public:
+    void Notify();
+};
+
+// --------------------------------------------------------------------------
+// LifeFrame
+// --------------------------------------------------------------------------
+
+class LifeFrame : public wxFrame
+{
+public:
+    // ctor and dtor
+    LifeFrame();
+    ~LifeFrame();
+
+    // member functions
+    void UpdateInfoText();
+
+    // event handlers
+    void OnMenu(wxCommandEvent& event);
+    void OnNewGame(wxCommandEvent& event);
+    void OnSamples(wxCommandEvent& event);
+    void OnStart();
+    void OnStop();
+    void OnTimer();
+    void OnSlider(wxScrollEvent& event);
+
+private:
+    // any class wishing to process wxWindows events must use this macro
+    DECLARE_EVENT_TABLE()
+
+    Life         *m_life;
+    LifeTimer    *m_timer;
+    LifeCanvas   *m_canvas;
+    wxStaticText *m_text;
+    bool          m_running;
+    long          m_interval;
+    long          m_tics;
+};
+
+// --------------------------------------------------------------------------
+// LifeApp
+// --------------------------------------------------------------------------
+
+class LifeApp : public wxApp
+{
+public:
+    virtual bool OnInit();
+};
+
+#endif  // _LIFE_APP_H_

demos/life/life.rc

@@ -0,0 +1,6 @@
+mondrian ICON "mondrian.ico"
+#include "wx/msw/wx.rc"
+
+reset BITMAP "bitmaps/reset.bmp"
+play  BITMAP "bitmaps/play.bmp"
+stop  BITMAP "bitmaps/stop.bmp"

demos/life/makefile.b32

@@ -9,8 +9,8 @@
 
 WXDIR = $(WXWIN)
 
-TARGET=printing
-OBJECTS = $(TARGET).obj
+TARGET=life
+OBJECTS = $(TARGET).obj dialogs.obj game.obj
 
 !include $(WXDIR)\src\makeprog.b32
 

demos/life/makefile.bcc

@@ -12,8 +12,8 @@
 
 WXDIR = $(WXWIN)
 
-TARGET=image
-OBJECTS=$(TARGET).obj
+TARGET=life
+OBJECTS=$(TARGET).obj dialogs.obj game.obj
 
 !include $(WXDIR)\src\makeprog.bcc
 

demos/life/makefile.dos

@@ -10,10 +10,8 @@
 
 WXDIR = $(WXWIN)
 
-TARGET=client
-OBJECTS = $(TARGET).obj
-
-# TODO: server
+TARGET=life
+OBJECTS = $(TARGET).obj dialogs.obj game.obj
 
 !include $(WXDIR)\src\makeprog.msc
 

demos/life/makefile.g95

@@ -9,8 +9,8 @@
 
 WXDIR = ../..
 
-TARGET=internat
-OBJECTS = $(TARGET).o
+TARGET=life
+OBJECTS = $(TARGET).o dialogs.o game.o
 
 include $(WXDIR)/src/makeprog.g95
 

demos/life/makefile.unx

@@ -15,9 +15,9 @@
 
 CC = gcc
 
-PROGRAM = internat
+PROGRAM = life
 
-OBJECTS = $(PROGRAM).o
+OBJECTS = $(PROGRAM).o dialogs.o game.o
 
 # implementation
 

demos/life/makefile.vc

@@ -11,8 +11,8 @@
 # Set WXDIR for your system
 WXDIR = $(WXWIN)
 
-PROGRAM=image
-OBJECTS = $(PROGRAM).obj
+PROGRAM=life
+OBJECTS = $(PROGRAM).obj dialogs.obj game.obj
 
 !include $(WXDIR)\src\makeprog.vc
 

demos/life/makefile.wat

@@ -7,8 +7,8 @@
 
 WXDIR = $(%WXWIN)
 
-PROGRAM = about
-OBJECTS = $(PROGRAM).obj
+PROGRAM = life
+OBJECTS = $(PROGRAM).obj dialogs.obj game.obj
 
 !include $(WXDIR)\src\makeprog.wat
 

demos/life/samples.inc

@@ -0,0 +1,157 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        samples.inc
+// Purpose:     Sample configurations for Life!
+// Author:      Guillermo Rodriguez Garcia, <guille@iies.es>
+// Modified by:
+// Created:     Jan/2000
+// RCS-ID:      $Id$
+// Copyright:   (c) 2000, Guillermo Rodriguez Garcia
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// --------------------------------------------------------------------------
+// sample configurations
+// --------------------------------------------------------------------------
+
+/* Format:
+ *
+ * Name,
+ * Description,
+ * Width, Height,
+ * Data,                        ('*' = alive, '.' = dead)
+ * Field width, Field height,   (optional, defaults to 20 x 20)
+ * Wraparound                   (optional, defaults to TRUE)
+ * 
+ */
+
+LifeShape g_shapes[] =
+{
+    LifeShape( _("Glider"),
+               _("The glider is the first of a series of life forms, known "
+                 "as spaceships or fishes, which can travel along the game "
+                 "field retaining their original shape."),
+               3, 3,
+               ".*."
+               "..*"
+               "***"),
+    LifeShape( _("Heavyweight spaceship"),
+               _("The glider is just the smaller of the spaceships; this "
+                 "one, known as the heavyweight spaceship or 'big fish', "
+                 "is the largest spaceship which can travel alone without "
+                 "destroying itself. Larger ones can only travel safely "
+                 "if they are supported by smaller spaceships."),
+               7, 4,
+               ".....*."
+               "......*"
+               "*.....*"
+               ".******"),
+    LifeShape( _("Eater"),
+               _("An eater is any still life that can repair itself from "
+                 "some attacks. This one (bottom right), also known as "
+                 "'fishhook', eats gliders and fishes (spaceships) provided "
+                 "that they approach in a certain angle."),
+               10, 10,
+               ".*........"
+               "..*......."
+               "***......."
+               ".........."
+               ".........."
+               ".........."
+               "......**.."
+               "......*.*."
+               "........*."
+               "........**" ),
+    LifeShape( _("Dice shaker"),
+               _("Oscillators have been extensively explored in Life!. "
+                 "The dice shaker turns around each seven tics; thus, it "
+                 "is an oscillator with a period of fourteen."),
+               7, 6,
+               ".**.**."
+               ".**.**."
+               "..*.*.."
+               "*.*.*.*"
+               "*.*.*.*"
+               "**...**" ),
+    LifeShape( _("Hertz oscillator"),
+               _("The Hertz oscillator is a good example of a set of life "
+                 "patterns known as 'billiard tables'. A billiard table is "
+                 "an oscillator which is built inside a stable border. In "
+                 "particular, this one has a period of eight."),
+               14, 11,
+               ".....**......."
+               ".....**......."
+               ".............."
+               "**...****...**"
+               "*.*.*....*.*.*"
+               "..*.**...*.*.."
+               "*.*.*....*.*.*"
+               "**...****...**"
+               ".............."
+               ".......**....."
+               ".......**....." ),
+    LifeShape( _("Phoenix"),
+               _("A phoenix is a pattern whose cells all die in every "
+                 "generation, and yet lives forever. For example, this is "
+                 "a phoenix with period two."),
+               8, 8,
+               "....*..."
+               "..*.*..."
+               "......*."
+               "**......"
+               "......**"
+               ".*......"
+               "...*.*.."
+               "...*...." ),
+    LifeShape( _("R-pentomino"),
+               _("The R-pentomino is a methuselah - a life form which "
+                 "lives for hundreds of generations without stabilizing "
+                 "or dying. In particular, the R-Pentomino requires more "
+                 "than one thousand tics to reach a stable (periodic) "
+                 "state."),
+               3, 3,
+               ".**"
+               "**."
+               ".*.",
+               80, 80, FALSE ),
+    LifeShape( _("Thunderbird"),
+               _("The thunderbird is another popular methuselah, which "
+                 "doesn't stabilize until the 243th generation. Note that "
+                 "because the initial configuration is symmetrical with "
+                 "respect to the vertical axis, all generations must be "
+                 "symmetrical as well."),
+               3, 5,
+               "***"
+               "..."
+               ".*."
+               ".*."
+               ".*.",
+               60, 60, FALSE ),
+    LifeShape( _("Accorn"),
+               _("Probably the most popular methuselah, the accorn lives "
+                 "for 5206 (!) generations. To see it in action, a very "
+                 "large game field is needed."),
+               7, 3,
+               ".*....."
+               "...*..."
+               "**..***",
+               150, 150, FALSE ),
+    LifeShape( _("Galaxy"),
+               _("One from my personal collection. It is really beautiful "
+                 "to see this configuration expand and shrink periodically "
+                 "for hundreds of tics before reaching a stable state."),
+               13, 13,
+               "...***......."
+               "......*......"
+               "......*......"
+               "......*.....*"
+               ".....***....*"
+               "....*...*...*"
+               ".****...****."
+               "*...*...*...."
+               "*....***....."
+               "*.....*......"
+               "......*......"
+               "......*......"
+               ".......***...",
+               80, 80, FALSE )
+};

demos/makefile.g95

@@ -0,0 +1,27 @@
+#
+# File:		makefile.g95
+# Author:	Julian Smart
+# Created:	1997
+# Updated:	
+# Copyright:
+#
+# "%W% %G%"
+#
+# Makefile : Builds samples for Win95, Cygwin
+# info
+
+# Set WXDIR for your system
+# SHELL=cmd.exe
+WXDIR = ..
+
+THISDIR=$(WXDIR)/demos
+
+# Mingw make may not have a shell to use, so can't use a loop here. Sigh.
+# Please add new sample directories alphabetically to make it easier to
+# keep track.
+all clean:
+	-$(MAKE) -C bombs -f $(MAKEFILE) $@
+	-$(MAKE) -C life -f $(MAKEFILE) $@
+	-$(MAKE) -C forty -f $(MAKEFILE) $@
+	-$(MAKE) -C fractal -f $(MAKEFILE) $@
+	-$(MAKE) -C poem -f $(MAKEFILE) $@

demos/makefile.vc

@@ -0,0 +1,59 @@
+#
+# File:		makefile.vc
+# Author:	Julian Smart
+# Created:	1993
+# Updated:	
+# Copyright:	(c) 1993, AIAI, University of Edinburgh
+#
+# "%W% %G%"
+#
+# Makefile : Builds demos for Win95, MSVC++ 16-bit
+# Use FINAL=1 argument to nmake to build final version with no debugging
+# info
+
+# Set WXDIR for your system
+WXDIR = $(WXWIN)
+
+THISDIR=$(WXDIR)\demos
+
+#
+# Indicates kind of pb with demos
+#
+# No makefile.vc file
+NOMAKE=1
+# No 16 bit version
+#ONLY32=1
+# Misc. compilation errors
+COMPIL=1
+# Need PNG
+PNGSETUP=
+
+!include $(WXDIR)\src\makemsc.env
+
+#
+# Please keep demos list up-to-date, in alphabetical order
+#
+all:
+        cd $(WXDIR)\demos\bombs
+        nmake -f makefile.vc FINAL=$(FINAL)
+        cd $(WXDIR)\demos\forty
+        nmake -f makefile.vc FINAL=$(FINAL)
+        cd $(WXDIR)\demos\fractal
+        nmake -f makefile.vc FINAL=$(FINAL)
+        cd $(WXDIR)\demos\life
+        nmake -f makefile.vc FINAL=$(FINAL)
+        cd $(WXDIR)\demos\poem
+        nmake -f makefile.vc FINAL=$(FINAL)
+
+clean:
+        cd $(WXDIR)\demos\bombs
+        nmake -f makefile.vc clean
+        cd $(WXDIR)\demos\forty
+        nmake -f makefile.vc clean
+        cd $(WXDIR)\demos\fractal
+        nmake -f makefile.vc clean
+        cd $(WXDIR)\demos\life
+        nmake -f makefile.vc clean
+        cd $(WXDIR)\demos\poem
+        nmake -f makefile.vc clean
+