Skip to content
Browse files

Adding crude program icon, making main dialog a wxFrame again.

  • Loading branch information...
1 parent dc50c76 commit d4a9108ed2786a350badbf8703a11d84630e263c @bingmann committed May 12, 2007
View
14 Makefile.in
@@ -32,11 +32,14 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
subdir = .
DIST_COMMON = README $(am__configure_deps) $(include_HEADERS) \
$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
- scripts/depcomp scripts/install-sh scripts/missing
+ scripts/config.guess scripts/config.sub scripts/depcomp \
+ scripts/install-sh scripts/missing
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -124,6 +127,7 @@ PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
+RESCOMP = @RESCOMP@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -149,14 +153,22 @@ am__quote = @am__quote@
am__tar = @am__tar@
am__untar = @am__untar@
bindir = @bindir@
+build = @build@
build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
+host = @host@
host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
View
244 configure
@@ -650,6 +650,14 @@ LIBS
build_alias
host_alias
target_alias
+build
+build_cpu
+build_vendor
+build_os
+host
+host_cpu
+host_vendor
+host_os
INSTALL_PROGRAM
INSTALL_SCRIPT
INSTALL_DATA
@@ -717,6 +725,9 @@ WX_LIBS_STATIC
WX_VERSION
HAVE_WXWIDGETS_TRUE
HAVE_WXWIDGETS_FALSE
+RESCOMP
+GOT_RESCOMP_TRUE
+GOT_RESCOMP_FALSE
LIBOBJS
LTLIBOBJS'
ac_subst_files=''
@@ -1295,6 +1306,10 @@ Program names:
--program-prefix=PREFIX prepend PREFIX to installed program names
--program-suffix=SUFFIX append SUFFIX to installed program names
--program-transform-name=PROGRAM run sed PROGRAM on installed program names
+
+System types:
+ --build=BUILD configure for building on BUILD [guessed]
+ --host=HOST cross-compile to build programs to run on HOST [BUILD]
_ACEOF
fi
@@ -1797,6 +1812,89 @@ ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var.
ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
+# Make sure we can run config.sub.
+$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
+ { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
+echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
+ { (exit 1); exit 1; }; }
+
+{ echo "$as_me:$LINENO: checking build system type" >&5
+echo $ECHO_N "checking build system type... $ECHO_C" >&6; }
+if test "${ac_cv_build+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_build_alias=$build_alias
+test "x$ac_build_alias" = x &&
+ ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
+test "x$ac_build_alias" = x &&
+ { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
+echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
+ { (exit 1); exit 1; }; }
+ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
+ { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
+echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
+ { (exit 1); exit 1; }; }
+
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5
+echo "${ECHO_T}$ac_cv_build" >&6; }
+case $ac_cv_build in
+*-*-*) ;;
+*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
+echo "$as_me: error: invalid value of canonical build" >&2;}
+ { (exit 1); exit 1; }; };;
+esac
+build=$ac_cv_build
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_build
+shift
+build_cpu=$1
+build_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+build_os=$*
+IFS=$ac_save_IFS
+case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
+
+
+{ echo "$as_me:$LINENO: checking host system type" >&5
+echo $ECHO_N "checking host system type... $ECHO_C" >&6; }
+if test "${ac_cv_host+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test "x$host_alias" = x; then
+ ac_cv_host=$ac_cv_build
+else
+ ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
+ { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
+echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
+ { (exit 1); exit 1; }; }
+fi
+
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5
+echo "${ECHO_T}$ac_cv_host" >&6; }
+case $ac_cv_host in
+*-*-*) ;;
+*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
+echo "$as_me: error: invalid value of canonical host" >&2;}
+ { (exit 1); exit 1; }; };;
+esac
+host=$ac_cv_host
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_host
+shift
+host_cpu=$1
+host_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+host_os=$*
+IFS=$ac_save_IFS
+case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
+
+
am__api_version='1.10'
@@ -5375,6 +5473,116 @@ echo "$as_me: WARNING:
" >&2;}
fi
+# Win32 tools to add icons to the programs
+case "${host}" in
+*-*-cygwin* | *-*-mingw32*)
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}windres", so it can be a program name with args.
+set dummy ${ac_tool_prefix}windres; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_RESCOMP+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$RESCOMP"; then
+ ac_cv_prog_RESCOMP="$RESCOMP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_RESCOMP="${ac_tool_prefix}windres"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+RESCOMP=$ac_cv_prog_RESCOMP
+if test -n "$RESCOMP"; then
+ { echo "$as_me:$LINENO: result: $RESCOMP" >&5
+echo "${ECHO_T}$RESCOMP" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_RESCOMP"; then
+ ac_ct_RESCOMP=$RESCOMP
+ # Extract the first word of "windres", so it can be a program name with args.
+set dummy windres; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_ac_ct_RESCOMP+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$ac_ct_RESCOMP"; then
+ ac_cv_prog_ac_ct_RESCOMP="$ac_ct_RESCOMP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_RESCOMP="windres"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_RESCOMP=$ac_cv_prog_ac_ct_RESCOMP
+if test -n "$ac_ct_RESCOMP"; then
+ { echo "$as_me:$LINENO: result: $ac_ct_RESCOMP" >&5
+echo "${ECHO_T}$ac_ct_RESCOMP" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+ if test "x$ac_ct_RESCOMP" = x; then
+ RESCOMP=""
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
+ RESCOMP=$ac_ct_RESCOMP
+ fi
+else
+ RESCOMP="$ac_cv_prog_RESCOMP"
+fi
+
+ ;;
+esac
+ if test x$RESCOMP != x; then
+ GOT_RESCOMP_TRUE=
+ GOT_RESCOMP_FALSE='#'
+else
+ GOT_RESCOMP_TRUE='#'
+ GOT_RESCOMP_FALSE=
+fi
+
+
# Checks for library functions.
ac_config_files="$ac_config_files Makefile testsuite/Makefile speedtest/Makefile wxbtreedemo/Makefile"
@@ -5554,6 +5762,13 @@ echo "$as_me: error: conditional \"HAVE_WXWIDGETS\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
+if test -z "${GOT_RESCOMP_TRUE}" && test -z "${GOT_RESCOMP_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"GOT_RESCOMP\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"GOT_RESCOMP\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
: ${CONFIG_STATUS=./config.status}
ac_clean_files_save=$ac_clean_files
@@ -6109,6 +6324,14 @@ LIBS!$LIBS$ac_delim
build_alias!$build_alias$ac_delim
host_alias!$host_alias$ac_delim
target_alias!$target_alias$ac_delim
+build!$build$ac_delim
+build_cpu!$build_cpu$ac_delim
+build_vendor!$build_vendor$ac_delim
+build_os!$build_os$ac_delim
+host!$host$ac_delim
+host_cpu!$host_cpu$ac_delim
+host_vendor!$host_vendor$ac_delim
+host_os!$host_os$ac_delim
INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
INSTALL_DATA!$INSTALL_DATA$ac_delim
@@ -6161,14 +6384,6 @@ GCOV_FALSE!$GCOV_FALSE$ac_delim
CPPUNIT_CONFIG!$CPPUNIT_CONFIG$ac_delim
CPPUNIT_CFLAGS!$CPPUNIT_CFLAGS$ac_delim
CPPUNIT_LIBS!$CPPUNIT_LIBS$ac_delim
-HAVE_CPPUNIT_TRUE!$HAVE_CPPUNIT_TRUE$ac_delim
-HAVE_CPPUNIT_FALSE!$HAVE_CPPUNIT_FALSE$ac_delim
-BUILD_SPEEDTEST_TRUE!$BUILD_SPEEDTEST_TRUE$ac_delim
-BUILD_SPEEDTEST_FALSE!$BUILD_SPEEDTEST_FALSE$ac_delim
-WX_CONFIG_PATH!$WX_CONFIG_PATH$ac_delim
-WX_CPPFLAGS!$WX_CPPFLAGS$ac_delim
-WX_CFLAGS!$WX_CFLAGS$ac_delim
-WX_CXXFLAGS!$WX_CXXFLAGS$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -6210,18 +6425,29 @@ _ACEOF
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
+HAVE_CPPUNIT_TRUE!$HAVE_CPPUNIT_TRUE$ac_delim
+HAVE_CPPUNIT_FALSE!$HAVE_CPPUNIT_FALSE$ac_delim
+BUILD_SPEEDTEST_TRUE!$BUILD_SPEEDTEST_TRUE$ac_delim
+BUILD_SPEEDTEST_FALSE!$BUILD_SPEEDTEST_FALSE$ac_delim
+WX_CONFIG_PATH!$WX_CONFIG_PATH$ac_delim
+WX_CPPFLAGS!$WX_CPPFLAGS$ac_delim
+WX_CFLAGS!$WX_CFLAGS$ac_delim
+WX_CXXFLAGS!$WX_CXXFLAGS$ac_delim
WX_CFLAGS_ONLY!$WX_CFLAGS_ONLY$ac_delim
WX_CXXFLAGS_ONLY!$WX_CXXFLAGS_ONLY$ac_delim
WX_LIBS!$WX_LIBS$ac_delim
WX_LIBS_STATIC!$WX_LIBS_STATIC$ac_delim
WX_VERSION!$WX_VERSION$ac_delim
HAVE_WXWIDGETS_TRUE!$HAVE_WXWIDGETS_TRUE$ac_delim
HAVE_WXWIDGETS_FALSE!$HAVE_WXWIDGETS_FALSE$ac_delim
+RESCOMP!$RESCOMP$ac_delim
+GOT_RESCOMP_TRUE!$GOT_RESCOMP_TRUE$ac_delim
+GOT_RESCOMP_FALSE!$GOT_RESCOMP_FALSE$ac_delim
LIBOBJS!$LIBOBJS$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 9; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 20; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
View
9 configure.ac
@@ -5,6 +5,7 @@ AC_PREREQ(2.59)
AC_INIT(stx-btree, 0.7)
AC_CONFIG_SRCDIR([include/stx/btree.h])
AC_CONFIG_AUX_DIR(scripts)
+AC_CANONICAL_HOST
AM_INIT_AUTOMAKE
#AM_MAINTAINER_MODE
@@ -87,6 +88,14 @@ if test "$wxWin" != 1; then
])
fi
+# Win32 tools to add icons to the programs
+case "${host}" in
+*-*-cygwin* | *-*-mingw32*)
+ AC_CHECK_TOOL(RESCOMP, windres)
+ ;;
+esac
+AM_CONDITIONAL(GOT_RESCOMP, test x$RESCOMP != x)
+
# Checks for library functions.
AC_CONFIG_FILES([Makefile
View
1,519 scripts/config.guess
1,519 additions, 0 deletions not shown because the diff is too large. Please use a local Git client to view these changes.
View
1,626 scripts/config.sub
1,626 additions, 0 deletions not shown because the diff is too large. Please use a local Git client to view these changes.
View
11 speedtest/Makefile.in
@@ -33,6 +33,8 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
@BUILD_SPEEDTEST_TRUE@noinst_PROGRAMS = speedtest$(EXEEXT)
subdir = speedtest
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@ -104,6 +106,7 @@ PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
+RESCOMP = @RESCOMP@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -129,14 +132,22 @@ am__quote = @am__quote@
am__tar = @am__tar@
am__untar = @am__untar@
bindir = @bindir@
+build = @build@
build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
+host = @host@
host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
View
11 testsuite/Makefile.in
@@ -33,6 +33,8 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
noinst_PROGRAMS = testsuite$(EXEEXT)
TESTS = testsuite$(EXEEXT)
subdir = testsuite
@@ -117,6 +119,7 @@ PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
+RESCOMP = @RESCOMP@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -142,14 +145,22 @@ am__quote = @am__quote@
am__tar = @am__tar@
am__untar = @am__untar@
bindir = @bindir@
+build = @build@
build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
+host = @host@
host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
View
7 wxbtreedemo/Makefile.am
@@ -11,4 +11,11 @@ AM_CFLAGS = -I/usr/include
AM_CXXFLAGS = -I/usr/include @WX_CXXFLAGS@ -I$(top_srcdir)/include -DBTREE_DEBUG
LDADD = @WX_LIBS@
+if GOT_RESCOMP
+resources.o: resources.rc
+ $(RESCOMP) -I$(srcdir) $(srcdir)/resources.rc resources.o
+
+LDADD += resources.o
+endif
+
endif
View
19 wxbtreedemo/Makefile.in
@@ -32,7 +32,10 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
@HAVE_WXWIDGETS_TRUE@bin_PROGRAMS = wxBTreeDemo$(EXEEXT)
+@GOT_RESCOMP_TRUE@@HAVE_WXWIDGETS_TRUE@am__append_1 = resources.o
subdir = wxbtreedemo
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -51,7 +54,7 @@ am__wxBTreeDemo_SOURCES_DIST = WMain.cpp WMain.h WMain_wxg.cpp \
@HAVE_WXWIDGETS_TRUE@ WTreeDrawing.$(OBJEXT)
wxBTreeDemo_OBJECTS = $(am_wxBTreeDemo_OBJECTS)
wxBTreeDemo_LDADD = $(LDADD)
-wxBTreeDemo_DEPENDENCIES =
+@HAVE_WXWIDGETS_TRUE@wxBTreeDemo_DEPENDENCIES = $(am__append_1)
DEFAULT_INCLUDES = -I.@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/scripts/depcomp
am__depfiles_maybe = depfiles
@@ -114,6 +117,7 @@ PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
+RESCOMP = @RESCOMP@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -139,14 +143,22 @@ am__quote = @am__quote@
am__tar = @am__tar@
am__untar = @am__untar@
bindir = @bindir@
+build = @build@
build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
+host = @host@
host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
@@ -174,7 +186,7 @@ top_srcdir = @top_srcdir@
@HAVE_WXWIDGETS_TRUE@AM_CFLAGS = -I/usr/include
@HAVE_WXWIDGETS_TRUE@AM_CXXFLAGS = -I/usr/include @WX_CXXFLAGS@ -I$(top_srcdir)/include -DBTREE_DEBUG
-@HAVE_WXWIDGETS_TRUE@LDADD = @WX_LIBS@
+@HAVE_WXWIDGETS_TRUE@LDADD = @WX_LIBS@ $(am__append_1)
all: all-am
.SUFFIXES:
@@ -436,6 +448,9 @@ uninstall-am: uninstall-binPROGRAMS
mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
uninstall-am uninstall-binPROGRAMS
+
+@GOT_RESCOMP_TRUE@@HAVE_WXWIDGETS_TRUE@resources.o: resources.rc
+@GOT_RESCOMP_TRUE@@HAVE_WXWIDGETS_TRUE@ $(RESCOMP) -I$(srcdir) $(srcdir)/resources.rc resources.o
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
View
2 wxbtreedemo/WMain.cpp
@@ -781,7 +781,7 @@ void WMain::OnCheckboxDuplicates(wxCommandEvent &)
UpdateViews();
}
-BEGIN_EVENT_TABLE(WMain, wxDialog)
+BEGIN_EVENT_TABLE(WMain, wxFrame)
EVT_CHOICE (ID_CHOICE_DATATYPE, WMain::OnChoiceDataType)
EVT_CHOICE (ID_CHOICE_NODESLOTS, WMain::OnChoiceNodeSlots)
View
6 wxbtreedemo/WMain_wxg.cpp
@@ -1,10 +1,10 @@
-// -*- C++ -*- generated by wxGlade 0.5 on Fri May 11 16:14:10 2007 from /tdata/home/Desktop/stx-btree/trunk/wxbtreedemo/wxBTreeDemo.wxg
+// -*- C++ -*- generated by wxGlade 0.5 on Sat May 12 21:47:25 2007 from /tdata/tmp/stx-btree/wxbtreedemo/wxBTreeDemo.wxg
-#include "WTreeDrawing.h"
#include "WMain_wxg.h"
+#include "WTreeDrawing.h"
WMain_wxg::WMain_wxg(wxWindow* parent, int id, const wxString& title, const wxPoint& pos, const wxSize& size, long style):
- wxDialog(parent, id, title, pos, size, wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER)
+ wxFrame(parent, id, title, pos, size, wxDEFAULT_FRAME_STYLE)
{
// begin wxGlade: WMain_wxg::WMain_wxg
panel_Main = new wxPanel(this, wxID_ANY);
View
7 wxbtreedemo/WMain_wxg.h
@@ -1,4 +1,4 @@
-// -*- C++ -*- generated by wxGlade 0.5 on Fri May 11 16:14:10 2007 from /tdata/home/Desktop/stx-btree/trunk/wxbtreedemo/wxBTreeDemo.wxg
+// -*- C++ -*- generated by wxGlade 0.5 on Sat May 12 21:47:25 2007 from /tdata/tmp/stx-btree/wxbtreedemo/wxBTreeDemo.wxg
#include <wx/wx.h>
#include <wx/image.h>
@@ -8,10 +8,9 @@
// begin wxGlade: ::dependencies
// end wxGlade
-
class WTreeDrawing;
-class WMain_wxg: public wxDialog {
+class WMain_wxg: public wxFrame {
public:
// begin wxGlade: WMain_wxg::ids
enum {
@@ -27,7 +26,7 @@ class WMain_wxg: public wxDialog {
};
// end wxGlade
- WMain_wxg(wxWindow* parent, int id, const wxString& title, const wxPoint& pos=wxDefaultPosition, const wxSize& size=wxDefaultSize, long style=wxDEFAULT_DIALOG_STYLE);
+ WMain_wxg(wxWindow* parent, int id, const wxString& title, const wxPoint& pos=wxDefaultPosition, const wxSize& size=wxDefaultSize, long style=wxDEFAULT_FRAME_STYLE);
private:
// begin wxGlade: WMain_wxg::methods
View
BIN wxbtreedemo/progicon.ico
Binary file not shown.
View
BIN wxbtreedemo/progicon.xcf
Binary file not shown.
View
3 wxbtreedemo/resources.rc
@@ -0,0 +1,3 @@
+// $Id: resources.rc 7 2006-10-07 17:06:23Z tb $
+
+1 ICON DISCARDABLE "progicon.ico"

0 comments on commit d4a9108

Please sign in to comment.
Something went wrong with that request. Please try again.