From 3379ed3789e405f874d9db757d95346f1d378795 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 3 Jul 2001 19:38:19 +0000 Subject: [PATCH] tons of fixes for wxGTK/Univ - seems to work, more or less, now git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10805 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- configure | 1306 +++++++++++++++++--------------- configure.in | 22 +- distrib/msw/tmake/filelist.txt | 19 +- include/wx/chkconf.h | 298 ++++++-- include/wx/generic/grid.h | 12 + include/wx/generic/gridctrl.h | 3 + include/wx/generic/scrolwin.h | 2 +- include/wx/gtk/window.h | 6 +- include/wx/gtk1/window.h | 6 +- include/wx/help.h | 23 +- include/wx/helpbase.h | 18 +- include/wx/html/helpfrm.h | 6 +- include/wx/msw/setup0.h | 4 + include/wx/scrolwin.h | 2 +- include/wx/univ/renderer.h | 5 +- include/wx/univ/stattext.h | 6 +- samples/configure.in | 3 +- samples/minimal/minimal.cpp | 2 + samples/widgets/button.cpp | 1 + samples/widgets/combobox.cpp | 4 + setup.h.in | 7 +- src/common/fontmap.cpp | 2 + src/common/framecmn.cpp | 4 + src/common/gdicmn.cpp | 12 +- src/common/helpbase.cpp | 4 +- src/common/resource.cpp | 4 + src/files.lst | 2 +- src/generic/scrlwing.cpp | 2 - src/generic/spinctlg.cpp | 18 +- src/gtk/files.lst | 21 +- src/gtk/region.cpp | 6 +- src/gtk/scrolwin.cpp | 1 + src/gtk/textctrl.cpp | 3 +- src/gtk/window.cpp | 20 +- src/gtk1/files.lst | 21 +- src/gtk1/region.cpp | 6 +- src/gtk1/scrolwin.cpp | 1 + src/gtk1/textctrl.cpp | 3 +- src/gtk1/window.cpp | 20 +- src/html/helpctrl.cpp | 5 +- src/html/helpfrm.cpp | 59 +- src/motif/files.lst | 14 +- src/msw/files.lst | 14 +- src/msw/makefile.b32 | 12 +- src/msw/makefile.bcc | 12 +- src/msw/makefile.dos | 18 +- src/msw/makefile.g95 | 6 +- src/msw/makefile.sc | 6 +- src/msw/makefile.vc | 6 +- src/msw/makefile.wat | 14 +- src/univ/files.lst | 8 +- src/univ/framuniv.cpp | 10 +- src/univ/stattext.cpp | 2 + src/univ/themes/gtk.cpp | 6 +- src/univ/themes/win32.cpp | 67 +- src/univ/winuniv.cpp | 9 + 56 files changed, 1278 insertions(+), 895 deletions(-) diff --git a/configure b/configure index cb2e09b25e..4264211b04 100755 --- a/configure +++ b/configure @@ -198,7 +198,11 @@ ac_help="$ac_help ac_help="$ac_help --enable-docview use document view architecture" ac_help="$ac_help - --enable-help use help (using external browser at present)" + --enable-help use help subsystem" +ac_help="$ac_help + --enable-html use wxHTML sub-library" +ac_help="$ac_help + --enable-htmlhelp use wxHTML-based help" ac_help="$ac_help --enable-constraints use layout-constraints system" ac_help="$ac_help @@ -327,8 +331,6 @@ ac_help="$ac_help --enable-menus use wxMenu/wxMenuBar/wxMenuItem classes" ac_help="$ac_help --enable-miniframe use wxMiniFrame class" -ac_help="$ac_help - --enable-html use wxHTML sub-library" ac_help="$ac_help --enable-tooltips use wxToolTip class" ac_help="$ac_help @@ -919,7 +921,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:923: checking host system type" >&5 +echo "configure:925: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -940,7 +942,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` echo "$ac_t""$host" 1>&6 echo $ac_n "checking target system type""... $ac_c" 1>&6 -echo "configure:944: checking target system type" >&5 +echo "configure:946: checking target system type" >&5 target_alias=$target case "$target_alias" in @@ -958,7 +960,7 @@ target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` echo "$ac_t""$target" 1>&6 echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:962: checking build system type" >&5 +echo "configure:964: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -1305,7 +1307,7 @@ fi if test "$USE_LINUX" = 1; then echo $ac_n "checking for gettext in -lc""... $ac_c" 1>&6 -echo "configure:1309: checking for gettext in -lc" >&5 +echo "configure:1311: checking for gettext in -lc" >&5 ac_lib_var=`echo c'_'gettext | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1313,7 +1315,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1330: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1440,6 +1442,7 @@ if test $DEBUG_CONFIGURE = 1; then DEFAULT_wxUSE_CONSTRAINTS=no DEFAULT_wxUSE_IPC=no DEFAULT_wxUSE_HELP=no + DEFAULT_wxUSE_WXHTML_HELP=no DEFAULT_wxUSE_WXTREE=no DEFAULT_wxUSE_METAFILE=no DEFAULT_wxUSE_MIMETYPE=no @@ -1591,6 +1594,7 @@ else DEFAULT_wxUSE_CONSTRAINTS=yes DEFAULT_wxUSE_IPC=yes DEFAULT_wxUSE_HELP=yes + DEFAULT_wxUSE_WXHTML_HELP=yes DEFAULT_wxUSE_WXTREE=yes DEFAULT_wxUSE_METAFILE=yes DEFAULT_wxUSE_MIMETYPE=yes @@ -1679,7 +1683,7 @@ done echo $ac_n "checking for --enable-gui""... $ac_c" 1>&6 -echo "configure:1683: checking for --enable-gui" >&5 +echo "configure:1687: checking for --enable-gui" >&5 no_cache=0 # Check whether --enable-gui or --disable-gui was given. if test "${enable_gui+set}" = set; then @@ -1721,7 +1725,7 @@ if test "$wxUSE_GUI" = "yes"; then echo $ac_n "checking for --enable-universal""... $ac_c" 1>&6 -echo "configure:1725: checking for --enable-universal" >&5 +echo "configure:1729: checking for --enable-universal" >&5 no_cache=0 # Check whether --enable-universal or --disable-universal was given. if test "${enable_universal+set}" = set; then @@ -1818,7 +1822,7 @@ fi echo $ac_n "checking for --with-libpng""... $ac_c" 1>&6 -echo "configure:1822: checking for --with-libpng" >&5 +echo "configure:1826: checking for --with-libpng" >&5 no_cache=0 # Check whether --with-libpng or --without-libpng was given. if test "${with_libpng+set}" = set; then @@ -1865,7 +1869,7 @@ fi echo $ac_n "checking for --with-libjpeg""... $ac_c" 1>&6 -echo "configure:1869: checking for --with-libjpeg" >&5 +echo "configure:1873: checking for --with-libjpeg" >&5 no_cache=0 # Check whether --with-libjpeg or --without-libjpeg was given. if test "${with_libjpeg+set}" = set; then @@ -1912,7 +1916,7 @@ fi echo $ac_n "checking for --with-libtiff""... $ac_c" 1>&6 -echo "configure:1916: checking for --with-libtiff" >&5 +echo "configure:1920: checking for --with-libtiff" >&5 no_cache=0 # Check whether --with-libtiff or --without-libtiff was given. if test "${with_libtiff+set}" = set; then @@ -1959,7 +1963,7 @@ fi echo $ac_n "checking for --with-freetype""... $ac_c" 1>&6 -echo "configure:1963: checking for --with-freetype" >&5 +echo "configure:1967: checking for --with-freetype" >&5 no_cache=0 # Check whether --with-freetype or --without-freetype was given. if test "${with_freetype+set}" = set; then @@ -2006,7 +2010,7 @@ fi echo $ac_n "checking for --with-opengl""... $ac_c" 1>&6 -echo "configure:2010: checking for --with-opengl" >&5 +echo "configure:2014: checking for --with-opengl" >&5 no_cache=0 # Check whether --with-opengl or --without-opengl was given. if test "${with_opengl+set}" = set; then @@ -2048,7 +2052,7 @@ fi echo $ac_n "checking for --with-dmalloc""... $ac_c" 1>&6 -echo "configure:2052: checking for --with-dmalloc" >&5 +echo "configure:2056: checking for --with-dmalloc" >&5 no_cache=0 # Check whether --with-dmalloc or --without-dmalloc was given. if test "${with_dmalloc+set}" = set; then @@ -2087,7 +2091,7 @@ fi echo $ac_n "checking for --with-zlib""... $ac_c" 1>&6 -echo "configure:2091: checking for --with-zlib" >&5 +echo "configure:2095: checking for --with-zlib" >&5 no_cache=0 # Check whether --with-zlib or --without-zlib was given. if test "${with_zlib+set}" = set; then @@ -2134,7 +2138,7 @@ fi echo $ac_n "checking for --with-odbc""... $ac_c" 1>&6 -echo "configure:2138: checking for --with-odbc" >&5 +echo "configure:2142: checking for --with-odbc" >&5 no_cache=0 # Check whether --with-odbc or --without-odbc was given. if test "${with_odbc+set}" = set; then @@ -2176,7 +2180,7 @@ fi echo $ac_n "checking for --enable-shared""... $ac_c" 1>&6 -echo "configure:2180: checking for --enable-shared" >&5 +echo "configure:2184: checking for --enable-shared" >&5 no_cache=0 # Check whether --enable-shared or --disable-shared was given. if test "${enable_shared+set}" = set; then @@ -2215,7 +2219,7 @@ fi echo $ac_n "checking for --enable-burnt_name""... $ac_c" 1>&6 -echo "configure:2219: checking for --enable-burnt_name" >&5 +echo "configure:2223: checking for --enable-burnt_name" >&5 no_cache=0 # Check whether --enable-burnt_name or --disable-burnt_name was given. if test "${enable_burnt_name+set}" = set; then @@ -2254,7 +2258,7 @@ fi echo $ac_n "checking for --enable-optimise""... $ac_c" 1>&6 -echo "configure:2258: checking for --enable-optimise" >&5 +echo "configure:2262: checking for --enable-optimise" >&5 no_cache=0 # Check whether --enable-optimise or --disable-optimise was given. if test "${enable_optimise+set}" = set; then @@ -2293,7 +2297,7 @@ fi echo $ac_n "checking for --enable-debug""... $ac_c" 1>&6 -echo "configure:2297: checking for --enable-debug" >&5 +echo "configure:2301: checking for --enable-debug" >&5 no_cache=0 # Check whether --enable-debug or --disable-debug was given. if test "${enable_debug+set}" = set; then @@ -2341,7 +2345,7 @@ fi echo $ac_n "checking for --enable-debug_flag""... $ac_c" 1>&6 -echo "configure:2345: checking for --enable-debug_flag" >&5 +echo "configure:2349: checking for --enable-debug_flag" >&5 no_cache=0 # Check whether --enable-debug_flag or --disable-debug_flag was given. if test "${enable_debug_flag+set}" = set; then @@ -2380,7 +2384,7 @@ fi echo $ac_n "checking for --enable-debug_info""... $ac_c" 1>&6 -echo "configure:2384: checking for --enable-debug_info" >&5 +echo "configure:2388: checking for --enable-debug_info" >&5 no_cache=0 # Check whether --enable-debug_info or --disable-debug_info was given. if test "${enable_debug_info+set}" = set; then @@ -2419,7 +2423,7 @@ fi echo $ac_n "checking for --enable-debug_gdb""... $ac_c" 1>&6 -echo "configure:2423: checking for --enable-debug_gdb" >&5 +echo "configure:2427: checking for --enable-debug_gdb" >&5 no_cache=0 # Check whether --enable-debug_gdb or --disable-debug_gdb was given. if test "${enable_debug_gdb+set}" = set; then @@ -2458,7 +2462,7 @@ fi echo $ac_n "checking for --enable-debug_cntxt""... $ac_c" 1>&6 -echo "configure:2462: checking for --enable-debug_cntxt" >&5 +echo "configure:2466: checking for --enable-debug_cntxt" >&5 no_cache=0 # Check whether --enable-debug_cntxt or --disable-debug_cntxt was given. if test "${enable_debug_cntxt+set}" = set; then @@ -2497,7 +2501,7 @@ fi echo $ac_n "checking for --enable-mem_tracing""... $ac_c" 1>&6 -echo "configure:2501: checking for --enable-mem_tracing" >&5 +echo "configure:2505: checking for --enable-mem_tracing" >&5 no_cache=0 # Check whether --enable-mem_tracing or --disable-mem_tracing was given. if test "${enable_mem_tracing+set}" = set; then @@ -2536,7 +2540,7 @@ fi echo $ac_n "checking for --enable-profile""... $ac_c" 1>&6 -echo "configure:2540: checking for --enable-profile" >&5 +echo "configure:2544: checking for --enable-profile" >&5 no_cache=0 # Check whether --enable-profile or --disable-profile was given. if test "${enable_profile+set}" = set; then @@ -2575,7 +2579,7 @@ fi echo $ac_n "checking for --enable-no_rtti""... $ac_c" 1>&6 -echo "configure:2579: checking for --enable-no_rtti" >&5 +echo "configure:2583: checking for --enable-no_rtti" >&5 no_cache=0 # Check whether --enable-no_rtti or --disable-no_rtti was given. if test "${enable_no_rtti+set}" = set; then @@ -2614,7 +2618,7 @@ fi echo $ac_n "checking for --enable-no_exceptions""... $ac_c" 1>&6 -echo "configure:2618: checking for --enable-no_exceptions" >&5 +echo "configure:2622: checking for --enable-no_exceptions" >&5 no_cache=0 # Check whether --enable-no_exceptions or --disable-no_exceptions was given. if test "${enable_no_exceptions+set}" = set; then @@ -2653,7 +2657,7 @@ fi echo $ac_n "checking for --enable-permissive""... $ac_c" 1>&6 -echo "configure:2657: checking for --enable-permissive" >&5 +echo "configure:2661: checking for --enable-permissive" >&5 no_cache=0 # Check whether --enable-permissive or --disable-permissive was given. if test "${enable_permissive+set}" = set; then @@ -2692,7 +2696,7 @@ fi echo $ac_n "checking for --enable-no_deps""... $ac_c" 1>&6 -echo "configure:2696: checking for --enable-no_deps" >&5 +echo "configure:2700: checking for --enable-no_deps" >&5 no_cache=0 # Check whether --enable-no_deps or --disable-no_deps was given. if test "${enable_no_deps+set}" = set; then @@ -2732,7 +2736,7 @@ fi echo $ac_n "checking for --enable-compat20""... $ac_c" 1>&6 -echo "configure:2736: checking for --enable-compat20" >&5 +echo "configure:2740: checking for --enable-compat20" >&5 no_cache=0 # Check whether --enable-compat20 or --disable-compat20 was given. if test "${enable_compat20+set}" = set; then @@ -2771,7 +2775,7 @@ fi echo $ac_n "checking for --enable-compat22""... $ac_c" 1>&6 -echo "configure:2775: checking for --enable-compat22" >&5 +echo "configure:2779: checking for --enable-compat22" >&5 no_cache=0 # Check whether --enable-compat22 or --disable-compat22 was given. if test "${enable_compat22+set}" = set; then @@ -2812,7 +2816,7 @@ fi echo $ac_n "checking for --enable-intl""... $ac_c" 1>&6 -echo "configure:2816: checking for --enable-intl" >&5 +echo "configure:2820: checking for --enable-intl" >&5 no_cache=0 # Check whether --enable-intl or --disable-intl was given. if test "${enable_intl+set}" = set; then @@ -2851,7 +2855,7 @@ fi echo $ac_n "checking for --enable-config""... $ac_c" 1>&6 -echo "configure:2855: checking for --enable-config" >&5 +echo "configure:2859: checking for --enable-config" >&5 no_cache=0 # Check whether --enable-config or --disable-config was given. if test "${enable_config+set}" = set; then @@ -2891,7 +2895,7 @@ fi echo $ac_n "checking for --enable-sockets""... $ac_c" 1>&6 -echo "configure:2895: checking for --enable-sockets" >&5 +echo "configure:2899: checking for --enable-sockets" >&5 no_cache=0 # Check whether --enable-sockets or --disable-sockets was given. if test "${enable_sockets+set}" = set; then @@ -2931,7 +2935,7 @@ fi echo $ac_n "checking for --enable-ipc""... $ac_c" 1>&6 -echo "configure:2935: checking for --enable-ipc" >&5 +echo "configure:2939: checking for --enable-ipc" >&5 no_cache=0 # Check whether --enable-ipc or --disable-ipc was given. if test "${enable_ipc+set}" = set; then @@ -2971,7 +2975,7 @@ fi echo $ac_n "checking for --enable-cmdline""... $ac_c" 1>&6 -echo "configure:2975: checking for --enable-cmdline" >&5 +echo "configure:2979: checking for --enable-cmdline" >&5 no_cache=0 # Check whether --enable-cmdline or --disable-cmdline was given. if test "${enable_cmdline+set}" = set; then @@ -3010,7 +3014,7 @@ fi echo $ac_n "checking for --enable-datetime""... $ac_c" 1>&6 -echo "configure:3014: checking for --enable-datetime" >&5 +echo "configure:3018: checking for --enable-datetime" >&5 no_cache=0 # Check whether --enable-datetime or --disable-datetime was given. if test "${enable_datetime+set}" = set; then @@ -3049,7 +3053,7 @@ fi echo $ac_n "checking for --enable-timedate""... $ac_c" 1>&6 -echo "configure:3053: checking for --enable-timedate" >&5 +echo "configure:3057: checking for --enable-timedate" >&5 no_cache=0 # Check whether --enable-timedate or --disable-timedate was given. if test "${enable_timedate+set}" = set; then @@ -3088,7 +3092,7 @@ fi echo $ac_n "checking for --enable-stopwatch""... $ac_c" 1>&6 -echo "configure:3092: checking for --enable-stopwatch" >&5 +echo "configure:3096: checking for --enable-stopwatch" >&5 no_cache=0 # Check whether --enable-stopwatch or --disable-stopwatch was given. if test "${enable_stopwatch+set}" = set; then @@ -3127,7 +3131,7 @@ fi echo $ac_n "checking for --enable-dialupman""... $ac_c" 1>&6 -echo "configure:3131: checking for --enable-dialupman" >&5 +echo "configure:3135: checking for --enable-dialupman" >&5 no_cache=0 # Check whether --enable-dialupman or --disable-dialupman was given. if test "${enable_dialupman+set}" = set; then @@ -3166,7 +3170,7 @@ fi echo $ac_n "checking for --enable-apple_ieee""... $ac_c" 1>&6 -echo "configure:3170: checking for --enable-apple_ieee" >&5 +echo "configure:3174: checking for --enable-apple_ieee" >&5 no_cache=0 # Check whether --enable-apple_ieee or --disable-apple_ieee was given. if test "${enable_apple_ieee+set}" = set; then @@ -3205,7 +3209,7 @@ fi echo $ac_n "checking for --enable-timer""... $ac_c" 1>&6 -echo "configure:3209: checking for --enable-timer" >&5 +echo "configure:3213: checking for --enable-timer" >&5 no_cache=0 # Check whether --enable-timer or --disable-timer was given. if test "${enable_timer+set}" = set; then @@ -3244,7 +3248,7 @@ fi echo $ac_n "checking for --enable-wave""... $ac_c" 1>&6 -echo "configure:3248: checking for --enable-wave" >&5 +echo "configure:3252: checking for --enable-wave" >&5 no_cache=0 # Check whether --enable-wave or --disable-wave was given. if test "${enable_wave+set}" = set; then @@ -3283,7 +3287,7 @@ fi echo $ac_n "checking for --enable-fraction""... $ac_c" 1>&6 -echo "configure:3287: checking for --enable-fraction" >&5 +echo "configure:3291: checking for --enable-fraction" >&5 no_cache=0 # Check whether --enable-fraction or --disable-fraction was given. if test "${enable_fraction+set}" = set; then @@ -3322,7 +3326,7 @@ fi echo $ac_n "checking for --enable-dynlib""... $ac_c" 1>&6 -echo "configure:3326: checking for --enable-dynlib" >&5 +echo "configure:3330: checking for --enable-dynlib" >&5 no_cache=0 # Check whether --enable-dynlib or --disable-dynlib was given. if test "${enable_dynlib+set}" = set; then @@ -3361,7 +3365,7 @@ fi echo $ac_n "checking for --enable-longlong""... $ac_c" 1>&6 -echo "configure:3365: checking for --enable-longlong" >&5 +echo "configure:3369: checking for --enable-longlong" >&5 no_cache=0 # Check whether --enable-longlong or --disable-longlong was given. if test "${enable_longlong+set}" = set; then @@ -3400,7 +3404,7 @@ fi echo $ac_n "checking for --enable-geometry""... $ac_c" 1>&6 -echo "configure:3404: checking for --enable-geometry" >&5 +echo "configure:3408: checking for --enable-geometry" >&5 no_cache=0 # Check whether --enable-geometry or --disable-geometry was given. if test "${enable_geometry+set}" = set; then @@ -3439,7 +3443,7 @@ fi echo $ac_n "checking for --enable-log""... $ac_c" 1>&6 -echo "configure:3443: checking for --enable-log" >&5 +echo "configure:3447: checking for --enable-log" >&5 no_cache=0 # Check whether --enable-log or --disable-log was given. if test "${enable_log+set}" = set; then @@ -3478,7 +3482,7 @@ fi echo $ac_n "checking for --enable-streams""... $ac_c" 1>&6 -echo "configure:3482: checking for --enable-streams" >&5 +echo "configure:3486: checking for --enable-streams" >&5 no_cache=0 # Check whether --enable-streams or --disable-streams was given. if test "${enable_streams+set}" = set; then @@ -3517,7 +3521,7 @@ fi echo $ac_n "checking for --enable-file""... $ac_c" 1>&6 -echo "configure:3521: checking for --enable-file" >&5 +echo "configure:3525: checking for --enable-file" >&5 no_cache=0 # Check whether --enable-file or --disable-file was given. if test "${enable_file+set}" = set; then @@ -3556,7 +3560,7 @@ fi echo $ac_n "checking for --enable-ffile""... $ac_c" 1>&6 -echo "configure:3560: checking for --enable-ffile" >&5 +echo "configure:3564: checking for --enable-ffile" >&5 no_cache=0 # Check whether --enable-ffile or --disable-ffile was given. if test "${enable_ffile+set}" = set; then @@ -3595,7 +3599,7 @@ fi echo $ac_n "checking for --enable-textfile""... $ac_c" 1>&6 -echo "configure:3599: checking for --enable-textfile" >&5 +echo "configure:3603: checking for --enable-textfile" >&5 no_cache=0 # Check whether --enable-textfile or --disable-textfile was given. if test "${enable_textfile+set}" = set; then @@ -3634,7 +3638,7 @@ fi echo $ac_n "checking for --enable-fontmap""... $ac_c" 1>&6 -echo "configure:3638: checking for --enable-fontmap" >&5 +echo "configure:3642: checking for --enable-fontmap" >&5 no_cache=0 # Check whether --enable-fontmap or --disable-fontmap was given. if test "${enable_fontmap+set}" = set; then @@ -3673,7 +3677,7 @@ fi echo $ac_n "checking for --enable-unicode""... $ac_c" 1>&6 -echo "configure:3677: checking for --enable-unicode" >&5 +echo "configure:3681: checking for --enable-unicode" >&5 no_cache=0 # Check whether --enable-unicode or --disable-unicode was given. if test "${enable_unicode+set}" = set; then @@ -3712,7 +3716,7 @@ fi echo $ac_n "checking for --enable-wcsrtombs""... $ac_c" 1>&6 -echo "configure:3716: checking for --enable-wcsrtombs" >&5 +echo "configure:3720: checking for --enable-wcsrtombs" >&5 no_cache=0 # Check whether --enable-wcsrtombs or --disable-wcsrtombs was given. if test "${enable_wcsrtombs+set}" = set; then @@ -3751,7 +3755,7 @@ fi echo $ac_n "checking for --enable-wxprintfv""... $ac_c" 1>&6 -echo "configure:3755: checking for --enable-wxprintfv" >&5 +echo "configure:3759: checking for --enable-wxprintfv" >&5 no_cache=0 # Check whether --enable-wxprintfv or --disable-wxprintfv was given. if test "${enable_wxprintfv+set}" = set; then @@ -3790,7 +3794,7 @@ fi echo $ac_n "checking for --enable-std_iostreams""... $ac_c" 1>&6 -echo "configure:3794: checking for --enable-std_iostreams" >&5 +echo "configure:3798: checking for --enable-std_iostreams" >&5 no_cache=0 # Check whether --enable-std_iostreams or --disable-std_iostreams was given. if test "${enable_std_iostreams+set}" = set; then @@ -3829,7 +3833,7 @@ fi echo $ac_n "checking for --enable-filesystem""... $ac_c" 1>&6 -echo "configure:3833: checking for --enable-filesystem" >&5 +echo "configure:3837: checking for --enable-filesystem" >&5 no_cache=0 # Check whether --enable-filesystem or --disable-filesystem was given. if test "${enable_filesystem+set}" = set; then @@ -3868,7 +3872,7 @@ fi echo $ac_n "checking for --enable-fs_inet""... $ac_c" 1>&6 -echo "configure:3872: checking for --enable-fs_inet" >&5 +echo "configure:3876: checking for --enable-fs_inet" >&5 no_cache=0 # Check whether --enable-fs_inet or --disable-fs_inet was given. if test "${enable_fs_inet+set}" = set; then @@ -3907,7 +3911,7 @@ fi echo $ac_n "checking for --enable-fs_zip""... $ac_c" 1>&6 -echo "configure:3911: checking for --enable-fs_zip" >&5 +echo "configure:3915: checking for --enable-fs_zip" >&5 no_cache=0 # Check whether --enable-fs_zip or --disable-fs_zip was given. if test "${enable_fs_zip+set}" = set; then @@ -3946,7 +3950,7 @@ fi echo $ac_n "checking for --enable-zipstream""... $ac_c" 1>&6 -echo "configure:3950: checking for --enable-zipstream" >&5 +echo "configure:3954: checking for --enable-zipstream" >&5 no_cache=0 # Check whether --enable-zipstream or --disable-zipstream was given. if test "${enable_zipstream+set}" = set; then @@ -3986,7 +3990,7 @@ fi echo $ac_n "checking for --enable-catch_segvs""... $ac_c" 1>&6 -echo "configure:3990: checking for --enable-catch_segvs" >&5 +echo "configure:3994: checking for --enable-catch_segvs" >&5 no_cache=0 # Check whether --enable-catch_segvs or --disable-catch_segvs was given. if test "${enable_catch_segvs+set}" = set; then @@ -4025,7 +4029,7 @@ fi echo $ac_n "checking for --enable-snglinst""... $ac_c" 1>&6 -echo "configure:4029: checking for --enable-snglinst" >&5 +echo "configure:4033: checking for --enable-snglinst" >&5 no_cache=0 # Check whether --enable-snglinst or --disable-snglinst was given. if test "${enable_snglinst+set}" = set; then @@ -4065,7 +4069,7 @@ fi echo $ac_n "checking for --enable-mimetype""... $ac_c" 1>&6 -echo "configure:4069: checking for --enable-mimetype" >&5 +echo "configure:4073: checking for --enable-mimetype" >&5 no_cache=0 # Check whether --enable-mimetype or --disable-mimetype was given. if test "${enable_mimetype+set}" = set; then @@ -4106,7 +4110,7 @@ fi echo $ac_n "checking for --enable-threads""... $ac_c" 1>&6 -echo "configure:4110: checking for --enable-threads" >&5 +echo "configure:4114: checking for --enable-threads" >&5 no_cache=0 # Check whether --enable-threads or --disable-threads was given. if test "${enable_threads+set}" = set; then @@ -4145,7 +4149,7 @@ fi echo $ac_n "checking for --enable-serial""... $ac_c" 1>&6 -echo "configure:4149: checking for --enable-serial" >&5 +echo "configure:4153: checking for --enable-serial" >&5 no_cache=0 # Check whether --enable-serial or --disable-serial was given. if test "${enable_serial+set}" = set; then @@ -4188,7 +4192,7 @@ if test "$wxUSE_GUI" = "yes"; then echo $ac_n "checking for --enable-docview""... $ac_c" 1>&6 -echo "configure:4192: checking for --enable-docview" >&5 +echo "configure:4196: checking for --enable-docview" >&5 no_cache=0 # Check whether --enable-docview or --disable-docview was given. if test "${enable_docview+set}" = set; then @@ -4227,7 +4231,7 @@ fi echo $ac_n "checking for --enable-help""... $ac_c" 1>&6 -echo "configure:4231: checking for --enable-help" >&5 +echo "configure:4235: checking for --enable-help" >&5 no_cache=0 # Check whether --enable-help or --disable-help was given. if test "${enable_help+set}" = set; then @@ -4265,8 +4269,86 @@ fi fi + echo $ac_n "checking for --enable-html""... $ac_c" 1>&6 +echo "configure:4274: checking for --enable-html" >&5 + no_cache=0 + # Check whether --enable-html or --disable-html was given. +if test "${enable_html+set}" = set; then + enableval="$enable_html" + + if test "$enableval" = yes; then + ac_cv_use_html='wxUSE_HTML=yes' + else + ac_cv_use_html='wxUSE_HTML=no' + fi + +else + + LINE=`grep "wxUSE_HTML" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_html='wxUSE_HTML='$DEFAULT_wxUSE_HTML + +fi + + + eval "$ac_cv_use_html" + if test "$no_cache" != 1; then + echo $ac_cv_use_html >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_HTML" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + echo $ac_n "checking for --enable-htmlhelp""... $ac_c" 1>&6 +echo "configure:4313: checking for --enable-htmlhelp" >&5 + no_cache=0 + # Check whether --enable-htmlhelp or --disable-htmlhelp was given. +if test "${enable_htmlhelp+set}" = set; then + enableval="$enable_htmlhelp" + + if test "$enableval" = yes; then + ac_cv_use_htmlhelp='wxUSE_WXHTML_HELP=yes' + else + ac_cv_use_htmlhelp='wxUSE_WXHTML_HELP=no' + fi + +else + + LINE=`grep "wxUSE_WXHTML_HELP" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_htmlhelp='wxUSE_WXHTML_HELP='$DEFAULT_wxUSE_WXHTML_HELP + +fi + + + eval "$ac_cv_use_htmlhelp" + if test "$no_cache" != 1; then + echo $ac_cv_use_htmlhelp >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_WXHTML_HELP" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + echo $ac_n "checking for --enable-constraints""... $ac_c" 1>&6 -echo "configure:4270: checking for --enable-constraints" >&5 +echo "configure:4352: checking for --enable-constraints" >&5 no_cache=0 # Check whether --enable-constraints or --disable-constraints was given. if test "${enable_constraints+set}" = set; then @@ -4305,7 +4387,7 @@ fi echo $ac_n "checking for --enable-printarch""... $ac_c" 1>&6 -echo "configure:4309: checking for --enable-printarch" >&5 +echo "configure:4391: checking for --enable-printarch" >&5 no_cache=0 # Check whether --enable-printarch or --disable-printarch was given. if test "${enable_printarch+set}" = set; then @@ -4344,7 +4426,7 @@ fi echo $ac_n "checking for --enable-mdi""... $ac_c" 1>&6 -echo "configure:4348: checking for --enable-mdi" >&5 +echo "configure:4430: checking for --enable-mdi" >&5 no_cache=0 # Check whether --enable-mdi or --disable-mdi was given. if test "${enable_mdi+set}" = set; then @@ -4383,7 +4465,7 @@ fi echo $ac_n "checking for --enable-loggui""... $ac_c" 1>&6 -echo "configure:4387: checking for --enable-loggui" >&5 +echo "configure:4469: checking for --enable-loggui" >&5 no_cache=0 # Check whether --enable-loggui or --disable-loggui was given. if test "${enable_loggui+set}" = set; then @@ -4422,7 +4504,7 @@ fi echo $ac_n "checking for --enable-logwin""... $ac_c" 1>&6 -echo "configure:4426: checking for --enable-logwin" >&5 +echo "configure:4508: checking for --enable-logwin" >&5 no_cache=0 # Check whether --enable-logwin or --disable-logwin was given. if test "${enable_logwin+set}" = set; then @@ -4462,7 +4544,7 @@ fi echo $ac_n "checking for --enable-postscript""... $ac_c" 1>&6 -echo "configure:4466: checking for --enable-postscript" >&5 +echo "configure:4548: checking for --enable-postscript" >&5 no_cache=0 # Check whether --enable-postscript or --disable-postscript was given. if test "${enable_postscript+set}" = set; then @@ -4504,7 +4586,7 @@ fi echo $ac_n "checking for --enable-prologio""... $ac_c" 1>&6 -echo "configure:4508: checking for --enable-prologio" >&5 +echo "configure:4590: checking for --enable-prologio" >&5 no_cache=0 # Check whether --enable-prologio or --disable-prologio was given. if test "${enable_prologio+set}" = set; then @@ -4543,7 +4625,7 @@ fi echo $ac_n "checking for --enable-resources""... $ac_c" 1>&6 -echo "configure:4547: checking for --enable-resources" >&5 +echo "configure:4629: checking for --enable-resources" >&5 no_cache=0 # Check whether --enable-resources or --disable-resources was given. if test "${enable_resources+set}" = set; then @@ -4583,7 +4665,7 @@ fi echo $ac_n "checking for --enable-xresources""... $ac_c" 1>&6 -echo "configure:4587: checking for --enable-xresources" >&5 +echo "configure:4669: checking for --enable-xresources" >&5 no_cache=0 # Check whether --enable-xresources or --disable-xresources was given. if test "${enable_xresources+set}" = set; then @@ -4624,7 +4706,7 @@ fi echo $ac_n "checking for --enable-clipboard""... $ac_c" 1>&6 -echo "configure:4628: checking for --enable-clipboard" >&5 +echo "configure:4710: checking for --enable-clipboard" >&5 no_cache=0 # Check whether --enable-clipboard or --disable-clipboard was given. if test "${enable_clipboard+set}" = set; then @@ -4663,7 +4745,7 @@ fi echo $ac_n "checking for --enable-dnd""... $ac_c" 1>&6 -echo "configure:4667: checking for --enable-dnd" >&5 +echo "configure:4749: checking for --enable-dnd" >&5 no_cache=0 # Check whether --enable-dnd or --disable-dnd was given. if test "${enable_dnd+set}" = set; then @@ -4702,7 +4784,7 @@ fi echo $ac_n "checking for --enable-metafile""... $ac_c" 1>&6 -echo "configure:4706: checking for --enable-metafile" >&5 +echo "configure:4788: checking for --enable-metafile" >&5 no_cache=0 # Check whether --enable-metafile or --disable-metafile was given. if test "${enable_metafile+set}" = set; then @@ -4742,7 +4824,7 @@ fi echo $ac_n "checking for --enable-wxtree""... $ac_c" 1>&6 -echo "configure:4746: checking for --enable-wxtree" >&5 +echo "configure:4828: checking for --enable-wxtree" >&5 no_cache=0 # Check whether --enable-wxtree or --disable-wxtree was given. if test "${enable_wxtree+set}" = set; then @@ -4783,7 +4865,7 @@ fi echo $ac_n "checking for --enable-controls""... $ac_c" 1>&6 -echo "configure:4787: checking for --enable-controls" >&5 +echo "configure:4869: checking for --enable-controls" >&5 no_cache=0 # Check whether --enable-controls or --disable-controls was given. if test "${enable_controls+set}" = set; then @@ -4897,7 +4979,7 @@ fi echo $ac_n "checking for --enable-accel""... $ac_c" 1>&6 -echo "configure:4901: checking for --enable-accel" >&5 +echo "configure:4983: checking for --enable-accel" >&5 no_cache=0 # Check whether --enable-accel or --disable-accel was given. if test "${enable_accel+set}" = set; then @@ -4936,7 +5018,7 @@ fi echo $ac_n "checking for --enable-button""... $ac_c" 1>&6 -echo "configure:4940: checking for --enable-button" >&5 +echo "configure:5022: checking for --enable-button" >&5 no_cache=0 # Check whether --enable-button or --disable-button was given. if test "${enable_button+set}" = set; then @@ -4975,7 +5057,7 @@ fi echo $ac_n "checking for --enable-bmpbutton""... $ac_c" 1>&6 -echo "configure:4979: checking for --enable-bmpbutton" >&5 +echo "configure:5061: checking for --enable-bmpbutton" >&5 no_cache=0 # Check whether --enable-bmpbutton or --disable-bmpbutton was given. if test "${enable_bmpbutton+set}" = set; then @@ -5014,7 +5096,7 @@ fi echo $ac_n "checking for --enable-calendar""... $ac_c" 1>&6 -echo "configure:5018: checking for --enable-calendar" >&5 +echo "configure:5100: checking for --enable-calendar" >&5 no_cache=0 # Check whether --enable-calendar or --disable-calendar was given. if test "${enable_calendar+set}" = set; then @@ -5053,7 +5135,7 @@ fi echo $ac_n "checking for --enable-caret""... $ac_c" 1>&6 -echo "configure:5057: checking for --enable-caret" >&5 +echo "configure:5139: checking for --enable-caret" >&5 no_cache=0 # Check whether --enable-caret or --disable-caret was given. if test "${enable_caret+set}" = set; then @@ -5092,7 +5174,7 @@ fi echo $ac_n "checking for --enable-checkbox""... $ac_c" 1>&6 -echo "configure:5096: checking for --enable-checkbox" >&5 +echo "configure:5178: checking for --enable-checkbox" >&5 no_cache=0 # Check whether --enable-checkbox or --disable-checkbox was given. if test "${enable_checkbox+set}" = set; then @@ -5131,7 +5213,7 @@ fi echo $ac_n "checking for --enable-checklst""... $ac_c" 1>&6 -echo "configure:5135: checking for --enable-checklst" >&5 +echo "configure:5217: checking for --enable-checklst" >&5 no_cache=0 # Check whether --enable-checklst or --disable-checklst was given. if test "${enable_checklst+set}" = set; then @@ -5170,7 +5252,7 @@ fi echo $ac_n "checking for --enable-choice""... $ac_c" 1>&6 -echo "configure:5174: checking for --enable-choice" >&5 +echo "configure:5256: checking for --enable-choice" >&5 no_cache=0 # Check whether --enable-choice or --disable-choice was given. if test "${enable_choice+set}" = set; then @@ -5209,7 +5291,7 @@ fi echo $ac_n "checking for --enable-combobox""... $ac_c" 1>&6 -echo "configure:5213: checking for --enable-combobox" >&5 +echo "configure:5295: checking for --enable-combobox" >&5 no_cache=0 # Check whether --enable-combobox or --disable-combobox was given. if test "${enable_combobox+set}" = set; then @@ -5248,7 +5330,7 @@ fi echo $ac_n "checking for --enable-gauge""... $ac_c" 1>&6 -echo "configure:5252: checking for --enable-gauge" >&5 +echo "configure:5334: checking for --enable-gauge" >&5 no_cache=0 # Check whether --enable-gauge or --disable-gauge was given. if test "${enable_gauge+set}" = set; then @@ -5287,7 +5369,7 @@ fi echo $ac_n "checking for --enable-grid""... $ac_c" 1>&6 -echo "configure:5291: checking for --enable-grid" >&5 +echo "configure:5373: checking for --enable-grid" >&5 no_cache=0 # Check whether --enable-grid or --disable-grid was given. if test "${enable_grid+set}" = set; then @@ -5326,7 +5408,7 @@ fi echo $ac_n "checking for --enable-newgrid""... $ac_c" 1>&6 -echo "configure:5330: checking for --enable-newgrid" >&5 +echo "configure:5412: checking for --enable-newgrid" >&5 no_cache=0 # Check whether --enable-newgrid or --disable-newgrid was given. if test "${enable_newgrid+set}" = set; then @@ -5365,7 +5447,7 @@ fi echo $ac_n "checking for --enable-imaglist""... $ac_c" 1>&6 -echo "configure:5369: checking for --enable-imaglist" >&5 +echo "configure:5451: checking for --enable-imaglist" >&5 no_cache=0 # Check whether --enable-imaglist or --disable-imaglist was given. if test "${enable_imaglist+set}" = set; then @@ -5404,7 +5486,7 @@ fi echo $ac_n "checking for --enable-listbox""... $ac_c" 1>&6 -echo "configure:5408: checking for --enable-listbox" >&5 +echo "configure:5490: checking for --enable-listbox" >&5 no_cache=0 # Check whether --enable-listbox or --disable-listbox was given. if test "${enable_listbox+set}" = set; then @@ -5443,7 +5525,7 @@ fi echo $ac_n "checking for --enable-listctrl""... $ac_c" 1>&6 -echo "configure:5447: checking for --enable-listctrl" >&5 +echo "configure:5529: checking for --enable-listctrl" >&5 no_cache=0 # Check whether --enable-listctrl or --disable-listctrl was given. if test "${enable_listctrl+set}" = set; then @@ -5482,7 +5564,7 @@ fi echo $ac_n "checking for --enable-notebook""... $ac_c" 1>&6 -echo "configure:5486: checking for --enable-notebook" >&5 +echo "configure:5568: checking for --enable-notebook" >&5 no_cache=0 # Check whether --enable-notebook or --disable-notebook was given. if test "${enable_notebook+set}" = set; then @@ -5521,7 +5603,7 @@ fi echo $ac_n "checking for --enable-radiobox""... $ac_c" 1>&6 -echo "configure:5525: checking for --enable-radiobox" >&5 +echo "configure:5607: checking for --enable-radiobox" >&5 no_cache=0 # Check whether --enable-radiobox or --disable-radiobox was given. if test "${enable_radiobox+set}" = set; then @@ -5560,7 +5642,7 @@ fi echo $ac_n "checking for --enable-radiobtn""... $ac_c" 1>&6 -echo "configure:5564: checking for --enable-radiobtn" >&5 +echo "configure:5646: checking for --enable-radiobtn" >&5 no_cache=0 # Check whether --enable-radiobtn or --disable-radiobtn was given. if test "${enable_radiobtn+set}" = set; then @@ -5599,7 +5681,7 @@ fi echo $ac_n "checking for --enable-sash""... $ac_c" 1>&6 -echo "configure:5603: checking for --enable-sash" >&5 +echo "configure:5685: checking for --enable-sash" >&5 no_cache=0 # Check whether --enable-sash or --disable-sash was given. if test "${enable_sash+set}" = set; then @@ -5638,7 +5720,7 @@ fi echo $ac_n "checking for --enable-scrollbar""... $ac_c" 1>&6 -echo "configure:5642: checking for --enable-scrollbar" >&5 +echo "configure:5724: checking for --enable-scrollbar" >&5 no_cache=0 # Check whether --enable-scrollbar or --disable-scrollbar was given. if test "${enable_scrollbar+set}" = set; then @@ -5677,7 +5759,7 @@ fi echo $ac_n "checking for --enable-slider""... $ac_c" 1>&6 -echo "configure:5681: checking for --enable-slider" >&5 +echo "configure:5763: checking for --enable-slider" >&5 no_cache=0 # Check whether --enable-slider or --disable-slider was given. if test "${enable_slider+set}" = set; then @@ -5716,7 +5798,7 @@ fi echo $ac_n "checking for --enable-spinbtn""... $ac_c" 1>&6 -echo "configure:5720: checking for --enable-spinbtn" >&5 +echo "configure:5802: checking for --enable-spinbtn" >&5 no_cache=0 # Check whether --enable-spinbtn or --disable-spinbtn was given. if test "${enable_spinbtn+set}" = set; then @@ -5755,7 +5837,7 @@ fi echo $ac_n "checking for --enable-spinctrl""... $ac_c" 1>&6 -echo "configure:5759: checking for --enable-spinctrl" >&5 +echo "configure:5841: checking for --enable-spinctrl" >&5 no_cache=0 # Check whether --enable-spinctrl or --disable-spinctrl was given. if test "${enable_spinctrl+set}" = set; then @@ -5794,7 +5876,7 @@ fi echo $ac_n "checking for --enable-splitter""... $ac_c" 1>&6 -echo "configure:5798: checking for --enable-splitter" >&5 +echo "configure:5880: checking for --enable-splitter" >&5 no_cache=0 # Check whether --enable-splitter or --disable-splitter was given. if test "${enable_splitter+set}" = set; then @@ -5833,7 +5915,7 @@ fi echo $ac_n "checking for --enable-statbmp""... $ac_c" 1>&6 -echo "configure:5837: checking for --enable-statbmp" >&5 +echo "configure:5919: checking for --enable-statbmp" >&5 no_cache=0 # Check whether --enable-statbmp or --disable-statbmp was given. if test "${enable_statbmp+set}" = set; then @@ -5872,7 +5954,7 @@ fi echo $ac_n "checking for --enable-statbox""... $ac_c" 1>&6 -echo "configure:5876: checking for --enable-statbox" >&5 +echo "configure:5958: checking for --enable-statbox" >&5 no_cache=0 # Check whether --enable-statbox or --disable-statbox was given. if test "${enable_statbox+set}" = set; then @@ -5911,7 +5993,7 @@ fi echo $ac_n "checking for --enable-statline""... $ac_c" 1>&6 -echo "configure:5915: checking for --enable-statline" >&5 +echo "configure:5997: checking for --enable-statline" >&5 no_cache=0 # Check whether --enable-statline or --disable-statline was given. if test "${enable_statline+set}" = set; then @@ -5950,7 +6032,7 @@ fi echo $ac_n "checking for --enable-stattext""... $ac_c" 1>&6 -echo "configure:5954: checking for --enable-stattext" >&5 +echo "configure:6036: checking for --enable-stattext" >&5 no_cache=0 # Check whether --enable-stattext or --disable-stattext was given. if test "${enable_stattext+set}" = set; then @@ -5989,7 +6071,7 @@ fi echo $ac_n "checking for --enable-statusbar""... $ac_c" 1>&6 -echo "configure:5993: checking for --enable-statusbar" >&5 +echo "configure:6075: checking for --enable-statusbar" >&5 no_cache=0 # Check whether --enable-statusbar or --disable-statusbar was given. if test "${enable_statusbar+set}" = set; then @@ -6028,7 +6110,7 @@ fi echo $ac_n "checking for --enable-tabdialog""... $ac_c" 1>&6 -echo "configure:6032: checking for --enable-tabdialog" >&5 +echo "configure:6114: checking for --enable-tabdialog" >&5 no_cache=0 # Check whether --enable-tabdialog or --disable-tabdialog was given. if test "${enable_tabdialog+set}" = set; then @@ -6067,7 +6149,7 @@ fi echo $ac_n "checking for --enable-textctrl""... $ac_c" 1>&6 -echo "configure:6071: checking for --enable-textctrl" >&5 +echo "configure:6153: checking for --enable-textctrl" >&5 no_cache=0 # Check whether --enable-textctrl or --disable-textctrl was given. if test "${enable_textctrl+set}" = set; then @@ -6106,7 +6188,7 @@ fi echo $ac_n "checking for --enable-togglebtn""... $ac_c" 1>&6 -echo "configure:6110: checking for --enable-togglebtn" >&5 +echo "configure:6192: checking for --enable-togglebtn" >&5 no_cache=0 # Check whether --enable-togglebtn or --disable-togglebtn was given. if test "${enable_togglebtn+set}" = set; then @@ -6145,7 +6227,7 @@ fi echo $ac_n "checking for --enable-toolbar""... $ac_c" 1>&6 -echo "configure:6149: checking for --enable-toolbar" >&5 +echo "configure:6231: checking for --enable-toolbar" >&5 no_cache=0 # Check whether --enable-toolbar or --disable-toolbar was given. if test "${enable_toolbar+set}" = set; then @@ -6184,7 +6266,7 @@ fi echo $ac_n "checking for --enable-tbarnative""... $ac_c" 1>&6 -echo "configure:6188: checking for --enable-tbarnative" >&5 +echo "configure:6270: checking for --enable-tbarnative" >&5 no_cache=0 # Check whether --enable-tbarnative or --disable-tbarnative was given. if test "${enable_tbarnative+set}" = set; then @@ -6223,7 +6305,7 @@ fi echo $ac_n "checking for --enable-tbarsmpl""... $ac_c" 1>&6 -echo "configure:6227: checking for --enable-tbarsmpl" >&5 +echo "configure:6309: checking for --enable-tbarsmpl" >&5 no_cache=0 # Check whether --enable-tbarsmpl or --disable-tbarsmpl was given. if test "${enable_tbarsmpl+set}" = set; then @@ -6262,7 +6344,7 @@ fi echo $ac_n "checking for --enable-treectrl""... $ac_c" 1>&6 -echo "configure:6266: checking for --enable-treectrl" >&5 +echo "configure:6348: checking for --enable-treectrl" >&5 no_cache=0 # Check whether --enable-treectrl or --disable-treectrl was given. if test "${enable_treectrl+set}" = set; then @@ -6303,7 +6385,7 @@ fi echo $ac_n "checking for --enable-commondlg""... $ac_c" 1>&6 -echo "configure:6307: checking for --enable-commondlg" >&5 +echo "configure:6389: checking for --enable-commondlg" >&5 no_cache=0 # Check whether --enable-commondlg or --disable-commondlg was given. if test "${enable_commondlg+set}" = set; then @@ -6342,7 +6424,7 @@ fi echo $ac_n "checking for --enable-choicedlg""... $ac_c" 1>&6 -echo "configure:6346: checking for --enable-choicedlg" >&5 +echo "configure:6428: checking for --enable-choicedlg" >&5 no_cache=0 # Check whether --enable-choicedlg or --disable-choicedlg was given. if test "${enable_choicedlg+set}" = set; then @@ -6381,7 +6463,7 @@ fi echo $ac_n "checking for --enable-coldlg""... $ac_c" 1>&6 -echo "configure:6385: checking for --enable-coldlg" >&5 +echo "configure:6467: checking for --enable-coldlg" >&5 no_cache=0 # Check whether --enable-coldlg or --disable-coldlg was given. if test "${enable_coldlg+set}" = set; then @@ -6420,7 +6502,7 @@ fi echo $ac_n "checking for --enable-filedlg""... $ac_c" 1>&6 -echo "configure:6424: checking for --enable-filedlg" >&5 +echo "configure:6506: checking for --enable-filedlg" >&5 no_cache=0 # Check whether --enable-filedlg or --disable-filedlg was given. if test "${enable_filedlg+set}" = set; then @@ -6459,7 +6541,7 @@ fi echo $ac_n "checking for --enable-fontdlg""... $ac_c" 1>&6 -echo "configure:6463: checking for --enable-fontdlg" >&5 +echo "configure:6545: checking for --enable-fontdlg" >&5 no_cache=0 # Check whether --enable-fontdlg or --disable-fontdlg was given. if test "${enable_fontdlg+set}" = set; then @@ -6498,7 +6580,7 @@ fi echo $ac_n "checking for --enable-dirdlg""... $ac_c" 1>&6 -echo "configure:6502: checking for --enable-dirdlg" >&5 +echo "configure:6584: checking for --enable-dirdlg" >&5 no_cache=0 # Check whether --enable-dirdlg or --disable-dirdlg was given. if test "${enable_dirdlg+set}" = set; then @@ -6537,7 +6619,7 @@ fi echo $ac_n "checking for --enable-msgdlg""... $ac_c" 1>&6 -echo "configure:6541: checking for --enable-msgdlg" >&5 +echo "configure:6623: checking for --enable-msgdlg" >&5 no_cache=0 # Check whether --enable-msgdlg or --disable-msgdlg was given. if test "${enable_msgdlg+set}" = set; then @@ -6576,7 +6658,7 @@ fi echo $ac_n "checking for --enable-numberdlg""... $ac_c" 1>&6 -echo "configure:6580: checking for --enable-numberdlg" >&5 +echo "configure:6662: checking for --enable-numberdlg" >&5 no_cache=0 # Check whether --enable-numberdlg or --disable-numberdlg was given. if test "${enable_numberdlg+set}" = set; then @@ -6615,7 +6697,7 @@ fi echo $ac_n "checking for --enable-textdlg""... $ac_c" 1>&6 -echo "configure:6619: checking for --enable-textdlg" >&5 +echo "configure:6701: checking for --enable-textdlg" >&5 no_cache=0 # Check whether --enable-textdlg or --disable-textdlg was given. if test "${enable_textdlg+set}" = set; then @@ -6654,7 +6736,7 @@ fi echo $ac_n "checking for --enable-tipdlg""... $ac_c" 1>&6 -echo "configure:6658: checking for --enable-tipdlg" >&5 +echo "configure:6740: checking for --enable-tipdlg" >&5 no_cache=0 # Check whether --enable-tipdlg or --disable-tipdlg was given. if test "${enable_tipdlg+set}" = set; then @@ -6693,7 +6775,7 @@ fi echo $ac_n "checking for --enable-progressdlg""... $ac_c" 1>&6 -echo "configure:6697: checking for --enable-progressdlg" >&5 +echo "configure:6779: checking for --enable-progressdlg" >&5 no_cache=0 # Check whether --enable-progressdlg or --disable-progressdlg was given. if test "${enable_progressdlg+set}" = set; then @@ -6732,7 +6814,7 @@ fi echo $ac_n "checking for --enable-wizarddlg""... $ac_c" 1>&6 -echo "configure:6736: checking for --enable-wizarddlg" >&5 +echo "configure:6818: checking for --enable-wizarddlg" >&5 no_cache=0 # Check whether --enable-wizarddlg or --disable-wizarddlg was given. if test "${enable_wizarddlg+set}" = set; then @@ -6773,7 +6855,7 @@ fi echo $ac_n "checking for --enable-menus""... $ac_c" 1>&6 -echo "configure:6777: checking for --enable-menus" >&5 +echo "configure:6859: checking for --enable-menus" >&5 no_cache=0 # Check whether --enable-menus or --disable-menus was given. if test "${enable_menus+set}" = set; then @@ -6812,7 +6894,7 @@ fi echo $ac_n "checking for --enable-miniframe""... $ac_c" 1>&6 -echo "configure:6816: checking for --enable-miniframe" >&5 +echo "configure:6898: checking for --enable-miniframe" >&5 no_cache=0 # Check whether --enable-miniframe or --disable-miniframe was given. if test "${enable_miniframe+set}" = set; then @@ -6850,47 +6932,8 @@ fi fi - echo $ac_n "checking for --enable-html""... $ac_c" 1>&6 -echo "configure:6855: checking for --enable-html" >&5 - no_cache=0 - # Check whether --enable-html or --disable-html was given. -if test "${enable_html+set}" = set; then - enableval="$enable_html" - - if test "$enableval" = yes; then - ac_cv_use_html='wxUSE_HTML=yes' - else - ac_cv_use_html='wxUSE_HTML=no' - fi - -else - - LINE=`grep "wxUSE_HTML" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - - ac_cv_use_html='wxUSE_HTML='$DEFAULT_wxUSE_HTML - -fi - - - eval "$ac_cv_use_html" - if test "$no_cache" != 1; then - echo $ac_cv_use_html >> ${wx_arg_cache_file}.tmp - fi - - if test "$wxUSE_HTML" = yes; then - echo "$ac_t""yes" 1>&6 - else - echo "$ac_t""no" 1>&6 - fi - - echo $ac_n "checking for --enable-tooltips""... $ac_c" 1>&6 -echo "configure:6894: checking for --enable-tooltips" >&5 +echo "configure:6937: checking for --enable-tooltips" >&5 no_cache=0 # Check whether --enable-tooltips or --disable-tooltips was given. if test "${enable_tooltips+set}" = set; then @@ -6929,7 +6972,7 @@ fi echo $ac_n "checking for --enable-splines""... $ac_c" 1>&6 -echo "configure:6933: checking for --enable-splines" >&5 +echo "configure:6976: checking for --enable-splines" >&5 no_cache=0 # Check whether --enable-splines or --disable-splines was given. if test "${enable_splines+set}" = set; then @@ -6968,7 +7011,7 @@ fi echo $ac_n "checking for --enable-validators""... $ac_c" 1>&6 -echo "configure:6972: checking for --enable-validators" >&5 +echo "configure:7015: checking for --enable-validators" >&5 no_cache=0 # Check whether --enable-validators or --disable-validators was given. if test "${enable_validators+set}" = set; then @@ -7007,7 +7050,7 @@ fi echo $ac_n "checking for --enable-busyinfo""... $ac_c" 1>&6 -echo "configure:7011: checking for --enable-busyinfo" >&5 +echo "configure:7054: checking for --enable-busyinfo" >&5 no_cache=0 # Check whether --enable-busyinfo or --disable-busyinfo was given. if test "${enable_busyinfo+set}" = set; then @@ -7046,7 +7089,7 @@ fi echo $ac_n "checking for --enable-joystick""... $ac_c" 1>&6 -echo "configure:7050: checking for --enable-joystick" >&5 +echo "configure:7093: checking for --enable-joystick" >&5 no_cache=0 # Check whether --enable-joystick or --disable-joystick was given. if test "${enable_joystick+set}" = set; then @@ -7085,7 +7128,7 @@ fi echo $ac_n "checking for --enable-metafile""... $ac_c" 1>&6 -echo "configure:7089: checking for --enable-metafile" >&5 +echo "configure:7132: checking for --enable-metafile" >&5 no_cache=0 # Check whether --enable-metafile or --disable-metafile was given. if test "${enable_metafile+set}" = set; then @@ -7124,7 +7167,7 @@ fi echo $ac_n "checking for --enable-dragimage""... $ac_c" 1>&6 -echo "configure:7128: checking for --enable-dragimage" >&5 +echo "configure:7171: checking for --enable-dragimage" >&5 no_cache=0 # Check whether --enable-dragimage or --disable-dragimage was given. if test "${enable_dragimage+set}" = set; then @@ -7165,7 +7208,7 @@ fi echo $ac_n "checking for --enable-image""... $ac_c" 1>&6 -echo "configure:7169: checking for --enable-image" >&5 +echo "configure:7212: checking for --enable-image" >&5 no_cache=0 # Check whether --enable-image or --disable-image was given. if test "${enable_image+set}" = set; then @@ -7204,7 +7247,7 @@ fi echo $ac_n "checking for --enable-gif""... $ac_c" 1>&6 -echo "configure:7208: checking for --enable-gif" >&5 +echo "configure:7251: checking for --enable-gif" >&5 no_cache=0 # Check whether --enable-gif or --disable-gif was given. if test "${enable_gif+set}" = set; then @@ -7243,7 +7286,7 @@ fi echo $ac_n "checking for --enable-pcx""... $ac_c" 1>&6 -echo "configure:7247: checking for --enable-pcx" >&5 +echo "configure:7290: checking for --enable-pcx" >&5 no_cache=0 # Check whether --enable-pcx or --disable-pcx was given. if test "${enable_pcx+set}" = set; then @@ -7282,7 +7325,7 @@ fi echo $ac_n "checking for --enable-pnm""... $ac_c" 1>&6 -echo "configure:7286: checking for --enable-pnm" >&5 +echo "configure:7329: checking for --enable-pnm" >&5 no_cache=0 # Check whether --enable-pnm or --disable-pnm was given. if test "${enable_pnm+set}" = set; then @@ -7321,7 +7364,7 @@ fi echo $ac_n "checking for --enable-pnm""... $ac_c" 1>&6 -echo "configure:7325: checking for --enable-pnm" >&5 +echo "configure:7368: checking for --enable-pnm" >&5 no_cache=0 # Check whether --enable-pnm or --disable-pnm was given. if test "${enable_pnm+set}" = set; then @@ -7368,7 +7411,7 @@ fi echo $ac_n "checking for toolkit""... $ac_c" 1>&6 -echo "configure:7372: checking for toolkit" >&5 +echo "configure:7415: checking for toolkit" >&5 if test "$wxUSE_GUI" = "yes"; then @@ -7502,7 +7545,7 @@ fi # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:7506: checking for $ac_word" >&5 +echo "configure:7549: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7532,7 +7575,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:7536: checking for $ac_word" >&5 +echo "configure:7579: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7583,7 +7626,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:7587: checking for $ac_word" >&5 +echo "configure:7630: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7615,7 +7658,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:7619: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:7662: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -7626,12 +7669,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 7630 "configure" +#line 7673 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:7635: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7678: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -7657,12 +7700,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:7661: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:7704: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:7666: checking whether we are using GNU C" >&5 +echo "configure:7709: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7671,7 +7714,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:7675: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:7718: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -7690,7 +7733,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:7694: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:7737: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7725,7 +7768,7 @@ fi CFLAGS=`echo "$CFLAGS" | sed 's/-g//g'` echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:7729: checking how to run the C preprocessor" >&5 +echo "configure:7772: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -7740,13 +7783,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7750: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7793: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -7757,13 +7800,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7767: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7810: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -7774,13 +7817,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7784: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7827: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -7807,13 +7850,13 @@ echo "$ac_t""$CPP" 1>&6 if test $ac_cv_prog_gcc = yes; then echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 -echo "configure:7811: checking whether ${CC-cc} needs -traditional" >&5 +echo "configure:7854: checking whether ${CC-cc} needs -traditional" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_pattern="Autoconf.*'x'" cat > conftest.$ac_ext < Autoconf TIOCGETP @@ -7831,7 +7874,7 @@ rm -f conftest* if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext < Autoconf TCGETA @@ -7867,7 +7910,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:7871: checking for $ac_word" >&5 +echo "configure:7914: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7899,7 +7942,7 @@ test -n "$CXX" || CXX="gcc" echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:7903: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 +echo "configure:7946: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -7910,12 +7953,12 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext << EOF -#line 7914 "configure" +#line 7957 "configure" #include "confdefs.h" int main(){return(0);} EOF -if { (eval echo configure:7919: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7962: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cxx_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -7941,12 +7984,12 @@ if test $ac_cv_prog_cxx_works = no; then { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:7945: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:7988: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 -echo "configure:7950: checking whether we are using GNU C++" >&5 +echo "configure:7993: checking whether we are using GNU C++" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7955,7 +7998,7 @@ else yes; #endif EOF -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:7959: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:8002: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gxx=yes else ac_cv_prog_gxx=no @@ -7974,7 +8017,7 @@ ac_test_CXXFLAGS="${CXXFLAGS+set}" ac_save_CXXFLAGS="$CXXFLAGS" CXXFLAGS= echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 -echo "configure:7978: checking whether ${CXX-g++} accepts -g" >&5 +echo "configure:8021: checking whether ${CXX-g++} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8007,7 +8050,7 @@ fi echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 -echo "configure:8011: checking how to run the C++ preprocessor" >&5 +echo "configure:8054: checking how to run the C++ preprocessor" >&5 if test -z "$CXXCPP"; then if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -8020,12 +8063,12 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross CXXCPP="${CXX-g++} -E" cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8029: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8072: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -8063,7 +8106,7 @@ cross_compiling=$ac_cv_prog_cc_cross # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:8067: checking for $ac_word" >&5 +echo "configure:8110: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8094,7 +8137,7 @@ fi # Extract the first word of "ar", so it can be a program name with args. set dummy ar; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:8098: checking for $ac_word" >&5 +echo "configure:8141: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8134,7 +8177,7 @@ fi # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:8138: checking for a BSD compatible install" >&5 +echo "configure:8181: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -8190,7 +8233,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:8194: checking for $ac_word" >&5 +echo "configure:8237: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8219,7 +8262,7 @@ fi echo $ac_n "checking make for VPATH support""... $ac_c" 1>&6 -echo "configure:8223: checking make for VPATH support" >&5 +echo "configure:8266: checking make for VPATH support" >&5 cat - << EOF > confMake check : file cp \$? \$@ @@ -8256,7 +8299,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:8260: checking for $ac_word" >&5 +echo "configure:8303: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8290,7 +8333,7 @@ test -n "$YACC" || YACC="yacc" # Extract the first word of "flex", so it can be a program name with args. set dummy flex; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:8294: checking for $ac_word" >&5 +echo "configure:8337: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LEX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8324,7 +8367,7 @@ then *) ac_lib=l ;; esac echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6 -echo "configure:8328: checking for yywrap in -l$ac_lib" >&5 +echo "configure:8371: checking for yywrap in -l$ac_lib" >&5 ac_lib_var=`echo $ac_lib'_'yywrap | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -8332,7 +8375,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$ac_lib $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8390: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8367,7 +8410,7 @@ fi echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:8371: checking whether ln -s works" >&5 +echo "configure:8414: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8530,7 +8573,7 @@ if test "$wxUSE_GUI" = "yes"; then echo "configure: warning: skipping windows.h check for cross-compilation" 1>&2 else echo $ac_n "checking for Windows headers""... $ac_c" 1>&6 -echo "configure:8534: checking for Windows headers" >&5 +echo "configure:8577: checking for Windows headers" >&5 ac_find_includes= for ac_dir in $SEARCH_INCLUDE; @@ -8576,7 +8619,7 @@ for ac_dir in $SEARCH_INCLUDE; if test "$wxUSE_GTK" = 1; then echo $ac_n "checking for GTK+ version""... $ac_c" 1>&6 -echo "configure:8580: checking for GTK+ version" >&5 +echo "configure:8623: checking for GTK+ version" >&5 gtk_version_cached=1 if eval "test \"`echo '$''{'wx_cv_lib_gtk'+set}'`\" = set"; then @@ -8638,7 +8681,7 @@ fi # Extract the first word of "gtk-config-2.0", so it can be a program name with args. set dummy gtk-config-2.0; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:8642: checking for $ac_word" >&5 +echo "configure:8685: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG_2_0'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8673,7 +8716,7 @@ fi min_gtk_version=1.3.1 echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6 -echo "configure:8677: checking for GTK - version >= $min_gtk_version" >&5 +echo "configure:8720: checking for GTK - version >= $min_gtk_version" >&5 no_gtk="" if test "$GTK_CONFIG_2_0" = "no" ; then no_gtk=yes @@ -8696,7 +8739,7 @@ echo "configure:8677: checking for GTK - version >= $min_gtk_version" >&5 echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < @@ -8774,7 +8817,7 @@ main () } EOF -if { (eval echo configure:8778: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:8821: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -8808,7 +8851,7 @@ fi CFLAGS="$CFLAGS $GTK_CFLAGS" LIBS="$LIBS $GTK_LIBS" cat > conftest.$ac_ext < @@ -8818,7 +8861,7 @@ int main() { return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ; return 0; } EOF -if { (eval echo configure:8822: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8865: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "*** The test program compiled, but did not run. This usually means" echo "*** that the run-time linker is not finding GTK or finding the wrong" @@ -8876,7 +8919,7 @@ rm -f conftest* # Extract the first word of "gtk-config", so it can be a program name with args. set dummy gtk-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:8880: checking for $ac_word" >&5 +echo "configure:8923: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8911,7 +8954,7 @@ fi min_gtk_version=1.2.7 echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6 -echo "configure:8915: checking for GTK - version >= $min_gtk_version" >&5 +echo "configure:8958: checking for GTK - version >= $min_gtk_version" >&5 no_gtk="" if test "$GTK_CONFIG" != "no" ; then GTK_CFLAGS=`$GTK_CONFIG --cflags` @@ -8924,7 +8967,7 @@ echo "configure:8915: checking for GTK - version >= $min_gtk_version" >&5 echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < @@ -8957,7 +9000,7 @@ main () } EOF -if { (eval echo configure:8961: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9004: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -9006,7 +9049,7 @@ fi # Extract the first word of "gtk-config", so it can be a program name with args. set dummy gtk-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:9010: checking for $ac_word" >&5 +echo "configure:9053: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9041,7 +9084,7 @@ fi min_gtk_version=1.2.3 echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6 -echo "configure:9045: checking for GTK - version >= $min_gtk_version" >&5 +echo "configure:9088: checking for GTK - version >= $min_gtk_version" >&5 no_gtk="" if test "$GTK_CONFIG" != "no" ; then GTK_CFLAGS=`$GTK_CONFIG --cflags` @@ -9054,7 +9097,7 @@ echo "configure:9045: checking for GTK - version >= $min_gtk_version" >&5 echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < @@ -9087,7 +9130,7 @@ main () } EOF -if { (eval echo configure:9091: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9134: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -9158,7 +9201,7 @@ equivalent variable and GTK+ is version 1.2.3 or above. GUIDIST=GTK_DIST echo $ac_n "checking for gdk_im_open in -lgdk""... $ac_c" 1>&6 -echo "configure:9162: checking for gdk_im_open in -lgdk" >&5 +echo "configure:9205: checking for gdk_im_open in -lgdk" >&5 ac_lib_var=`echo gdk'_'gdk_im_open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -9166,7 +9209,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgdk $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9224: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -9205,7 +9248,7 @@ fi if test "$wxUSE_MGL" = 1; then echo $ac_n "checking for SciTech MGL library""... $ac_c" 1>&6 -echo "configure:9209: checking for SciTech MGL library" >&5 +echo "configure:9252: checking for SciTech MGL library" >&5 if test "x$MGL_ROOT" = x ; then echo "$ac_t""not found" 1>&6 { echo "configure: error: Cannot find MGL library. Make sure MGL_ROOT is set." 1>&2; exit 1; } @@ -9239,7 +9282,7 @@ echo "configure:9209: checking for SciTech MGL library" >&5 if test "$wxUSE_WINE" = 1; then echo $ac_n "checking for WINE includes""... $ac_c" 1>&6 -echo "configure:9243: checking for WINE includes" >&5 +echo "configure:9286: checking for WINE includes" >&5 ac_find_includes= for ac_dir in $SEARCH_INCLUDE; @@ -9260,7 +9303,7 @@ for ac_dir in $SEARCH_INCLUDE; XPM_LINK="" echo $ac_n "checking for Xpm library""... $ac_c" 1>&6 -echo "configure:9264: checking for Xpm library" >&5 +echo "configure:9307: checking for Xpm library" >&5 ac_find_libraries= for ac_dir in $SEARCH_LIB; @@ -9288,7 +9331,7 @@ EOF MESA_LINK="" echo $ac_n "checking for Mesa library""... $ac_c" 1>&6 -echo "configure:9292: checking for Mesa library" >&5 +echo "configure:9335: checking for Mesa library" >&5 ac_find_libraries= for ac_dir in $SEARCH_LIB; @@ -9322,7 +9365,7 @@ for ac_dir in $SEARCH_LIB; # Uses ac_ vars as temps to allow command line to override cache and checks. # --without-x overrides everything else, but does not touch the cache. echo $ac_n "checking for X""... $ac_c" 1>&6 -echo "configure:9326: checking for X" >&5 +echo "configure:9369: checking for X" >&5 # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then @@ -9384,12 +9427,12 @@ if test "$ac_x_includes" = NO; then # First, try using that file with no special directory specified. cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9393: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9436: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -9458,14 +9501,14 @@ if test "$ac_x_libraries" = NO; then ac_save_LIBS="$LIBS" LIBS="-l$x_direct_test_library $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9512: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* LIBS="$ac_save_LIBS" # We can link X programs with no special library path. @@ -9571,17 +9614,17 @@ else case "`(uname -sr) 2>/dev/null`" in "SunOS 5"*) echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6 -echo "configure:9575: checking whether -R must be followed by a space" >&5 +echo "configure:9618: checking whether -R must be followed by a space" >&5 ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9628: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_nospace=yes else @@ -9597,14 +9640,14 @@ rm -f conftest* else LIBS="$ac_xsave_LIBS -R $x_libraries" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9651: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_space=yes else @@ -9636,7 +9679,7 @@ rm -f conftest* # libraries were built with DECnet support. And karl@cs.umb.edu says # the Alpha needs dnet_stub (dnet does not exist). echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6 -echo "configure:9640: checking for dnet_ntoa in -ldnet" >&5 +echo "configure:9683: checking for dnet_ntoa in -ldnet" >&5 ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -9644,7 +9687,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldnet $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9702: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -9677,7 +9720,7 @@ fi if test $ac_cv_lib_dnet_dnet_ntoa = no; then echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6 -echo "configure:9681: checking for dnet_ntoa in -ldnet_stub" >&5 +echo "configure:9724: checking for dnet_ntoa in -ldnet_stub" >&5 ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -9685,7 +9728,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldnet_stub $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9743: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -9725,12 +9768,12 @@ fi # The nsl library prevents programs from opening the X display # on Irix 5.2, according to dickey@clark.net. echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 -echo "configure:9729: checking for gethostbyname" >&5 +echo "configure:9772: checking for gethostbyname" >&5 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9800: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_gethostbyname=yes" else @@ -9774,7 +9817,7 @@ fi if test $ac_cv_func_gethostbyname = no; then echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:9778: checking for gethostbyname in -lnsl" >&5 +echo "configure:9821: checking for gethostbyname in -lnsl" >&5 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -9782,7 +9825,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9840: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -9823,12 +9866,12 @@ fi # -lsocket must be given before -lnsl if both are needed. # We assume that if connect needs -lnsl, so does gethostbyname. echo $ac_n "checking for connect""... $ac_c" 1>&6 -echo "configure:9827: checking for connect" >&5 +echo "configure:9870: checking for connect" >&5 if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9898: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_connect=yes" else @@ -9872,7 +9915,7 @@ fi if test $ac_cv_func_connect = no; then echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 -echo "configure:9876: checking for connect in -lsocket" >&5 +echo "configure:9919: checking for connect in -lsocket" >&5 ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -9880,7 +9923,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9938: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -9915,12 +9958,12 @@ fi # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX. echo $ac_n "checking for remove""... $ac_c" 1>&6 -echo "configure:9919: checking for remove" >&5 +echo "configure:9962: checking for remove" >&5 if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9990: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_remove=yes" else @@ -9964,7 +10007,7 @@ fi if test $ac_cv_func_remove = no; then echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 -echo "configure:9968: checking for remove in -lposix" >&5 +echo "configure:10011: checking for remove in -lposix" >&5 ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -9972,7 +10015,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lposix $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10030: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10007,12 +10050,12 @@ fi # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. echo $ac_n "checking for shmat""... $ac_c" 1>&6 -echo "configure:10011: checking for shmat" >&5 +echo "configure:10054: checking for shmat" >&5 if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10082: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_shmat=yes" else @@ -10056,7 +10099,7 @@ fi if test $ac_cv_func_shmat = no; then echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 -echo "configure:10060: checking for shmat in -lipc" >&5 +echo "configure:10103: checking for shmat in -lipc" >&5 ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -10064,7 +10107,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lipc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10122: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10108,7 +10151,7 @@ fi # libraries we check for below, so use a different variable. # --interran@uluru.Stanford.EDU, kb@cs.umb.edu. echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6 -echo "configure:10112: checking for IceConnectionNumber in -lICE" >&5 +echo "configure:10155: checking for IceConnectionNumber in -lICE" >&5 ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -10116,7 +10159,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lICE $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10174: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10168,7 +10211,7 @@ fi COMPILED_X_PROGRAM=0 echo $ac_n "checking for Motif/Lesstif headers""... $ac_c" 1>&6 -echo "configure:10172: checking for Motif/Lesstif headers" >&5 +echo "configure:10215: checking for Motif/Lesstif headers" >&5 ac_find_includes= for ac_dir in $SEARCH_INCLUDE; @@ -10183,7 +10226,7 @@ for ac_dir in $SEARCH_INCLUDE; echo "$ac_t""found $ac_find_includes" 1>&6 else cat > conftest.$ac_ext < @@ -10196,7 +10239,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:10200: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10243: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""found in default search path" 1>&6 @@ -10217,7 +10260,7 @@ rm -f conftest* if test "$COMPILED_X_PROGRAM" = 0; then echo $ac_n "checking for Motif/Lesstif library""... $ac_c" 1>&6 -echo "configure:10221: checking for Motif/Lesstif library" >&5 +echo "configure:10264: checking for Motif/Lesstif library" >&5 ac_find_libraries= for ac_dir in $SEARCH_LIB; @@ -10256,7 +10299,7 @@ for ac_dir in $SEARCH_LIB; echo "$ac_t""found at $ac_find_libraries" 1>&6 else cat > conftest.$ac_ext < @@ -10269,7 +10312,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:10273: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10316: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""found in default search path" 1>&6 @@ -10292,7 +10335,7 @@ rm -f conftest* XPM_LINK="" echo $ac_n "checking for Xpm library""... $ac_c" 1>&6 -echo "configure:10296: checking for Xpm library" >&5 +echo "configure:10339: checking for Xpm library" >&5 ac_find_libraries= for ac_dir in $SEARCH_LIB; @@ -10324,7 +10367,7 @@ EOF echo "$ac_t""found at $ac_find_libraries" 1>&6 else cat > conftest.$ac_ext < @@ -10337,7 +10380,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:10341: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10384: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* XPM_LINK="-lXpm " @@ -10467,7 +10510,7 @@ rm -f conftest* PORT_FILES="src/\$(TOOLKITDIR)/files.lst" if test "$wxUSE_UNIVERSAL" = "yes"; then - PORT_FILES="${PORT_FILES} \${top_srcdir}/src/univ/files.lst" + PORT_FILES="\${top_srcdir}/src/univ/files.lst ${PORT_FILES}" fi RPM_FILES="src/\$(TOOLKITDIR)/rpmfiles.lst" RPM_SPEC="wx\$(TOOLKIT).spec" @@ -10720,17 +10763,17 @@ for ac_hdr in strings.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:10724: checking for $ac_hdr" >&5 +echo "configure:10767: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10734: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10777: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -10760,17 +10803,17 @@ for ac_hdr in stdlib.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:10764: checking for $ac_hdr" >&5 +echo "configure:10807: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10774: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10817: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -10800,17 +10843,17 @@ for ac_hdr in unistd.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:10804: checking for $ac_hdr" >&5 +echo "configure:10847: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10814: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10857: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -10840,17 +10883,17 @@ for ac_hdr in wchar.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:10844: checking for $ac_hdr" >&5 +echo "configure:10887: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10854: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10897: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -10880,17 +10923,17 @@ for ac_hdr in wcstr.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:10884: checking for $ac_hdr" >&5 +echo "configure:10927: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10894: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10937: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -10920,17 +10963,17 @@ for ac_hdr in fnmatch.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:10924: checking for $ac_hdr" >&5 +echo "configure:10967: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10934: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10977: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -10960,17 +11003,17 @@ for ac_hdr in iconv.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:10964: checking for $ac_hdr" >&5 +echo "configure:11007: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10974: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11017: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -11000,17 +11043,17 @@ for ac_hdr in langinfo.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:11004: checking for $ac_hdr" >&5 +echo "configure:11047: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11014: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11057: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -11043,17 +11086,17 @@ if test "$wxUSE_GUI" = "yes"; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:11047: checking for $ac_hdr" >&5 +echo "configure:11090: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11057: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11100: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -11084,12 +11127,12 @@ fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:11088: checking for ANSI C header files" >&5 +echo "configure:11131: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -11097,7 +11140,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11101: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11144: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -11114,7 +11157,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -11132,7 +11175,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -11153,7 +11196,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -11164,7 +11207,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:11168: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:11211: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -11188,12 +11231,12 @@ EOF fi echo $ac_n "checking for mode_t""... $ac_c" 1>&6 -echo "configure:11192: checking for mode_t" >&5 +echo "configure:11235: checking for mode_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -11221,12 +11264,12 @@ EOF fi echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:11225: checking for off_t" >&5 +echo "configure:11268: checking for off_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -11254,12 +11297,12 @@ EOF fi echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:11258: checking for pid_t" >&5 +echo "configure:11301: checking for pid_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -11287,12 +11330,12 @@ EOF fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:11291: checking for size_t" >&5 +echo "configure:11334: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -11320,12 +11363,12 @@ EOF fi echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:11324: checking for uid_t in sys/types.h" >&5 +echo "configure:11367: checking for uid_t in sys/types.h" >&5 if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF @@ -11355,13 +11398,13 @@ fi echo $ac_n "checking for wchar_t""... $ac_c" 1>&6 -echo "configure:11359: checking for wchar_t" >&5 +echo "configure:11402: checking for wchar_t" >&5 if eval "test \"`echo '$''{'wx_cv_type_wchar_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { @@ -11372,7 +11415,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:11376: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11419: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_type_wchar_t=yes else @@ -11380,7 +11423,7 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext < int main() { @@ -11391,7 +11434,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:11395: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11438: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_type_wchar_t=yes else @@ -11425,12 +11468,12 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking if size_t is unsigned int""... $ac_c" 1>&6 -echo "configure:11429: checking if size_t is unsigned int" >&5 +echo "configure:11472: checking if size_t is unsigned int" >&5 if eval "test \"`echo '$''{'wx_cv_size_t_is_uint'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { @@ -11443,7 +11486,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:11447: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11490: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_size_t_is_uint=no else @@ -11466,12 +11509,12 @@ EOF else echo $ac_n "checking if size_t is unsigned long""... $ac_c" 1>&6 -echo "configure:11470: checking if size_t is unsigned long" >&5 +echo "configure:11513: checking if size_t is unsigned long" >&5 if eval "test \"`echo '$''{'wx_cv_size_t_is_ulong'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { @@ -11484,7 +11527,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:11488: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11531: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_size_t_is_ulong=no else @@ -11518,13 +11561,13 @@ cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking for pw_gecos in struct passwd""... $ac_c" 1>&6 -echo "configure:11522: checking for pw_gecos in struct passwd" >&5 +echo "configure:11565: checking for pw_gecos in struct passwd" >&5 if eval "test \"`echo '$''{'wx_cv_struct_pw_gecos'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { @@ -11535,7 +11578,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:11539: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11582: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_struct_pw_gecos=yes @@ -11565,12 +11608,12 @@ fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:11569: checking for working const" >&5 +echo "configure:11612: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11666: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -11640,21 +11683,21 @@ EOF fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:11644: checking for inline" >&5 +echo "configure:11687: checking for inline" >&5 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11701: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -11681,7 +11724,7 @@ esac echo $ac_n "checking size of char""... $ac_c" 1>&6 -echo "configure:11685: checking size of char" >&5 +echo "configure:11728: checking size of char" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_char'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -11689,7 +11732,7 @@ else ac_cv_sizeof_char=1 else cat > conftest.$ac_ext < main() @@ -11700,7 +11743,7 @@ main() exit(0); } EOF -if { (eval echo configure:11704: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:11747: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_char=`cat conftestval` else @@ -11720,7 +11763,7 @@ EOF echo $ac_n "checking size of short""... $ac_c" 1>&6 -echo "configure:11724: checking size of short" >&5 +echo "configure:11767: checking size of short" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -11728,7 +11771,7 @@ else ac_cv_sizeof_short=2 else cat > conftest.$ac_ext < main() @@ -11739,7 +11782,7 @@ main() exit(0); } EOF -if { (eval echo configure:11743: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:11786: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_short=`cat conftestval` else @@ -11759,7 +11802,7 @@ EOF echo $ac_n "checking size of int *""... $ac_c" 1>&6 -echo "configure:11763: checking size of int *" >&5 +echo "configure:11806: checking size of int *" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_int_p'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -11767,7 +11810,7 @@ else ac_cv_sizeof_int_p=4 else cat > conftest.$ac_ext < main() @@ -11778,7 +11821,7 @@ main() exit(0); } EOF -if { (eval echo configure:11782: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:11825: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_int_p=`cat conftestval` else @@ -11798,7 +11841,7 @@ EOF echo $ac_n "checking size of int""... $ac_c" 1>&6 -echo "configure:11802: checking size of int" >&5 +echo "configure:11845: checking size of int" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -11806,7 +11849,7 @@ else ac_cv_sizeof_int=4 else cat > conftest.$ac_ext < main() @@ -11817,7 +11860,7 @@ main() exit(0); } EOF -if { (eval echo configure:11821: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:11864: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_int=`cat conftestval` else @@ -11837,7 +11880,7 @@ EOF echo $ac_n "checking size of long""... $ac_c" 1>&6 -echo "configure:11841: checking size of long" >&5 +echo "configure:11884: checking size of long" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -11845,7 +11888,7 @@ else ac_cv_sizeof_long=4 else cat > conftest.$ac_ext < main() @@ -11856,7 +11899,7 @@ main() exit(0); } EOF -if { (eval echo configure:11860: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:11903: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_long=`cat conftestval` else @@ -11876,7 +11919,7 @@ EOF echo $ac_n "checking size of long long""... $ac_c" 1>&6 -echo "configure:11880: checking size of long long" >&5 +echo "configure:11923: checking size of long long" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -11884,7 +11927,7 @@ else ac_cv_sizeof_long_long=0 else cat > conftest.$ac_ext < main() @@ -11895,7 +11938,7 @@ main() exit(0); } EOF -if { (eval echo configure:11899: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:11942: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_long_long=`cat conftestval` else @@ -11916,7 +11959,7 @@ EOF echo $ac_n "checking size of wchar_t""... $ac_c" 1>&6 -echo "configure:11920: checking size of wchar_t" >&5 +echo "configure:11963: checking size of wchar_t" >&5 if eval "test \"`echo '$''{'wx_cv_sizeof_wchar_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -11926,7 +11969,7 @@ else else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:11992: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then wx_cv_sizeof_wchar_t=`cat conftestval` else @@ -11968,14 +12011,14 @@ EOF echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 -echo "configure:11972: checking whether byte ordering is bigendian" >&5 +echo "configure:12015: checking whether byte ordering is bigendian" >&5 if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_bigendian=unknown # See if sys/param.h defines the BYTE_ORDER macro. cat > conftest.$ac_ext < #include @@ -11986,11 +12029,11 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:11990: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12033: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* # It does; now see whether it defined to BIG_ENDIAN or not. cat > conftest.$ac_ext < #include @@ -12001,7 +12044,7 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:12005: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12048: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_bigendian=yes else @@ -12021,7 +12064,7 @@ if test "$cross_compiling" = yes; then ac_cv_c_bigendian=unknown else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:12081: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_bigendian=no else @@ -12081,17 +12124,17 @@ cross_compiling=$ac_cv_prog_cxx_cross do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:12085: checking for $ac_hdr" >&5 +echo "configure:12128: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12095: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12138: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -12139,7 +12182,7 @@ cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking if C++ compiler supports bool""... $ac_c" 1>&6 -echo "configure:12143: checking if C++ compiler supports bool" >&5 +echo "configure:12186: checking if C++ compiler supports bool" >&5 if eval "test \"`echo '$''{'wx_cv_cpp_bool'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -12154,7 +12197,7 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12213: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_cpp_bool=yes @@ -12204,7 +12247,7 @@ EOF echo $ac_n "checking for wcslen in -lc""... $ac_c" 1>&6 -echo "configure:12208: checking for wcslen in -lc" >&5 +echo "configure:12251: checking for wcslen in -lc" >&5 ac_lib_var=`echo c'_'wcslen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -12212,7 +12255,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12270: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -12249,7 +12292,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for wcslen in -lw""... $ac_c" 1>&6 -echo "configure:12253: checking for wcslen in -lw" >&5 +echo "configure:12296: checking for wcslen in -lw" >&5 ac_lib_var=`echo w'_'wcslen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -12257,7 +12300,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lw $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12315: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -12299,12 +12342,12 @@ fi echo $ac_n "checking for vprintf""... $ac_c" 1>&6 -echo "configure:12303: checking for vprintf" >&5 +echo "configure:12346: checking for vprintf" >&5 if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12374: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_vprintf=yes" else @@ -12351,12 +12394,12 @@ fi if test "$ac_cv_func_vprintf" != yes; then echo $ac_n "checking for _doprnt""... $ac_c" 1>&6 -echo "configure:12355: checking for _doprnt" >&5 +echo "configure:12398: checking for _doprnt" >&5 if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12426: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func__doprnt=yes" else @@ -12410,13 +12453,13 @@ fi echo $ac_n "checking for vsnprintf""... $ac_c" 1>&6 -echo "configure:12414: checking for vsnprintf" >&5 +echo "configure:12457: checking for vsnprintf" >&5 if eval "test \"`echo '$''{'wx_cv_func_vsnprintf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -12441,7 +12484,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:12445: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12488: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_func_vsnprintf=yes @@ -12452,7 +12495,7 @@ else rm -rf conftest* cat > conftest.$ac_ext < @@ -12477,7 +12520,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:12481: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12524: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_func_vsnprintf=yes @@ -12509,13 +12552,13 @@ else fi echo $ac_n "checking for vsscanf""... $ac_c" 1>&6 -echo "configure:12513: checking for vsscanf" >&5 +echo "configure:12556: checking for vsscanf" >&5 if eval "test \"`echo '$''{'wx_cv_func_vsscanf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -12538,7 +12581,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:12542: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12585: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_func_vsscanf=yes @@ -12576,13 +12619,13 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking if iconv() takes char**""... $ac_c" 1>&6 -echo "configure:12580: checking if iconv() takes char**" >&5 +echo "configure:12623: checking if iconv() takes char**" >&5 if eval "test \"`echo '$''{'wx_cv_iconv_takes_char'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { @@ -12594,7 +12637,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:12598: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12641: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_iconv_takes_char=yes else @@ -12627,12 +12670,12 @@ if test "$wxUSE_ON_FATAL_EXCEPTION" = "yes" -a "$wxUSE_UNIX" = "yes"; then for ac_func in sigaction do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:12631: checking for $ac_func" >&5 +echo "configure:12674: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12702: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -12696,13 +12739,13 @@ cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking for sa_handler type""... $ac_c" 1>&6 -echo "configure:12700: checking for sa_handler type" >&5 +echo "configure:12743: checking for sa_handler type" >&5 if eval "test \"`echo '$''{'wx_cv_type_sa_handler'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { @@ -12714,7 +12757,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:12718: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12761: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_type_sa_handler=int @@ -12751,12 +12794,12 @@ fi for ac_func in vfork do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:12755: checking for $ac_func" >&5 +echo "configure:12798: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12826: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -12808,12 +12851,12 @@ if test "$wxUSE_SNGLINST_CHECKER" = "yes"; then for ac_func in fcntl flock do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:12812: checking for $ac_func" >&5 +echo "configure:12855: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12883: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -12870,12 +12913,12 @@ fi for ac_func in timegm do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:12874: checking for $ac_func" >&5 +echo "configure:12917: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12945: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -12926,12 +12969,12 @@ done for ac_func in putenv setenv do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:12930: checking for $ac_func" >&5 +echo "configure:12973: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13001: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -13001,12 +13044,12 @@ if test "$HAVE_SOME_SLEEP_FUNC" != 1; then for ac_func in nanosleep do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:13005: checking for $ac_func" >&5 +echo "configure:13048: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13076: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -13054,7 +13097,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for nanosleep in -lposix4""... $ac_c" 1>&6 -echo "configure:13058: checking for nanosleep in -lposix4" >&5 +echo "configure:13101: checking for nanosleep in -lposix4" >&5 ac_lib_var=`echo posix4'_'nanosleep | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -13062,7 +13105,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lposix4 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13120: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -13101,12 +13144,12 @@ else for ac_func in usleep do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:13105: checking for $ac_func" >&5 +echo "configure:13148: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13176: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -13172,12 +13215,12 @@ fi for ac_func in uname gethostname do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:13176: checking for $ac_func" >&5 +echo "configure:13219: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13247: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -13237,12 +13280,12 @@ cross_compiling=$ac_cv_prog_cxx_cross for ac_func in strtok_r do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:13241: checking for $ac_func" >&5 +echo "configure:13284: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13315: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -13305,12 +13348,12 @@ INET_LINK= for ac_func in inet_addr do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:13309: checking for $ac_func" >&5 +echo "configure:13352: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13380: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -13358,7 +13401,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for inet_addr in -lnsl""... $ac_c" 1>&6 -echo "configure:13362: checking for inet_addr in -lnsl" >&5 +echo "configure:13405: checking for inet_addr in -lnsl" >&5 ac_lib_var=`echo nsl'_'inet_addr | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -13366,7 +13409,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13424: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -13396,7 +13439,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for inet_addr in -lresolv""... $ac_c" 1>&6 -echo "configure:13400: checking for inet_addr in -lresolv" >&5 +echo "configure:13443: checking for inet_addr in -lresolv" >&5 ac_lib_var=`echo resolv'_'inet_addr | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -13404,7 +13447,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lresolv $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13462: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -13448,12 +13491,12 @@ done for ac_func in inet_aton do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:13452: checking for $ac_func" >&5 +echo "configure:13495: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13523: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -13501,7 +13544,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for inet_aton in -l$INET_LINK""... $ac_c" 1>&6 -echo "configure:13505: checking for inet_aton in -l$INET_LINK" >&5 +echo "configure:13548: checking for inet_aton in -l$INET_LINK" >&5 ac_lib_var=`echo $INET_LINK'_'inet_aton | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -13509,7 +13552,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$INET_LINK $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13567: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -13633,7 +13676,7 @@ if test "$wxUSE_THREADS" = "yes" ; then fi echo $ac_n "checking for pthread_create in -l$THREADS_LIB""... $ac_c" 1>&6 -echo "configure:13637: checking for pthread_create in -l$THREADS_LIB" >&5 +echo "configure:13680: checking for pthread_create in -l$THREADS_LIB" >&5 ac_lib_var=`echo $THREADS_LIB'_'pthread_create | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -13641,7 +13684,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$THREADS_LIB $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13699: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -13675,7 +13718,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6 -echo "configure:13679: checking for pthread_create in -lc_r" >&5 +echo "configure:13722: checking for pthread_create in -lc_r" >&5 ac_lib_var=`echo c_r'_'pthread_create | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -13683,7 +13726,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lc_r $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13741: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -13718,17 +13761,17 @@ else ac_safe=`echo "sys/prctl.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for sys/prctl.h""... $ac_c" 1>&6 -echo "configure:13722: checking for sys/prctl.h" >&5 +echo "configure:13765: checking for sys/prctl.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:13732: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13775: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -13768,12 +13811,12 @@ if test "$wxUSE_THREADS" = "yes" ; then for ac_func in thr_setconcurrency do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:13772: checking for $ac_func" >&5 +echo "configure:13815: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13843: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -13826,17 +13869,17 @@ done do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:13830: checking for $ac_hdr" >&5 +echo "configure:13873: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:13840: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13883: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -13864,7 +13907,7 @@ done echo $ac_n "checking for sched_yield in -l$THREADS_LINK""... $ac_c" 1>&6 -echo "configure:13868: checking for sched_yield in -l$THREADS_LINK" >&5 +echo "configure:13911: checking for sched_yield in -l$THREADS_LINK" >&5 ac_lib_var=`echo $THREADS_LINK'_'sched_yield | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -13872,7 +13915,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$THREADS_LINK $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13930: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -13905,7 +13948,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for sched_yield in -lposix4""... $ac_c" 1>&6 -echo "configure:13909: checking for sched_yield in -lposix4" >&5 +echo "configure:13952: checking for sched_yield in -lposix4" >&5 ac_lib_var=`echo posix4'_'sched_yield | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -13913,7 +13956,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lposix4 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13971: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -13955,7 +13998,7 @@ fi HAVE_PRIOR_FUNCS=0 echo $ac_n "checking for pthread_attr_getschedpolicy in -l$THREADS_LINK""... $ac_c" 1>&6 -echo "configure:13959: checking for pthread_attr_getschedpolicy in -l$THREADS_LINK" >&5 +echo "configure:14002: checking for pthread_attr_getschedpolicy in -l$THREADS_LINK" >&5 ac_lib_var=`echo $THREADS_LINK'_'pthread_attr_getschedpolicy | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -13963,7 +14006,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$THREADS_LINK $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14021: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -13990,7 +14033,7 @@ fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for pthread_attr_setschedparam in -l$THREADS_LINK""... $ac_c" 1>&6 -echo "configure:13994: checking for pthread_attr_setschedparam in -l$THREADS_LINK" >&5 +echo "configure:14037: checking for pthread_attr_setschedparam in -l$THREADS_LINK" >&5 ac_lib_var=`echo $THREADS_LINK'_'pthread_attr_setschedparam | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -13998,7 +14041,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$THREADS_LINK $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14056: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -14025,7 +14068,7 @@ fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for sched_get_priority_max in -l$THREADS_LINK""... $ac_c" 1>&6 -echo "configure:14029: checking for sched_get_priority_max in -l$THREADS_LINK" >&5 +echo "configure:14072: checking for sched_get_priority_max in -l$THREADS_LINK" >&5 ac_lib_var=`echo $THREADS_LINK'_'sched_get_priority_max | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -14033,7 +14076,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$THREADS_LINK $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14091: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -14063,7 +14106,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for sched_get_priority_max in -lposix4""... $ac_c" 1>&6 -echo "configure:14067: checking for sched_get_priority_max in -lposix4" >&5 +echo "configure:14110: checking for sched_get_priority_max in -lposix4" >&5 ac_lib_var=`echo posix4'_'sched_get_priority_max | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -14071,7 +14114,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lposix4 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14129: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -14129,7 +14172,7 @@ EOF fi echo $ac_n "checking for pthread_cancel in -l$THREADS_LINK""... $ac_c" 1>&6 -echo "configure:14133: checking for pthread_cancel in -l$THREADS_LINK" >&5 +echo "configure:14176: checking for pthread_cancel in -l$THREADS_LINK" >&5 ac_lib_var=`echo $THREADS_LINK'_'pthread_cancel | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -14137,7 +14180,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$THREADS_LINK $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14195: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -14174,13 +14217,13 @@ fi echo $ac_n "checking for pthread_cleanup_push/pop""... $ac_c" 1>&6 -echo "configure:14178: checking for pthread_cleanup_push/pop" >&5 +echo "configure:14221: checking for pthread_cleanup_push/pop" >&5 if eval "test \"`echo '$''{'wx_cv_func_pthread_cleanup_push'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { @@ -14190,7 +14233,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:14194: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:14237: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_func_pthread_cleanup_push=yes @@ -14218,13 +14261,13 @@ EOF echo $ac_n "checking for pthread_mutexattr_t""... $ac_c" 1>&6 -echo "configure:14222: checking for pthread_mutexattr_t" >&5 +echo "configure:14265: checking for pthread_mutexattr_t" >&5 if eval "test \"`echo '$''{'wx_cv_type_pthread_mutexattr_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { @@ -14234,7 +14277,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:14238: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:14281: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_type_pthread_mutexattr_t=yes @@ -14261,13 +14304,13 @@ EOF else echo $ac_n "checking for PTHREAD_RECURSIVE_MUTEX_INITIALIZER""... $ac_c" 1>&6 -echo "configure:14265: checking for PTHREAD_RECURSIVE_MUTEX_INITIALIZER" >&5 +echo "configure:14308: checking for PTHREAD_RECURSIVE_MUTEX_INITIALIZER" >&5 if eval "test \"`echo '$''{'wx_cv_type_pthread_rec_mutex_init'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { @@ -14276,7 +14319,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:14280: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:14323: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_type_pthread_rec_mutex_init=yes @@ -14331,7 +14374,7 @@ EOF else if test "$ac_cv_func_strtok_r" = "yes"; then echo $ac_n "checking if -D_REENTRANT is needed""... $ac_c" 1>&6 -echo "configure:14335: checking if -D_REENTRANT is needed" >&5 +echo "configure:14378: checking if -D_REENTRANT is needed" >&5 if test "$NEEDS_D_REENTRANT_FOR_R_FUNCS" = 1; then CFLAGS="${CFLAGS} -D_REENTRANT" CXXFLAGS="${CXXFLAGS} -D_REENTRANT" @@ -14375,7 +14418,7 @@ if test "$wxUSE_MAC" = 1 ; then # Extract the first word of "Rez", so it can be a program name with args. set dummy Rez; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:14379: checking for $ac_word" >&5 +echo "configure:14422: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_REZ'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -14405,7 +14448,7 @@ fi # Extract the first word of "Derez", so it can be a program name with args. set dummy Derez; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:14409: checking for $ac_word" >&5 +echo "configure:14452: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_DEREZ'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -14558,17 +14601,17 @@ EOF ZLIB_LINK= ac_safe=`echo "zlib.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for zlib.h""... $ac_c" 1>&6 -echo "configure:14562: checking for zlib.h" >&5 +echo "configure:14605: checking for zlib.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:14572: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14615: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -14585,7 +14628,7 @@ fi if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for deflate in -lz""... $ac_c" 1>&6 -echo "configure:14589: checking for deflate in -lz" >&5 +echo "configure:14632: checking for deflate in -lz" >&5 ac_lib_var=`echo z'_'deflate | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -14593,7 +14636,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lz $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14651: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -14651,17 +14694,17 @@ EOF PNG_LINK= ac_safe=`echo "png.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for png.h""... $ac_c" 1>&6 -echo "configure:14655: checking for png.h" >&5 +echo "configure:14698: checking for png.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:14665: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14708: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -14678,7 +14721,7 @@ fi if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for png_check_sig in -lpng""... $ac_c" 1>&6 -echo "configure:14682: checking for png_check_sig in -lpng" >&5 +echo "configure:14725: checking for png_check_sig in -lpng" >&5 ac_lib_var=`echo png'_'png_check_sig | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -14686,7 +14729,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpng -lz -lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14744: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -14741,12 +14784,12 @@ EOF else JPEG_LINK= echo $ac_n "checking for jpeglib.h""... $ac_c" 1>&6 -echo "configure:14745: checking for jpeglib.h" >&5 +echo "configure:14788: checking for jpeglib.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_jpeglib_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:14805: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_jpeglib_h=yes else @@ -14776,7 +14819,7 @@ fi if test "$ac_cv_header_jpeglib_h" = "yes"; then echo $ac_n "checking for jpeg_read_header in -ljpeg""... $ac_c" 1>&6 -echo "configure:14780: checking for jpeg_read_header in -ljpeg" >&5 +echo "configure:14823: checking for jpeg_read_header in -ljpeg" >&5 ac_lib_var=`echo jpeg'_'jpeg_read_header | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -14784,7 +14827,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ljpeg $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14842: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -14835,17 +14878,17 @@ EOF TIFF_LINK= ac_safe=`echo "tiffio.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for tiffio.h""... $ac_c" 1>&6 -echo "configure:14839: checking for tiffio.h" >&5 +echo "configure:14882: checking for tiffio.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:14849: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14892: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -14862,7 +14905,7 @@ fi if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for TIFFError in -ltiff""... $ac_c" 1>&6 -echo "configure:14866: checking for TIFFError in -ltiff" >&5 +echo "configure:14909: checking for TIFFError in -ltiff" >&5 ac_lib_var=`echo tiff'_'TIFFError | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -14870,7 +14913,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ltiff -lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14928: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -14923,17 +14966,17 @@ EOF FREETYPE_LINK= ac_safe=`echo "freetype.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for freetype.h""... $ac_c" 1>&6 -echo "configure:14927: checking for freetype.h" >&5 +echo "configure:14970: checking for freetype.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:14937: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14980: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -14950,7 +14993,7 @@ fi if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for FT_Render_Glyph in -lfreetype""... $ac_c" 1>&6 -echo "configure:14954: checking for FT_Render_Glyph in -lfreetype" >&5 +echo "configure:14997: checking for FT_Render_Glyph in -lfreetype" >&5 ac_lib_var=`echo freetype'_'FT_Render_Glyph | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -14958,7 +15001,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lfreetype -lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15016: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -15003,17 +15046,17 @@ fi if test "$wxUSE_OPENGL" = "yes"; then ac_safe=`echo "GL/gl.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for GL/gl.h""... $ac_c" 1>&6 -echo "configure:15007: checking for GL/gl.h" >&5 +echo "configure:15050: checking for GL/gl.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:15017: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:15060: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -15039,7 +15082,7 @@ EOF EOF echo $ac_n "checking for glFlush in -lGL""... $ac_c" 1>&6 -echo "configure:15043: checking for glFlush in -lGL" >&5 +echo "configure:15086: checking for glFlush in -lGL" >&5 ac_lib_var=`echo GL'_'glFlush | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -15047,7 +15090,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lGL $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15105: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -15080,7 +15123,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for glFlush in -lMesaGL""... $ac_c" 1>&6 -echo "configure:15084: checking for glFlush in -lMesaGL" >&5 +echo "configure:15127: checking for glFlush in -lMesaGL" >&5 ac_lib_var=`echo MesaGL'_'glFlush | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -15088,7 +15131,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lMesaGL $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15146: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -15365,12 +15408,12 @@ if test "$wxUSE_DATETIME" = "yes"; then for ac_func in strptime do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:15369: checking for $ac_func" >&5 +echo "configure:15412: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15440: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -15419,13 +15462,13 @@ done echo $ac_n "checking for timezone variable in ""... $ac_c" 1>&6 -echo "configure:15423: checking for timezone variable in " >&5 +echo "configure:15466: checking for timezone variable in " >&5 if eval "test \"`echo '$''{'wx_cv_var_timezone'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -15437,7 +15480,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:15441: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:15484: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_var_timezone=__timezone @@ -15448,7 +15491,7 @@ else rm -rf conftest* cat > conftest.$ac_ext < @@ -15460,7 +15503,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:15464: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:15507: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_var_timezone=_timezone @@ -15471,7 +15514,7 @@ else rm -rf conftest* cat > conftest.$ac_ext < @@ -15483,7 +15526,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:15487: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:15530: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_var_timezone=timezone @@ -15518,12 +15561,12 @@ EOF for ac_func in localtime do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:15522: checking for $ac_func" >&5 +echo "configure:15565: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15593: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -15573,13 +15616,13 @@ done if test "$ac_cv_func_localtime" = "yes"; then echo $ac_n "checking for tm_gmtoff in struct tm""... $ac_c" 1>&6 -echo "configure:15577: checking for tm_gmtoff in struct tm" >&5 +echo "configure:15620: checking for tm_gmtoff in struct tm" >&5 if eval "test \"`echo '$''{'wx_cv_struct_tm_has_gmtoff'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -15591,7 +15634,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:15595: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:15638: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_struct_tm_has_gmtoff=yes @@ -15620,12 +15663,12 @@ EOF for ac_func in gettimeofday ftime do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:15624: checking for $ac_func" >&5 +echo "configure:15667: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15695: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -15675,7 +15718,7 @@ done if test "$ac_cv_func_gettimeofday" = "yes"; then echo $ac_n "checking whether gettimeofday takes two arguments""... $ac_c" 1>&6 -echo "configure:15679: checking whether gettimeofday takes two arguments" >&5 +echo "configure:15722: checking whether gettimeofday takes two arguments" >&5 if eval "test \"`echo '$''{'wx_cv_func_gettimeofday_has_2_args'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -15690,7 +15733,7 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext < @@ -15704,7 +15747,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:15708: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:15751: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_func_gettimeofday_has_2_args=yes else @@ -15712,7 +15755,7 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext < @@ -15725,7 +15768,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:15729: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:15772: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_func_gettimeofday_has_2_args=no else @@ -15771,12 +15814,12 @@ if test "$TOOLKIT" != "MSW"; then if test "$wxUSE_SOCKETS" = "yes"; then echo $ac_n "checking for socket""... $ac_c" 1>&6 -echo "configure:15775: checking for socket" >&5 +echo "configure:15818: checking for socket" >&5 if eval "test \"`echo '$''{'ac_cv_func_socket'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15846: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_socket=yes" else @@ -15817,7 +15860,7 @@ if eval "test \"`echo '$ac_cv_func_'socket`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 -echo "configure:15821: checking for socket in -lsocket" >&5 +echo "configure:15864: checking for socket in -lsocket" >&5 ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -15825,7 +15868,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15883: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -15869,7 +15912,7 @@ fi if test "$wxUSE_SOCKETS" = "yes" ; then echo $ac_n "checking what is the type of the third argument of getsockname""... $ac_c" 1>&6 -echo "configure:15873: checking what is the type of the third argument of getsockname" >&5 +echo "configure:15916: checking what is the type of the third argument of getsockname" >&5 if eval "test \"`echo '$''{'wx_cv_type_getsockname3'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -15884,7 +15927,7 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext < @@ -15897,7 +15940,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:15901: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:15944: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_type_getsockname3=socklen_t else @@ -15905,7 +15948,7 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext < @@ -15918,7 +15961,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:15922: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:15965: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_type_getsockname3=size_t else @@ -15926,7 +15969,7 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext < @@ -15939,7 +15982,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:15943: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:15986: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_type_getsockname3=int else @@ -16001,17 +16044,17 @@ if test "$wxUSE_JOYSTICK" = "yes"; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:16005: checking for $ac_hdr" >&5 +echo "configure:16048: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:16015: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:16058: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -16067,12 +16110,12 @@ if test "$wxUSE_DYNLIB_CLASS" = "yes"; then for ac_func in dlopen do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:16071: checking for $ac_func" >&5 +echo "configure:16114: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16142: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -16123,7 +16166,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:16127: checking for dlopen in -ldl" >&5 +echo "configure:16170: checking for dlopen in -ldl" >&5 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -16131,7 +16174,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16189: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -16171,12 +16214,12 @@ else for ac_func in shl_load do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:16175: checking for $ac_func" >&5 +echo "configure:16218: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16246: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -16227,7 +16270,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dld in -lshl_load""... $ac_c" 1>&6 -echo "configure:16231: checking for dld in -lshl_load" >&5 +echo "configure:16274: checking for dld in -lshl_load" >&5 ac_lib_var=`echo shl_load'_'dld | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -16235,7 +16278,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lshl_load $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16293: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -16285,12 +16328,12 @@ done for ac_func in dlerror do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:16289: checking for $ac_func" >&5 +echo "configure:16332: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16360: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -16338,7 +16381,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dlerror in -ldl""... $ac_c" 1>&6 -echo "configure:16342: checking for dlerror in -ldl" >&5 +echo "configure:16385: checking for dlerror in -ldl" >&5 ac_lib_var=`echo dl'_'dlerror | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -16346,7 +16389,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16404: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -16510,6 +16553,13 @@ if test "$wxUSE_HELP" = "yes"; then EOF SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS help" + + if test "$wxUSE_WXHTML_HELP" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_WXHTML_HELP 1 +EOF + + fi fi if test "$wxUSE_PRINTING_ARCHITECTURE" = "yes" ; then @@ -16532,15 +16582,11 @@ EOF fi if test "$wxUSE_RESOURCES" = "yes" ; then - if test "$wxUSE_PROLOGIO" = "yes" ; then - cat >> confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define wxUSE_RESOURCES 1 EOF - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS resource" - else - echo "configure: warning: wxWindows ressource system requires PrologIO and can't be compiled without it." 1>&2 - fi + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS resource" fi if test "$wxUSE_X_RESOURCES" = "yes"; then @@ -16597,17 +16643,17 @@ if test "$wxUSE_DRAG_AND_DROP" = "yes" ; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:16601: checking for $ac_hdr" >&5 +echo "configure:16647: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:16611: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:16657: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -17372,7 +17418,7 @@ SAMPLES_SUBDIRS="`echo $SAMPLES_SUBDIRS | tr -s ' ' | tr ' ' '\n' | sort | uniq echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:17376: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:17422: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 diff --git a/configure.in b/configure.in index 51dbfdf4dc..f76c5607b2 100644 --- a/configure.in +++ b/configure.in @@ -686,6 +686,7 @@ if test $DEBUG_CONFIGURE = 1; then DEFAULT_wxUSE_CONSTRAINTS=no DEFAULT_wxUSE_IPC=no DEFAULT_wxUSE_HELP=no + DEFAULT_wxUSE_WXHTML_HELP=no DEFAULT_wxUSE_WXTREE=no DEFAULT_wxUSE_METAFILE=no DEFAULT_wxUSE_MIMETYPE=no @@ -837,6 +838,7 @@ else DEFAULT_wxUSE_CONSTRAINTS=yes DEFAULT_wxUSE_IPC=yes DEFAULT_wxUSE_HELP=yes + DEFAULT_wxUSE_WXHTML_HELP=yes DEFAULT_wxUSE_WXTREE=yes DEFAULT_wxUSE_METAFILE=yes DEFAULT_wxUSE_MIMETYPE=yes @@ -1059,7 +1061,9 @@ dnl "big" GUI options dnl --------------------------------------------------------------------------- WX_ARG_ENABLE(docview, [ --enable-docview use document view architecture], wxUSE_DOC_VIEW_ARCHITECTURE) -WX_ARG_ENABLE(help, [ --enable-help use help (using external browser at present)], wxUSE_HELP) +WX_ARG_ENABLE(help, [ --enable-help use help subsystem], wxUSE_HELP) +WX_ARG_ENABLE(html, [ --enable-html use wxHTML sub-library], wxUSE_HTML) +WX_ARG_ENABLE(htmlhelp, [ --enable-htmlhelp use wxHTML-based help], wxUSE_WXHTML_HELP) WX_ARG_ENABLE(constraints, [ --enable-constraints use layout-constraints system], wxUSE_CONSTRAINTS) WX_ARG_ENABLE(printarch, [ --enable-printarch use printing architecture], wxUSE_PRINTING_ARCHITECTURE) WX_ARG_ENABLE(mdi, [ --enable-mdi use multiple document interface architecture], wxUSE_MDI_ARCHITECTURE) @@ -1238,7 +1242,6 @@ dnl --------------------------------------------------------------------------- WX_ARG_ENABLE(menus, [ --enable-menus use wxMenu/wxMenuBar/wxMenuItem classes], wxUSE_MENUS) WX_ARG_ENABLE(miniframe, [ --enable-miniframe use wxMiniFrame class], wxUSE_MINIFRAME) -WX_ARG_ENABLE(html, [ --enable-html use wxHTML sub-library], wxUSE_HTML) WX_ARG_ENABLE(tooltips, [ --enable-tooltips use wxToolTip class], wxUSE_TOOLTIPS) WX_ARG_ENABLE(splines, [ --enable-splines use spline drawing code], wxUSE_SPLINES) WX_ARG_ENABLE(validators, [ --enable-validators use wxValidator and derived classes], wxUSE_VALIDATORS) @@ -2055,7 +2058,8 @@ equivalent variable and GTK+ is version 1.2.3 or above. dnl misc other files depending on the port PORT_FILES="src/\$(TOOLKITDIR)/files.lst" if test "$wxUSE_UNIVERSAL" = "yes"; then - PORT_FILES="${PORT_FILES} \${top_srcdir}/src/univ/files.lst" + dnl put univ files first! + PORT_FILES="\${top_srcdir}/src/univ/files.lst ${PORT_FILES}" fi RPM_FILES="src/\$(TOOLKITDIR)/rpmfiles.lst" RPM_SPEC="wx\$(TOOLKIT).spec" @@ -3859,6 +3863,10 @@ fi if test "$wxUSE_HELP" = "yes"; then AC_DEFINE(wxUSE_HELP) SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS help" + + if test "$wxUSE_WXHTML_HELP" = "yes"; then + AC_DEFINE(wxUSE_WXHTML_HELP) + fi fi if test "$wxUSE_PRINTING_ARCHITECTURE" = "yes" ; then @@ -3875,12 +3883,8 @@ if test "$wxUSE_PROLOGIO" = "yes" ; then fi if test "$wxUSE_RESOURCES" = "yes" ; then - if test "$wxUSE_PROLOGIO" = "yes" ; then - AC_DEFINE(wxUSE_RESOURCES) - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS resource" - else - AC_MSG_WARN([wxWindows ressource system requires PrologIO and can't be compiled without it.]) - fi + AC_DEFINE(wxUSE_RESOURCES) + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS resource" fi if test "$wxUSE_X_RESOURCES" = "yes"; then diff --git a/distrib/msw/tmake/filelist.txt b/distrib/msw/tmake/filelist.txt index b6a2809130..5bedda5d7f 100644 --- a/distrib/msw/tmake/filelist.txt +++ b/distrib/msw/tmake/filelist.txt @@ -96,7 +96,8 @@ prop.cpp G propform.cpp G proplist.cpp G sashwin.cpp G -scrolwin.cpp G R +scrlwing.cpp G +spinctlg.cpp G splash.cpp G splitter.cpp G statline.cpp G U,R,P @@ -152,6 +153,7 @@ fs_inet.cpp C B fs_zip.cpp C B fs_mem.cpp C B ftp.cpp C S,B +gaugecmn.cpp C gdicmn.cpp C geometry.cpp C gifdecod.cpp C @@ -349,12 +351,13 @@ bmpbuttn.cpp V button.cpp V checkbox.cpp V checklst.cpp V -cmdproc.cpp V colschem.cpp V control.cpp V framuniv.cpp V +gauge.cpp V inphand.cpp V listbox.cpp V +notebook.cpp V radiobox.cpp V radiobut.cpp V renderer.cpp V @@ -373,7 +376,7 @@ gtk.cpp V winuniv.cpp V win32.cpp V -gsockgtk.c R +gsockgtk.c R L win_gtk.c R L app.cpp R L bitmap.cpp R L @@ -382,7 +385,8 @@ brush.cpp R L button.cpp R checkbox.cpp R checklst.cpp R -choice.cpp R +# FIXME: remove 'L' flag from choice! +choice.cpp R L clipbrd.cpp R L colour.cpp R L combobox.cpp R @@ -395,7 +399,7 @@ dcclient.cpp R L dcmemory.cpp R L dcscreen.cpp R L dialog.cpp R L -dnd.cpp R +dnd.cpp R L font.cpp R L fontdlg.cpp R frame.cpp R L @@ -423,11 +427,12 @@ statbmp.cpp R statbox.cpp R statline.cpp R stattext.cpp R -tbargtk.cpp R +# FIXME: remove 'L' here too! +tbargtk.cpp R L textctrl.cpp R tglbtn.cpp R timer.cpp R L -tooltip.cpp R +tooltip.cpp R L utilsgtk.cpp R L utilsres.cpp R wave.cpp R diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h index 7a03b31938..86afdae52f 100644 --- a/include/wx/chkconf.h +++ b/include/wx/chkconf.h @@ -93,6 +93,14 @@ # endif #endif /* !defined(wxUSE_CHOICE) */ +#ifndef wxUSE_CHOICEDLG +# ifdef wxABORT_ON_CONFIG_ERROR +# error "wxUSE_CHOICEDLG must be defined." +# else +# define wxUSE_CHOICEDLG 0 +# endif +#endif /* !defined(wxUSE_CHOICEDLG) */ + #ifndef wxUSE_CLIPBOARD # ifdef wxABORT_ON_CONFIG_ERROR # error "wxUSE_CLIPBOARD must be defined." @@ -117,6 +125,14 @@ # endif #endif /* !defined(wxUSE_DATAOBJ) */ +#ifndef wxUSE_DOC_VIEW_ARCHITECTURE +# ifdef wxABORT_ON_CONFIG_ERROR +# error "wxUSE_DOC_VIEW_ARCHITECTURE must be defined." +# else +# define wxUSE_DOC_VIEW_ARCHITECTURE 0 +# endif +#endif /* !defined(wxUSE_DOC_VIEW_ARCHITECTURE) */ + #ifndef wxUSE_FILEDLG # ifdef wxABORT_ON_CONFIG_ERROR # error "wxUSE_FILEDLG must be defined." @@ -157,6 +173,14 @@ # endif #endif /* !defined(wxUSE_GRID) */ +#ifndef wxUSE_HELP +# ifdef wxABORT_ON_CONFIG_ERROR +# error "wxUSE_HELP must be defined." +# else +# define wxUSE_HELP 0 +# endif +#endif /* !defined(wxUSE_HELP) */ + #ifndef wxUSE_IMAGLIST # ifdef wxABORT_ON_CONFIG_ERROR # error "wxUSE_IMAGLIST must be defined." @@ -181,13 +205,29 @@ # endif #endif /* !defined(wxUSE_LISTCTRL) */ -#ifndef wxUSE_MSGDLG +#ifndef wxUSE_LOG # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_MSGDLG must be defined." +# error "wxUSE_LOG must be defined." # else -# define wxUSE_MSGDLG 0 +# define wxUSE_LOG 0 # endif -#endif /* !defined(wxUSE_MSGDLG) */ +#endif /* !defined(wxUSE_LOG) */ + +#ifndef wxUSE_LOGGUI +# ifdef wxABORT_ON_CONFIG_ERROR +# error "wxUSE_LOGGUI must be defined." +# else +# define wxUSE_LOGGUI 0 +# endif +#endif /* !defined(wxUSE_LOGGUI) */ + +#ifndef wxUSE_LOGWINDOW +# ifdef wxABORT_ON_CONFIG_ERROR +# error "wxUSE_LOGWINDOW must be defined." +# else +# define wxUSE_LOGWINDOW 0 +# endif +#endif /* !defined(wxUSE_LOGWINDOW) */ #ifndef wxUSE_MDI_ARCHITECTURE # ifdef wxABORT_ON_CONFIG_ERROR @@ -213,6 +253,14 @@ # endif #endif /* !defined(wxUSE_MIMETYPE) */ +#ifndef wxUSE_MSGDLG +# ifdef wxABORT_ON_CONFIG_ERROR +# error "wxUSE_MSGDLG must be defined." +# else +# define wxUSE_MSGDLG 0 +# endif +#endif /* !defined(wxUSE_MSGDLG) */ + #ifndef wxUSE_NEW_GRID # ifdef wxABORT_ON_CONFIG_ERROR # error "wxUSE_NEW_GRID must be defined." @@ -237,6 +285,14 @@ # endif #endif /* !defined(wxUSE_POPUPWIN) */ +#ifndef wxUSE_PRINTING_ARCHITECTURE +# ifdef wxABORT_ON_CONFIG_ERROR +# error "wxUSE_PRINTING_ARCHITECTURE must be defined." +# else +# define wxUSE_PRINTING_ARCHITECTURE 0 +# endif +#endif /* !defined(wxUSE_PRINTING_ARCHITECTURE) */ + #ifndef wxUSE_RADIOBOX # ifdef wxABORT_ON_CONFIG_ERROR # error "wxUSE_RADIOBOX must be defined." @@ -325,6 +381,14 @@ # endif #endif /* !defined(wxUSE_STATLINE) */ +#ifndef wxUSE_STATTEXT +# ifdef wxABORT_ON_CONFIG_ERROR +# error "wxUSE_STATTEXT must be defined." +# else +# define wxUSE_STATTEXT 0 +# endif +#endif /* !defined(wxUSE_STATTEXT) */ + #ifndef wxUSE_STATUSBAR # ifdef wxABORT_ON_CONFIG_ERROR # error "wxUSE_STATUSBAR must be defined." @@ -381,6 +445,14 @@ # endif #endif /* !defined(wxUSE_TREECTRL) */ +#ifndef wxUSE_WXHTML_HELP +# ifdef wxABORT_ON_CONFIG_ERROR +# error "wxUSE_WXHTML_HELP must be defined." +# else +# define wxUSE_WXHTML_HELP 0 +# endif +#endif /* !defined(wxUSE_WXHTML_HELP) */ + /* check consistency of the settings */ @@ -407,6 +479,7 @@ wxUSE_STATBMP || \ wxUSE_STATBOX || \ wxUSE_STATLINE || \ + wxUSE_STATTEXT || \ wxUSE_STATUSBAR || \ wxUSE_TEXTCTRL || \ wxUSE_TOOLBAR || \ @@ -421,6 +494,100 @@ # endif #endif /* controls */ +/* wxUniv-specific dependencies */ +#if defined(__WXUNIVERSAL__) +# if (wxUSE_COMBOBOX || wxUSE_MENUS) && !wxUSE_POPUPWIN +# ifdef wxABORT_ON_CONFIG_ERROR +# error "wxUSE_POPUPWIN must be defined to use comboboxes/menus" +# else +# undef wxUSE_POPUPWIN +# define wxUSE_POPUPWIN 1 +# endif +# endif + +# if wxUSE_COMBOBOX +# if !wxUSE_LISTBOX +# ifdef wxABORT_ON_CONFIG_ERROR +# error "wxComboBox requires wxListBox in wxUniversal" +# else +# undef wxUSE_LISTBOX +# define wxUSE_LISTBOX 1 +# endif +# endif +# endif /* wxUSE_COMBOBOX */ + +# if wxUSE_RADIOBTN +# if !wxUSE_CHECKBOX +# ifdef wxABORT_ON_CONFIG_ERROR +# error "wxUSE_RADIOBTN requires wxUSE_CHECKBOX in wxUniversal" +# else +# undef wxUSE_CHECKBOX +# define wxUSE_CHECKBOX 1 +# endif +# endif +# endif /* wxUSE_RADIOBTN */ + +# if wxUSE_TEXTCTRL +# if !wxUSE_CARET +# ifdef wxABORT_ON_CONFIG_ERROR +# error "wxTextCtrl requires wxCaret in wxUniversal" +# else +# undef wxUSE_CARET +# define wxUSE_CARET 1 +# endif +# endif /* wxUSE_CARET */ + +# if !wxUSE_SCROLLBAR +# ifdef wxABORT_ON_CONFIG_ERROR +# error "wxTextCtrl requires wxScrollBar in wxUniversal" +# else +# undef wxUSE_SCROLLBAR +# define wxUSE_SCROLLBAR 1 +# endif +# endif /* wxUSE_SCROLLBAR */ +# endif /* wxUSE_TEXTCTRL */ +#endif /* __WXUNIVERSAL__ */ + +/* wxGTK-specific dependencies */ +#if defined(__WXGTK__) && !defined(__WXUNIVERSAL__) +# if wxUSE_MDI_ARCHITECTURE && !wxUSE_MENUS +# ifdef wxABORT_ON_CONFIG_ERROR +# error "MDI requires wxUSE_MENUS in wxGTK" +# else +# undef wxUSE_MENUS +# define wxUSE_MENUS 1 +# endif +# endif +#endif /* wxGTK && !wxUniv */ + +/* generic controls dependencies */ +#if !defined(__WXMSW__) || defined(__WXUNIVERSAL__) +# if wxUSE_FONTDLG || wxUSE_FILEDLG || wxUSE_CHOICEDLG + /* all common controls are needed by these dialogs */ +# if !defined(wxUSE_CHOICE) || \ + !defined(wxUSE_TEXTCTRL) || \ + !defined(wxUSE_BUTTON) || \ + !defined(wxUSE_CHECKBOX) || \ + !defined(wxUSE_STATTEXT) +# ifdef wxABORT_ON_CONFIG_ERROR +# error "These common controls are needed by common dialogs" +# else +# undef wxUSE_CHOICE +# define wxUSE_CHOICE 1 +# undef wxUSE_TEXTCTRL +# define wxUSE_TEXTCTRL 1 +# undef wxUSE_BUTTON +# define wxUSE_BUTTON 1 +# undef wxUSE_CHECKBOX +# define wxUSE_CHECKBOX 1 +# undef wxUSE_STATTEXT +# define wxUSE_STATTEXT 1 +# endif +# endif +# endif +#endif /* !wxMSW || wxUniv */ + +/* common dependencies */ #if wxUSE_CALENDARCTRL # if !(wxUSE_SPINBTN && wxUSE_COMBOBOX) # ifdef wxABORT_ON_CONFIG_ERROR @@ -445,16 +612,42 @@ # endif #endif /* wxUSE_RADIOBTN */ -#if wxUSE_COMBOBOX -# if defined(__WXUNIVERSAL__) && !wxUSE_LISTBOX +#if wxUSE_WXHTML_HELP +# if !wxUSE_HELP || !wxUSE_HTML || !wxUSE_COMBOBOX +# ifdef wxABORT_ON_CONFIG_ERROR +# error "Built in help controller can't be compiled" +# else +# undef wxUSE_HELP +# define wxUSE_HELP 1 +# undef wxUSE_HTML +# define wxUSE_HTML 1 +# undef wxUSE_COMBOBOX +# define wxUSE_COMBOBOX 1 +# endif +# endif +#endif /* wxUSE_WXHTML_HELP */ + +#if wxUSE_PRINTING_ARCHITECTURE +# if !wxUSE_COMBOBOX +# ifdef wxABORT_ON_CONFIG_ERROR +# error "Print dialog requires wxUSE_COMBOBOX" +# else +# undef wxUSE_COMBOBOX +# define wxUSE_COMBOBOX 1 +# endif +# endif +#endif /* wxUSE_PRINTING_ARCHITECTURE */ + +#if wxUSE_DOC_VIEW_ARCHITECTURE +# if !wxUSE_MENUS # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxComboBox requires wxListBox in wxUniversal" +# error "DocView requires wxUSE_MENUS" # else -# undef wxUSE_LISTBOX -# define wxUSE_LISTBOX 1 +# undef wxUSE_MENUS +# define wxUSE_MENUS 1 # endif # endif -#endif /* wxUSE_COMBOBOX */ +#endif /* wxUSE_DOC_VIEW_ARCHITECTURE */ #if !wxUSE_FILEDLG # if wxUSE_DOC_VIEW_ARCHITECTURE || wxUSE_HTML @@ -467,17 +660,6 @@ # endif #endif /* wxUSE_FILEDLG */ -#if !wxUSE_FONTDLG -# if wxUSE_FONTMAP -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxFontDialog must be compiled as well" -# else -# undef wxUSE_FONTDLG -# define wxUSE_FONTDLG 1 -# endif -# endif -#endif /* !wxUSE_FONTDLG */ - #if !wxUSE_IMAGLIST # if wxUSE_TREECTRL || wxUSE_NOTEBOOK || wxUSE_LISTCTRL # ifdef wxABORT_ON_CONFIG_ERROR @@ -499,17 +681,6 @@ # endif #endif -#if wxUSE_RADIOBTN -# if defined(__WXUNIVERSAL__) && !wxUSE_CHECKBOX -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_RADIOBTN requires wxUSE_CHECKBOX in wxUniversal" -# else -# undef wxUSE_CHECKBOX -# define wxUSE_CHECKBOX 1 -# endif -# endif -#endif /* wxUSE_RADIOBTN */ - #if wxUSE_RADIOBOX # if !wxUSE_RADIOBTN || !wxUSE_STATBOX # ifdef wxABORT_ON_CONFIG_ERROR @@ -534,32 +705,21 @@ # endif #endif /* wxUSE_STOPWATCH */ -#if wxUSE_TEXTCTRL -# ifdef __WXUNIVERSAL__ -# if !wxUSE_CARET -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxTextCtrl requires wxCaret in wxUniversal" -# else -# undef wxUSE_CARET -# define wxUSE_CARET 1 -# endif -# endif /* wxUSE_CARET */ - -# if !wxUSE_SCROLLBAR -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxTextCtrl requires wxScrollBar in wxUniversal" -# else -# undef wxUSE_SCROLLBAR -# define wxUSE_SCROLLBAR 1 -# endif -# endif /* wxUSE_SCROLLBAR */ -# endif /* __WXUNIVERSAL__ */ -#endif /* wxUSE_RADIOBTN */ +#if wxUSE_LOGWINDOW +# if !wxUSE_TEXTCTRL +# ifdef wxABORT_ON_CONFIG_ERROR +# error "wxUSE_LOGWINDOW requires wxUSE_TEXTCTRL" +# else +# undef wxUSE_TEXTCTRL +# define wxUSE_TEXTCTRL 1 +# endif +# endif +#endif /* wxUSE_LOGWINDOW */ /* I wonder if we shouldn't just remove all occurrences of wxUSE_DYNAMIC_CLASSES from the sources? */ #if !defined(wxUSE_DYNAMIC_CLASSES) || !wxUSE_DYNAMIC_CLASSES -# if wxABORT_ON_CONFIG_ERROR +# ifdef wxABORT_ON_CONFIG_ERROR # error "wxUSE_DYNAMIC_CLASSES must be defined as 1" # else # undef wxUSE_DYNAMIC_CLASSES @@ -568,7 +728,7 @@ #endif /* wxUSE_DYNAMIC_CLASSES */ #if wxUSE_MIMETYPE && !wxUSE_TEXTFILE -# if wxABORT_ON_CONFIG_ERROR +# ifdef wxABORT_ON_CONFIG_ERROR # error "wxUSE_MIMETYPE requires wxUSE_TEXTFILE" # else # undef wxUSE_TEXTFILE @@ -577,7 +737,7 @@ #endif /* wxUSE_MIMETYPE */ #if wxUSE_TEXTFILE && !wxUSE_FILE -# if wxABORT_ON_CONFIG_ERROR +# ifdef wxABORT_ON_CONFIG_ERROR # error "wxUSE_TEXTFILE requires wxUSE_FILE" # else # undef wxUSE_FILE @@ -586,7 +746,7 @@ #endif /* wxUSE_TEXTFILE */ #if wxUSE_CLIPBOARD && !wxUSE_DATAOBJ -# if wxABORT_ON_CONFIG_ERROR +# ifdef wxABORT_ON_CONFIG_ERROR # error "wxClipboard requires wxDataObject" # else # undef wxUSE_DATAOBJ @@ -594,29 +754,5 @@ # endif #endif /* wxUSE_CLIPBOARD */ -/* wxUniv-specific dependencies */ -#if defined(__WXUNIVERSAL__) -# if (wxUSE_COMBOBOX || wxUSE_MENUS) && !wxUSE_POPUPWIN -# if wxABORT_ON_CONFIG_ERROR -# error "wxUSE_POPUPWIN must be defined to use comboboxes/menus" -# else -# undef wxUSE_POPUPWIN -# define wxUSE_POPUPWIN 1 -# endif -# endif -#endif /* wxUSE_POPUPWIN */ - -/* wxGTK-specific dependencies */ -#if defined(__WXGTK__) && !defined(__WXUNIVERSAL__) -# if wxUSE_MDI_ARCHITECTURE && !wxUSE_MENUS -# if wxABORT_ON_CONFIG_ERROR -# error "MDI requires wxUSE_MENUS in wxGTK" -# else -# undef wxUSE_MENUS -# define wxUSE_MENUS 1 -# endif -# endif -#endif /* wxGTK && !wxUniv */ - #endif /* wxUSE_GUI */ diff --git a/include/wx/generic/grid.h b/include/wx/generic/grid.h index 786a823fb8..b0a62e87d7 100644 --- a/include/wx/generic/grid.h +++ b/include/wx/generic/grid.h @@ -375,6 +375,8 @@ protected: friend class wxGridCellEditorDummyFriend; }; +#if wxUSE_TEXTCTRL + // the editor for string/text data class WXDLLEXPORT wxGridCellTextEditor : public wxGridCellEditor { @@ -489,6 +491,10 @@ private: double m_valueOld; }; +#endif // wxUSE_TEXTCTRL + +#if wxUSE_CHECKBOX + // the editor for boolean data class WXDLLEXPORT wxGridCellBoolEditor : public wxGridCellEditor { @@ -517,6 +523,10 @@ private: bool m_startValue; }; +#endif // wxUSE_CHECKBOX + +#if wxUSE_COMBOBOX + // the editor for string data allowing to choose from the list of strings class WXDLLEXPORT wxGridCellChoiceEditor : public wxGridCellEditor { @@ -551,6 +561,8 @@ private: bool m_allowOthers; }; +#endif // wxUSE_COMBOBOX + // ---------------------------------------------------------------------------- // wxGridCellAttr: this class can be used to alter the cells appearance in // the grid by changing their colour/font/... from default. An object of this diff --git a/include/wx/generic/gridctrl.h b/include/wx/generic/gridctrl.h index 1295d5d10b..82431d0c0e 100644 --- a/include/wx/generic/gridctrl.h +++ b/include/wx/generic/gridctrl.h @@ -91,6 +91,8 @@ protected: }; +#if wxUSE_COMBOBOX + class WXDLLEXPORT wxGridCellEnumEditor : public wxGridCellChoiceEditor { public: @@ -106,6 +108,7 @@ private: long int m_startint; }; +#endif // wxUSE_COMBOBOX class wxGridCellAutoWrapStringEditor : public wxGridCellTextEditor { diff --git a/include/wx/generic/scrolwin.h b/include/wx/generic/scrolwin.h index f614ea9647..43cc01fcad 100644 --- a/include/wx/generic/scrolwin.h +++ b/include/wx/generic/scrolwin.h @@ -13,7 +13,7 @@ #define _WX_GENERIC_SCROLLWIN_H_ #ifdef __GNUG__ - #pragma interface "scrolwin.h" + #pragma interface "genscrolwin.h" #endif // ---------------------------------------------------------------------------- diff --git a/include/wx/gtk/window.h b/include/wx/gtk/window.h index ec83a98567..255e2474d4 100644 --- a/include/wx/gtk/window.h +++ b/include/wx/gtk/window.h @@ -173,7 +173,7 @@ public: GdkIC *m_ic; GdkICAttr *m_icattr; #endif - + /* scrolling stuff */ GtkAdjustment *m_hAdjust,*m_vAdjust; float m_oldHorizontalPos; @@ -200,7 +200,7 @@ public: // before the widget has been "realized" bool m_delayedForegroundColour:1; bool m_delayedBackgroundColour:1; - + // contains GTK's widgets internal information about non-default widget // font and colours. we create one for each widget that gets any // non-default attribute set via SetFont() or SetForegroundColour() / @@ -236,4 +236,6 @@ private: DECLARE_NO_COPY_CLASS(wxWindowGTK); }; +extern wxWindow *wxFindFocusedChild(wxWindowGTK *win); + #endif // __GTKWINDOWH__ diff --git a/include/wx/gtk1/window.h b/include/wx/gtk1/window.h index ec83a98567..255e2474d4 100644 --- a/include/wx/gtk1/window.h +++ b/include/wx/gtk1/window.h @@ -173,7 +173,7 @@ public: GdkIC *m_ic; GdkICAttr *m_icattr; #endif - + /* scrolling stuff */ GtkAdjustment *m_hAdjust,*m_vAdjust; float m_oldHorizontalPos; @@ -200,7 +200,7 @@ public: // before the widget has been "realized" bool m_delayedForegroundColour:1; bool m_delayedBackgroundColour:1; - + // contains GTK's widgets internal information about non-default widget // font and colours. we create one for each widget that gets any // non-default attribute set via SetFont() or SetForegroundColour() / @@ -236,4 +236,6 @@ private: DECLARE_NO_COPY_CLASS(wxWindowGTK); }; +extern wxWindow *wxFindFocusedChild(wxWindowGTK *win); + #endif // __GTKWINDOWH__ diff --git a/include/wx/help.h b/include/wx/help.h index e67d49358a..8b6a9c1ddb 100644 --- a/include/wx/help.h +++ b/include/wx/help.h @@ -1,6 +1,8 @@ #ifndef _WX_HELP_H_BASE_ #define _WX_HELP_H_BASE_ +#if wxUSE_HELP + #include "wx/helpbase.h" #ifdef __WXMSW__ @@ -10,22 +12,19 @@ #define sm_classwxHelpController sm_classwxWinHelpController #else // !MSW -/* By default, if wxHTML is compiled in, use the - wxHelpControllerHtml. If not, use the external help controller. - (of course, we shouldn't do it for wxMSW) -*/ - -#if wxUSE_HTML -# include "wx/generic/helpwxht.h" -# define wxHelpController wxHelpControllerHtml -# define sm_classwxHelpController sm_classwxHelpControllerHtml +#if wxUSE_WXHTML_HELP + #include "wx/generic/helpwxht.h" + #define wxHelpController wxHelpControllerHtml + #define sm_classwxHelpController sm_classwxHelpControllerHtml #else -# include "wx/generic/helpext.h" -# define wxHelpController wxExtHelpController -# define sm_classwxHelpController sm_classwxExtHelpController + #include "wx/generic/helpext.h" + #define wxHelpController wxExtHelpController + #define sm_classwxHelpController sm_classwxExtHelpController #endif #endif // MSW/!MSW +#endif // wxUSE_HELP + #endif // _WX_HELP_H_BASE_ diff --git a/include/wx/helpbase.h b/include/wx/helpbase.h index 17443e79ac..0fd1148aa3 100644 --- a/include/wx/helpbase.h +++ b/include/wx/helpbase.h @@ -17,13 +17,14 @@ #endif #include "wx/defs.h" + +#if wxUSE_HELP + #include "wx/object.h" #include "wx/string.h" #include "wx/gdicmn.h" #include "wx/frame.h" -#if wxUSE_HELP - // Flags for SetViewer #define wxHELP_NETSCAPE 1 @@ -31,20 +32,20 @@ class WXDLLEXPORT wxHelpControllerBase: public wxObject { DECLARE_CLASS(wxHelpControllerBase) - + public: inline wxHelpControllerBase() {} inline ~wxHelpControllerBase() {}; - + // Must call this to set the filename and server name. // server is only required when implementing TCP/IP-based // help controllers. virtual bool Initialize(const wxString& WXUNUSED(file), int WXUNUSED(server) ) { return FALSE; } virtual bool Initialize(const wxString& WXUNUSED(file)) { return FALSE; } - + // Set viewer: only relevant to some kinds of controller virtual void SetViewer(const wxString& WXUNUSED(viewer), long WXUNUSED(flags) = 0) {} - + // If file is "", reloads file given in Initialize virtual bool LoadFile(const wxString& file = "") = 0; @@ -73,7 +74,7 @@ public: { // does nothing by default } - /// Obtains the latest settings used by the help frame and the help + /// Obtains the latest settings used by the help frame and the help /// frame. virtual wxFrame *GetFrameParameters(wxSize *WXUNUSED(size) = NULL, wxPoint *WXUNUSED(pos) = NULL, @@ -81,11 +82,12 @@ public: { return (wxFrame*) NULL;// does nothing by default } - + virtual bool Quit(void) = 0; virtual void OnQuit(void) {}; }; #endif // wxUSE_HELP + #endif // _WX_HELPBASEH__ diff --git a/include/wx/html/helpfrm.h b/include/wx/html/helpfrm.h index d8c4e83b13..0eb200c8a0 100644 --- a/include/wx/html/helpfrm.h +++ b/include/wx/html/helpfrm.h @@ -18,7 +18,7 @@ #include "wx/defs.h" -#if wxUSE_HTML +#if wxUSE_WXHTML_HELP #include "wx/html/helpdata.h" #include "wx/window.h" @@ -218,12 +218,12 @@ protected: #endif wxHashTable *m_PagesHash; wxHelpControllerBase* m_helpController; - + int m_hfStyle; DECLARE_EVENT_TABLE() }; -#endif // wxUSE_HTML +#endif // wxUSE_WXHTML_HELP #endif diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h index 2638df4ed8..294e9e584d 100644 --- a/include/wx/msw/setup0.h +++ b/include/wx/msw/setup0.h @@ -722,6 +722,10 @@ // 0 for no help facility #define wxUSE_MS_HTML_HELP 0 // 0 for no MS HTML Help + +// Use wxHTML-based help controller? +#define wxUSE_WXHTML_HELP 1 + #define wxUSE_RESOURCES 1 // 0 for no wxGetResource/wxWriteResource #define wxUSE_CONSTRAINTS 1 diff --git a/include/wx/scrolwin.h b/include/wx/scrolwin.h index 9464b6973d..c85b28e568 100644 --- a/include/wx/scrolwin.h +++ b/include/wx/scrolwin.h @@ -170,7 +170,7 @@ protected: // wxScrolledWindow: a wxWindow which knows how to scroll // ---------------------------------------------------------------------------- -#ifdef __WXGTK__ +#if defined(__WXGTK__) && !defined(__WXUNIVERSAL__) #include "wx/gtk/scrolwin.h" #else // !wxGTK #include "wx/generic/scrolwin.h" diff --git a/include/wx/univ/renderer.h b/include/wx/univ/renderer.h index 5e4325c21f..6c36613b16 100644 --- a/include/wx/univ/renderer.h +++ b/include/wx/univ/renderer.h @@ -32,6 +32,7 @@ class WXDLLEXPORT wxDC; class WXDLLEXPORT wxCheckListBox; class WXDLLEXPORT wxListBox; class WXDLLEXPORT wxMenu; +class WXDLLEXPORT wxMenuGeometryInfo; class WXDLLEXPORT wxScrollBar; class WXDLLEXPORT wxTextCtrl; class WXDLLEXPORT wxWindow; @@ -43,10 +44,6 @@ class WXDLLEXPORT wxGauge; #include "wx/gdicmn.h" #include "wx/scrolbar.h" // for wxScrollBar::Element -#ifndef WX_PRECOMP - #include "wx/menu.h" // for wxMenuGeometryInfo -#endif // WX_PRECOMP - // ---------------------------------------------------------------------------- // wxRenderer: abstract renderers interface // ---------------------------------------------------------------------------- diff --git a/include/wx/univ/stattext.h b/include/wx/univ/stattext.h index 869b9960da..e08731b5b1 100644 --- a/include/wx/univ/stattext.h +++ b/include/wx/univ/stattext.h @@ -33,7 +33,7 @@ public: wxWindowID id, const wxString& label, const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, + const wxSize& size = wxDefaultSize, long style = 0, const wxString &name = wxStaticTextNameStr) { @@ -45,7 +45,7 @@ public: wxWindowID id, const wxString &label, const wxPoint &pos = wxDefaultPosition, - const wxSize &size = wxDefaultSize, + const wxSize &size = wxDefaultSize, long style = 0, const wxString &name = wxStaticTextNameStr); @@ -59,6 +59,8 @@ protected: // draw the control virtual void DoDraw(wxControlRenderer *renderer); + + DECLARE_ABSTRACT_CLASS(wxStaticText) }; #endif // _WX_UNIV_STATTEXT_H_ diff --git a/samples/configure.in b/samples/configure.in index 5d888d3a3d..f42567ee92 100644 --- a/samples/configure.in +++ b/samples/configure.in @@ -60,6 +60,7 @@ AC_OUTPUT([ sashtest/Makefile scroll/Makefile scrollsub/Makefile + sockets/Makefile splitter/Makefile statbar/Makefile text/Makefile @@ -69,7 +70,7 @@ AC_OUTPUT([ treelay/Makefile typetest/Makefile validate/Makefile - sockets/Makefile + widgets/Makefile wizard/Makefile html/Makefile html/about/Makefile diff --git a/samples/minimal/minimal.cpp b/samples/minimal/minimal.cpp index 4434353621..8188227df1 100644 --- a/samples/minimal/minimal.cpp +++ b/samples/minimal/minimal.cpp @@ -156,6 +156,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size) // set the frame icon SetIcon(wxICON(mondrian)); +#if wxUSE_MENUS // create a menu bar wxMenu *menuFile = new wxMenu("", wxMENU_TEAROFF); @@ -172,6 +173,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size) // ... and attach this menu bar to the frame SetMenuBar(menuBar); +#endif // wxUSE_MENUS #if wxUSE_STATUSBAR // create a status bar just for fun (by default with 1 pane only) diff --git a/samples/widgets/button.cpp b/samples/widgets/button.cpp index da3ed2cc91..eee4376195 100644 --- a/samples/widgets/button.cpp +++ b/samples/widgets/button.cpp @@ -26,6 +26,7 @@ // for all others, include the necessary headers #ifndef WX_PRECOMP + #include "wx/app.h" #include "wx/log.h" #include "wx/button.h" diff --git a/samples/widgets/combobox.cpp b/samples/widgets/combobox.cpp index 0abec90734..365b2778f0 100644 --- a/samples/widgets/combobox.cpp +++ b/samples/widgets/combobox.cpp @@ -24,6 +24,8 @@ #pragma hdrstop #endif +#if wxUSE_COMBOBOX + // for all others, include the necessary headers #ifndef WX_PRECOMP #include "wx/log.h" @@ -492,3 +494,5 @@ void ComboboxWidgetsPage::OnCheckOrRadioBox(wxCommandEvent& event) CreateCombo(); } +#endif //wxUSE_COMBOBOX + diff --git a/setup.h.in b/setup.h.in index 9863f95400..c2c766de60 100644 --- a/setup.h.in +++ b/setup.h.in @@ -649,9 +649,14 @@ #define wxUSE_WX_RESOURCES wxUSE_RESOURCES /* - * Use wxWindows help facility (needs wxUSE_IPC 1) + * Use wxWindows help facility */ #define wxUSE_HELP 0 +/* + * Use built-in HTML-based help controller + */ +#define wxUSE_WXHTML_HELP 0 + /* * Use iostream.h rather than iostream */ diff --git a/src/common/fontmap.cpp b/src/common/fontmap.cpp index 6b2e3b81de..977f7b2c44 100644 --- a/src/common/fontmap.cpp +++ b/src/common/fontmap.cpp @@ -738,6 +738,7 @@ bool wxFontMapper::GetAltForEncoding(wxFontEncoding encoding, #endif // wxUSE_CONFIG // ask the user +#if wxUSE_FONTDLG if ( interactive ) { wxString title(m_titleDialog); @@ -797,6 +798,7 @@ bool wxFontMapper::GetAltForEncoding(wxFontEncoding encoding, } } //else: we're in non-interactive mode +#endif // wxUSE_FONTDLG // now try the default mappings: wxFontEncodingArray equiv = wxEncodingConverter::GetAllEquivalents(encoding); diff --git a/src/common/framecmn.cpp b/src/common/framecmn.cpp index 714400961b..9ec8339d2f 100644 --- a/src/common/framecmn.cpp +++ b/src/common/framecmn.cpp @@ -385,6 +385,7 @@ void wxFrameBase::SetStatusWidths(int n, const int widths_field[] ) bool wxFrameBase::ShowMenuHelp(wxStatusBar *statbar, int menuId) { +#if wxUSE_MENUS if ( !statbar ) return FALSE; @@ -409,6 +410,9 @@ bool wxFrameBase::ShowMenuHelp(wxStatusBar *statbar, int menuId) statbar->SetStatusText(helpString); return !helpString.IsEmpty(); +#else // !wxUSE_MENUS + return FALSE; +#endif // wxUSE_MENUS/!wxUSE_MENUS } #endif // wxUSE_STATUSBAR diff --git a/src/common/gdicmn.cpp b/src/common/gdicmn.cpp index 9b17e4400b..239278c28e 100644 --- a/src/common/gdicmn.cpp +++ b/src/common/gdicmn.cpp @@ -122,8 +122,16 @@ wxRect& wxRect::Inflate(wxCoord dx, wxCoord dy) // check that we didn't make the rectangle invalid by accident (you almost // never want to have negative coords and never want negative size) - wxASSERT_MSG( x >= 0 && y >= 0 && width >= 0 && height >= 0, - _T("wxRect::Inflate() resulted in an invalid rectangle!") ); + if ( x < 0 ) + x = 0; + if ( y < 0 ) + y = 0; + + // what else can we do? + if ( width < 0 ) + width = 0; + if ( height < 0 ) + height = 0; return *this; } diff --git a/src/common/helpbase.cpp b/src/common/helpbase.cpp index 94d808ac5b..e8f7722899 100644 --- a/src/common/helpbase.cpp +++ b/src/common/helpbase.cpp @@ -24,10 +24,10 @@ #include "wx/defs.h" #endif -#include "wx/helpbase.h" - #if wxUSE_HELP +#include "wx/helpbase.h" + IMPLEMENT_CLASS(wxHelpControllerBase, wxObject) #endif // wxUSE_HELP diff --git a/src/common/resource.cpp b/src/common/resource.cpp index 8096c9163f..c0ffa5a62e 100644 --- a/src/common/resource.cpp +++ b/src/common/resource.cpp @@ -2648,6 +2648,8 @@ wxIcon wxResourceCreateIcon(const wxString& resource, wxResourceTable *table) } } +#if wxUSE_MENUS + wxMenu *wxResourceCreateMenu(wxItemResource *item) { wxMenu *menu = new wxMenu; @@ -2708,6 +2710,8 @@ wxMenu *wxResourceCreateMenu(const wxString& resource, wxResourceTable *table) return (wxMenu *) NULL; } +#endif // wxUSE_MENUS + // Global equivalents (so don't have to refer to default table explicitly) bool wxResourceParseData(const wxString& resource, wxResourceTable *table) { diff --git a/src/files.lst b/src/files.lst index 5b377063cc..090f343ea8 100644 --- a/src/files.lst +++ b/src/files.lst @@ -1,4 +1,4 @@ -# This file was automatically generated by tmake at 20:23, 2001/07/02 +# This file was automatically generated by tmake at 21:37, 2001/07/03 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE BASE.T! ALL_SOURCES = \ common/init.cpp \ diff --git a/src/generic/scrlwing.cpp b/src/generic/scrlwing.cpp index 3897dca59f..31ca6998a2 100644 --- a/src/generic/scrlwing.cpp +++ b/src/generic/scrlwing.cpp @@ -57,9 +57,7 @@ #endif #endif -#ifndef __WXGTK__ IMPLEMENT_CLASS(wxScrolledWindow, wxGenericScrolledWindow) -#endif // ---------------------------------------------------------------------------- // wxScrollHelperEvtHandler: intercept the events from the window and forward diff --git a/src/generic/spinctlg.cpp b/src/generic/spinctlg.cpp index 439e8987d2..44d209b5b9 100644 --- a/src/generic/spinctlg.cpp +++ b/src/generic/spinctlg.cpp @@ -28,9 +28,8 @@ #pragma hdrstop #endif -#if !wxUSE_SPINBTN - #error "This file can only be compiled if wxSpinButton is available" -#endif // !wxUSE_SPINBTN +#if !(defined(__WXMSW__) || defined(__WXGTK__) || defined(__WXPM__)) || \ + defined(__WXUNIVERSAL__) #ifndef WX_PRECOMP #include "wx/textctrl.h" @@ -197,8 +196,7 @@ void wxSpinCtrl::DoMoveWindow(int x, int y, int width, int height) wxControl::DoMoveWindow(x, y, width, height); // position the subcontrols inside the client area - wxSize sizeBtn = m_btn->GetSize(), - sizeText = m_text->GetSize(); + wxSize sizeBtn = m_btn->GetSize(); wxCoord wText = width - sizeBtn.x; m_text->SetSize(x, y, wText, height); @@ -225,8 +223,13 @@ bool wxSpinCtrl::Show(bool show) if ( !wxControl::Show(show) ) return FALSE; - m_btn->Show(show); - m_text->Show(show); + // under GTK Show() is called the first time before we are fully + // constructed + if ( m_btn ) + { + m_btn->Show(show); + m_text->Show(show); + } return TRUE; } @@ -319,3 +322,4 @@ void wxSpinCtrl::SetRange(int min, int max) m_btn->SetRange(min, max); } +#endif // !wxPort-with-native-spinctrl diff --git a/src/gtk/files.lst b/src/gtk/files.lst index c5f8d73ea4..b7dd268280 100644 --- a/src/gtk/files.lst +++ b/src/gtk/files.lst @@ -1,4 +1,4 @@ -# This file was automatically generated by tmake at 20:23, 2001/07/02 +# This file was automatically generated by tmake at 21:37, 2001/07/03 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE GTK.T! ALL_SOURCES = \ generic/accel.cpp \ @@ -33,6 +33,8 @@ ALL_SOURCES = \ generic/propform.cpp \ generic/proplist.cpp \ generic/sashwin.cpp \ + generic/scrlwing.cpp \ + generic/spinctlg.cpp \ generic/splash.cpp \ generic/splitter.cpp \ generic/statusbr.cpp \ @@ -85,6 +87,7 @@ ALL_SOURCES = \ common/fs_mem.cpp \ common/fs_zip.cpp \ common/ftp.cpp \ + common/gaugecmn.cpp \ common/gdicmn.cpp \ common/geometry.cpp \ common/gifdecod.cpp \ @@ -628,6 +631,7 @@ COMMONOBJS = \ fs_mem.o \ fs_zip.o \ ftp.o \ + gaugecmn.o \ gdicmn.o \ geometry.o \ gifdecod.o \ @@ -743,6 +747,7 @@ COMMONDEPS = \ fs_mem.d \ fs_zip.d \ ftp.d \ + gaugecmn.d \ gdicmn.d \ geometry.d \ gifdecod.d \ @@ -848,6 +853,8 @@ GENERICOBJS = \ propform.o \ proplist.o \ sashwin.o \ + scrlwing.o \ + spinctlg.o \ splash.o \ splitter.o \ statusbr.o \ @@ -893,6 +900,8 @@ GENERICDEPS = \ propform.d \ proplist.d \ sashwin.d \ + scrlwing.d \ + spinctlg.d \ splash.d \ splitter.d \ statusbr.d \ @@ -1031,6 +1040,7 @@ GUI_LOWLEVEL_OBJS = \ app.o \ bitmap.o \ brush.o \ + choice.o \ clipbrd.o \ colour.o \ cursor.o \ @@ -1041,15 +1051,19 @@ GUI_LOWLEVEL_OBJS = \ dcmemory.o \ dcscreen.o \ dialog.o \ + dnd.o \ font.o \ frame.o \ gdiobj.o \ + gsockgtk.o \ icon.o \ main.o \ pen.o \ region.o \ settings.o \ + tbargtk.o \ timer.o \ + tooltip.o \ utilsgtk.o \ win_gtk.o \ window.o @@ -1058,6 +1072,7 @@ GUI_LOWLEVEL_DEPS = \ app.d \ bitmap.d \ brush.d \ + choice.d \ clipbrd.d \ colour.d \ cursor.d \ @@ -1068,15 +1083,19 @@ GUI_LOWLEVEL_DEPS = \ dcmemory.d \ dcscreen.d \ dialog.d \ + dnd.d \ font.d \ frame.d \ gdiobj.d \ + gsockgtk.d \ icon.d \ main.d \ pen.d \ region.d \ settings.d \ + tbargtk.d \ timer.d \ + tooltip.d \ utilsgtk.d \ win_gtk.d \ window.d diff --git a/src/gtk/region.cpp b/src/gtk/region.cpp index e4d59dc1e8..2c31667721 100644 --- a/src/gtk/region.cpp +++ b/src/gtk/region.cpp @@ -766,10 +766,8 @@ wxCoord wxRegionIterator::GetH() const wxRect wxRegionIterator::GetRect() const { wxRect r; - wxNode *node = m_region.GetRectList()->Nth( m_current ); - - if (node) - r = *((wxRect*)node->Data()); + if( HaveRects() ) + r = ((wxRIRefData*)m_refData)->m_rects[m_current]; return r; } diff --git a/src/gtk/scrolwin.cpp b/src/gtk/scrolwin.cpp index bf6a8921e8..af7b2ea514 100644 --- a/src/gtk/scrolwin.cpp +++ b/src/gtk/scrolwin.cpp @@ -775,3 +775,4 @@ void wxScrolledWindow::OnChar(wxKeyEvent& event) event.Skip(); } } + diff --git a/src/gtk/textctrl.cpp b/src/gtk/textctrl.cpp index 1d41116d87..65f7951813 100644 --- a/src/gtk/textctrl.cpp +++ b/src/gtk/textctrl.cpp @@ -80,7 +80,6 @@ gtk_scrollbar_changed_callback( GtkWidget *WXUNUSED(widget), wxTextCtrl *win ) // "focus_in_event" //----------------------------------------------------------------------------- -wxWindow *FindFocusedChild(wxWindow *win); extern wxWindow *g_focusWindow; extern bool g_blockEventsOnDrag; // extern bool g_isIdle; @@ -152,7 +151,7 @@ static gint gtk_text_focus_out_callback( GtkWidget *widget, GdkEvent *WXUNUSED(e g_sendActivateEvent = 0; #endif - wxWindow *winFocus = FindFocusedChild(win); + wxWindow *winFocus = wxFindFocusedChild(win); if ( winFocus ) win = winFocus; diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp index ce6e688621..292de55f0d 100644 --- a/src/gtk/window.cpp +++ b/src/gtk/window.cpp @@ -333,25 +333,25 @@ extern bool g_isIdle; // returns the child of win which currently has focus or NULL if not found // // Note: can't be static, needed by textctrl.cpp. -wxWindow *FindFocusedChild(wxWindowGTK *win) +wxWindow *wxFindFocusedChild(wxWindowGTK *win) { - wxWindowGTK *winFocus = wxWindowGTK::FindFocus(); + wxWindow *winFocus = wxWindowGTK::FindFocus(); if ( !winFocus ) - return (wxWindowGTK *)NULL; + return (wxWindow *)NULL; if ( winFocus == win ) - return win; + return (wxWindow *)win; for ( wxWindowList::Node *node = win->GetChildren().GetFirst(); node; node = node->GetNext() ) { - wxWindowGTK *child = FindFocusedChild(node->GetData()); + wxWindow *child = wxFindFocusedChild(node->GetData()); if ( child ) return child; } - return (wxWindowGTK *)NULL; + return (wxWindow *)NULL; } static void draw_frame( GtkWidget *widget, wxWindowGTK *win ) @@ -1749,7 +1749,7 @@ static gint gtk_window_focus_out_callback( GtkWidget *widget, GdkEvent *WXUNUSED // g_sendActivateEvent to -1 g_sendActivateEvent = 0; - wxWindowGTK *winFocus = FindFocusedChild(win); + wxWindowGTK *winFocus = wxFindFocusedChild(win); if ( winFocus ) win = winFocus; @@ -3067,7 +3067,7 @@ bool wxWindowGTK::Show( bool show ) return TRUE; } -static void wxWindowNotifyEnable(wxWindow* win, bool enable) +static void wxWindowNotifyEnable(wxWindowGTK* win, bool enable) { win->OnParentEnable(enable); @@ -3084,7 +3084,7 @@ static void wxWindowNotifyEnable(wxWindow* win, bool enable) } } -bool wxWindow::Enable( bool enable ) +bool wxWindowGTK::Enable( bool enable ) { wxCHECK_MSG( (m_widget != NULL), FALSE, wxT("invalid window") ); @@ -3394,7 +3394,7 @@ void wxWindowGTK::DoSetToolTip( wxToolTip *tip ) wxWindowBase::DoSetToolTip(tip); if (m_tooltip) - m_tooltip->Apply( this ); + m_tooltip->Apply( (wxWindow *)this ); } void wxWindowGTK::ApplyToolTip( GtkTooltips *tips, const wxChar *tip ) diff --git a/src/gtk1/files.lst b/src/gtk1/files.lst index c5f8d73ea4..b7dd268280 100644 --- a/src/gtk1/files.lst +++ b/src/gtk1/files.lst @@ -1,4 +1,4 @@ -# This file was automatically generated by tmake at 20:23, 2001/07/02 +# This file was automatically generated by tmake at 21:37, 2001/07/03 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE GTK.T! ALL_SOURCES = \ generic/accel.cpp \ @@ -33,6 +33,8 @@ ALL_SOURCES = \ generic/propform.cpp \ generic/proplist.cpp \ generic/sashwin.cpp \ + generic/scrlwing.cpp \ + generic/spinctlg.cpp \ generic/splash.cpp \ generic/splitter.cpp \ generic/statusbr.cpp \ @@ -85,6 +87,7 @@ ALL_SOURCES = \ common/fs_mem.cpp \ common/fs_zip.cpp \ common/ftp.cpp \ + common/gaugecmn.cpp \ common/gdicmn.cpp \ common/geometry.cpp \ common/gifdecod.cpp \ @@ -628,6 +631,7 @@ COMMONOBJS = \ fs_mem.o \ fs_zip.o \ ftp.o \ + gaugecmn.o \ gdicmn.o \ geometry.o \ gifdecod.o \ @@ -743,6 +747,7 @@ COMMONDEPS = \ fs_mem.d \ fs_zip.d \ ftp.d \ + gaugecmn.d \ gdicmn.d \ geometry.d \ gifdecod.d \ @@ -848,6 +853,8 @@ GENERICOBJS = \ propform.o \ proplist.o \ sashwin.o \ + scrlwing.o \ + spinctlg.o \ splash.o \ splitter.o \ statusbr.o \ @@ -893,6 +900,8 @@ GENERICDEPS = \ propform.d \ proplist.d \ sashwin.d \ + scrlwing.d \ + spinctlg.d \ splash.d \ splitter.d \ statusbr.d \ @@ -1031,6 +1040,7 @@ GUI_LOWLEVEL_OBJS = \ app.o \ bitmap.o \ brush.o \ + choice.o \ clipbrd.o \ colour.o \ cursor.o \ @@ -1041,15 +1051,19 @@ GUI_LOWLEVEL_OBJS = \ dcmemory.o \ dcscreen.o \ dialog.o \ + dnd.o \ font.o \ frame.o \ gdiobj.o \ + gsockgtk.o \ icon.o \ main.o \ pen.o \ region.o \ settings.o \ + tbargtk.o \ timer.o \ + tooltip.o \ utilsgtk.o \ win_gtk.o \ window.o @@ -1058,6 +1072,7 @@ GUI_LOWLEVEL_DEPS = \ app.d \ bitmap.d \ brush.d \ + choice.d \ clipbrd.d \ colour.d \ cursor.d \ @@ -1068,15 +1083,19 @@ GUI_LOWLEVEL_DEPS = \ dcmemory.d \ dcscreen.d \ dialog.d \ + dnd.d \ font.d \ frame.d \ gdiobj.d \ + gsockgtk.d \ icon.d \ main.d \ pen.d \ region.d \ settings.d \ + tbargtk.d \ timer.d \ + tooltip.d \ utilsgtk.d \ win_gtk.d \ window.d diff --git a/src/gtk1/region.cpp b/src/gtk1/region.cpp index e4d59dc1e8..2c31667721 100644 --- a/src/gtk1/region.cpp +++ b/src/gtk1/region.cpp @@ -766,10 +766,8 @@ wxCoord wxRegionIterator::GetH() const wxRect wxRegionIterator::GetRect() const { wxRect r; - wxNode *node = m_region.GetRectList()->Nth( m_current ); - - if (node) - r = *((wxRect*)node->Data()); + if( HaveRects() ) + r = ((wxRIRefData*)m_refData)->m_rects[m_current]; return r; } diff --git a/src/gtk1/scrolwin.cpp b/src/gtk1/scrolwin.cpp index bf6a8921e8..af7b2ea514 100644 --- a/src/gtk1/scrolwin.cpp +++ b/src/gtk1/scrolwin.cpp @@ -775,3 +775,4 @@ void wxScrolledWindow::OnChar(wxKeyEvent& event) event.Skip(); } } + diff --git a/src/gtk1/textctrl.cpp b/src/gtk1/textctrl.cpp index 1d41116d87..65f7951813 100644 --- a/src/gtk1/textctrl.cpp +++ b/src/gtk1/textctrl.cpp @@ -80,7 +80,6 @@ gtk_scrollbar_changed_callback( GtkWidget *WXUNUSED(widget), wxTextCtrl *win ) // "focus_in_event" //----------------------------------------------------------------------------- -wxWindow *FindFocusedChild(wxWindow *win); extern wxWindow *g_focusWindow; extern bool g_blockEventsOnDrag; // extern bool g_isIdle; @@ -152,7 +151,7 @@ static gint gtk_text_focus_out_callback( GtkWidget *widget, GdkEvent *WXUNUSED(e g_sendActivateEvent = 0; #endif - wxWindow *winFocus = FindFocusedChild(win); + wxWindow *winFocus = wxFindFocusedChild(win); if ( winFocus ) win = winFocus; diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp index ce6e688621..292de55f0d 100644 --- a/src/gtk1/window.cpp +++ b/src/gtk1/window.cpp @@ -333,25 +333,25 @@ extern bool g_isIdle; // returns the child of win which currently has focus or NULL if not found // // Note: can't be static, needed by textctrl.cpp. -wxWindow *FindFocusedChild(wxWindowGTK *win) +wxWindow *wxFindFocusedChild(wxWindowGTK *win) { - wxWindowGTK *winFocus = wxWindowGTK::FindFocus(); + wxWindow *winFocus = wxWindowGTK::FindFocus(); if ( !winFocus ) - return (wxWindowGTK *)NULL; + return (wxWindow *)NULL; if ( winFocus == win ) - return win; + return (wxWindow *)win; for ( wxWindowList::Node *node = win->GetChildren().GetFirst(); node; node = node->GetNext() ) { - wxWindowGTK *child = FindFocusedChild(node->GetData()); + wxWindow *child = wxFindFocusedChild(node->GetData()); if ( child ) return child; } - return (wxWindowGTK *)NULL; + return (wxWindow *)NULL; } static void draw_frame( GtkWidget *widget, wxWindowGTK *win ) @@ -1749,7 +1749,7 @@ static gint gtk_window_focus_out_callback( GtkWidget *widget, GdkEvent *WXUNUSED // g_sendActivateEvent to -1 g_sendActivateEvent = 0; - wxWindowGTK *winFocus = FindFocusedChild(win); + wxWindowGTK *winFocus = wxFindFocusedChild(win); if ( winFocus ) win = winFocus; @@ -3067,7 +3067,7 @@ bool wxWindowGTK::Show( bool show ) return TRUE; } -static void wxWindowNotifyEnable(wxWindow* win, bool enable) +static void wxWindowNotifyEnable(wxWindowGTK* win, bool enable) { win->OnParentEnable(enable); @@ -3084,7 +3084,7 @@ static void wxWindowNotifyEnable(wxWindow* win, bool enable) } } -bool wxWindow::Enable( bool enable ) +bool wxWindowGTK::Enable( bool enable ) { wxCHECK_MSG( (m_widget != NULL), FALSE, wxT("invalid window") ); @@ -3394,7 +3394,7 @@ void wxWindowGTK::DoSetToolTip( wxToolTip *tip ) wxWindowBase::DoSetToolTip(tip); if (m_tooltip) - m_tooltip->Apply( this ); + m_tooltip->Apply( (wxWindow *)this ); } void wxWindowGTK::ApplyToolTip( GtkTooltips *tips, const wxChar *tip ) diff --git a/src/html/helpctrl.cpp b/src/html/helpctrl.cpp index 8067c8335a..e513a50f63 100644 --- a/src/html/helpctrl.cpp +++ b/src/html/helpctrl.cpp @@ -20,7 +20,7 @@ #pragma hdrstop #endif -#if wxUSE_HTML && wxUSE_STREAMS +#if wxUSE_WXHTML_HELP #ifndef WX_PRECOMP #include "wx/app.h" @@ -248,4 +248,5 @@ bool wxHtmlHelpController::Quit() return TRUE; } -#endif +#endif // wxUSE_WXHTML_HELP + diff --git a/src/html/helpfrm.cpp b/src/html/helpfrm.cpp index 55a7d8ae09..7fba6120af 100644 --- a/src/html/helpfrm.cpp +++ b/src/html/helpfrm.cpp @@ -21,7 +21,7 @@ #pragma hdrstop #endif -#if wxUSE_HTML && wxUSE_STREAMS +#if wxUSE_WXHTML_HELP #ifndef WXPRECOMP #include "wx/intl.h" @@ -238,7 +238,7 @@ void wxHtmlHelpFrame::Init(wxHtmlHelpData* data) // moreover, if no contents, index or searchpage is needed, m_Splitter and // m_NavigPan will be NULL too (with m_HtmlWin directly connected to the frame) -bool wxHtmlHelpFrame::Create(wxWindow* parent, wxWindowID id, +bool wxHtmlHelpFrame::Create(wxWindow* parent, wxWindowID id, const wxString& WXUNUSED(title), int style) { m_hfStyle = style; @@ -301,7 +301,7 @@ bool wxHtmlHelpFrame::Create(wxWindow* parent, wxWindowID id, wxWindow *dummy = new wxPanel(m_NavigPan, wxID_HTML_INDEXPAGE); if (style & wxHF_BOOKMARKS) - { + { wxLayoutConstraints *b1 = new wxLayoutConstraints; wxBitmapButton *bmpbt = new wxBitmapButton(dummy, wxID_HTML_BOOKMARKSREMOVE, wxBITMAP(wbkdel), wxDefaultPosition, wxSize(20,20)); @@ -502,18 +502,18 @@ bool wxHtmlHelpFrame::Create(wxWindow* parent, wxWindowID id, if (m_Cfg.navig_on) m_Splitter->SplitVertically(m_NavigPan, m_HtmlWin, m_Cfg.sashpos); else - { + { m_Splitter->SplitVertically(m_NavigPan, m_HtmlWin, m_Cfg.sashpos); m_Splitter->Unsplit(); } - if (m_Cfg.navig_on) - { + if (m_Cfg.navig_on) + { m_NavigPan->Show(TRUE); m_Splitter->SplitVertically(m_NavigPan, m_HtmlWin, m_Cfg.sashpos); } else - { + { m_NavigPan->Show(FALSE); m_Splitter->Initialize(m_HtmlWin); } @@ -713,7 +713,7 @@ bool wxHtmlHelpFrame::KeywordSearch(const wxString& keyword) if (curi % 32 == 0 && progress.Update(curi) == FALSE) break; if (status.Search()) - { + { foundstr.Printf(_("Found %i matches"), ++foundcnt); progress.Update(status.GetCurIndex(), foundstr); m_SearchList->Append(status.GetName(), status.GetContentsItem()); @@ -760,7 +760,7 @@ void wxHtmlHelpFrame::CreateContents() // We set the icon later: when we find an item with level=n, we know // that the last item with level=n-1 was folder with subitems, so we // set its icon accordingly - bool imaged[MAX_ROOTS]; + bool imaged[MAX_ROOTS]; m_ContentsBox->DeleteAllItems(); // Don't show (Help) root if there's only one boook @@ -799,7 +799,7 @@ void wxHtmlHelpFrame::CreateContents() else { roots[1] = m_ContentsBox->AppendItem(roots[0], - it->m_Name, IMG_Book, -1, + it->m_Name, IMG_Book, -1, new wxHtmlHelpTreeItemData(i)); m_ContentsBox->SetItemBold(roots[1], TRUE); } @@ -807,12 +807,12 @@ void wxHtmlHelpFrame::CreateContents() } } // ...and their contents: - else + else { roots[it->m_Level + 1] = m_ContentsBox->AppendItem( - roots[it->m_Level], it->m_Name, IMG_Page, + roots[it->m_Level], it->m_Name, IMG_Page, -1, new wxHtmlHelpTreeItemData(i)); - imaged[it->m_Level + 1] = FALSE; + imaged[it->m_Level + 1] = FALSE; } m_PagesHash->Put(it->GetFullPath(), @@ -821,7 +821,7 @@ void wxHtmlHelpFrame::CreateContents() // Set the icon for the node one level up in the hiearachy, // unless already done (see comment above imaged[] declaration) if (!imaged[it->m_Level]) - { + { int image = IMG_Folder; if (m_hfStyle & wxHF_ICONS_BOOK) image = IMG_Book; @@ -909,17 +909,17 @@ void wxHtmlHelpFrame::ReadCustomization(wxConfigBase *cfg, const wxString& path) cnt = cfg->Read(wxT("hcBookmarksCnt"), 0L); if (cnt != 0) - { + { m_BookmarksNames.Clear(); m_BookmarksPages.Clear(); if (m_Bookmarks) - { + { m_Bookmarks->Clear(); m_Bookmarks->Append(_("(bookmarks)")); } for (i = 0; i < cnt; i++) - { + { val.Printf(wxT("hcBookmark_%i"), i); s = cfg->Read(val); m_BookmarksNames.Add(s); @@ -967,7 +967,7 @@ void wxHtmlHelpFrame::WriteCustomization(wxConfigBase *cfg, const wxString& path cfg->Write(wxT("hcBookmarksCnt"), (long)cnt); for (i = 0; i < cnt; i++) - { + { val.Printf(wxT("hcBookmark_%i"), i); cfg->Write(val, m_BookmarksNames[i]); val.Printf(wxT("hcBookmark_%i_url"), i); @@ -1270,13 +1270,13 @@ void wxHtmlHelpFrame::OnToolbar(wxCommandEvent& event) if (! (m_Splitter && m_NavigPan)) return ; if (m_Splitter->IsSplit()) - { + { m_Cfg.sashpos = m_Splitter->GetSashPosition(); m_Splitter->Unsplit(m_NavigPan); m_Cfg.navig_on = FALSE; } - else - { + else + { m_NavigPan->Show(TRUE); m_HtmlWin->Show(TRUE); m_Splitter->SplitVertically(m_NavigPan, m_HtmlWin, m_Cfg.sashpos); @@ -1297,9 +1297,9 @@ void wxHtmlHelpFrame::OnToolbar(wxCommandEvent& event) item = m_HtmlWin->GetOpenedPageTitle(); url = m_HtmlWin->GetOpenedPage(); if (item == wxEmptyString) - item = url.AfterLast(wxT('/')); + item = url.AfterLast(wxT('/')); if (m_BookmarksPages.Index(url) == wxNOT_FOUND) - { + { m_Bookmarks->Append(item); m_BookmarksNames.Add(item); m_BookmarksPages.Add(url); @@ -1315,7 +1315,7 @@ void wxHtmlHelpFrame::OnToolbar(wxCommandEvent& event) item = m_Bookmarks->GetStringSelection(); pos = m_BookmarksNames.Index(item); if (pos != wxNOT_FOUND) - { + { m_BookmarksNames.Remove(pos); m_BookmarksPages.Remove(pos); m_Bookmarks->Delete(m_Bookmarks->GetSelection()); @@ -1410,7 +1410,7 @@ void wxHtmlHelpFrame::OnIndexFind(wxCommandEvent& event) wxBusyCursor bcur; const wxChar *cstr = sr.c_str(); wxChar mybuff[512]; - wxChar *ptr; + wxChar *ptr; bool first = TRUE; m_IndexList->Clear(); @@ -1426,11 +1426,11 @@ void wxHtmlHelpFrame::OnIndexFind(wxCommandEvent& event) if (*ptr >= _T('A') && *ptr <= _T('Z')) *ptr -= (wxChar)(_T('A') - _T('a')); if (wxStrstr(mybuff, cstr) != NULL) - { + { m_IndexList->Append(index[i].m_Name, (char*)(index + i)); displ++; if (first) - { + { if (index[i].m_Page[0] != 0) m_HtmlWin->LoadPage(index[i].GetFullPath()); NotifyPageChanged(); @@ -1461,7 +1461,7 @@ void wxHtmlHelpFrame::OnIndexAll(wxCommandEvent& WXUNUSED(event)) { m_IndexList->Append(index[i].m_Name, (char*)(index + i)); if (first) - { + { if (index[i].m_Page[0] != 0) m_HtmlWin->LoadPage(index[i].GetFullPath()); NotifyPageChanged(); @@ -1538,4 +1538,5 @@ BEGIN_EVENT_TABLE(wxHtmlHelpFrame, wxFrame) EVT_CLOSE(wxHtmlHelpFrame::OnCloseWindow) END_EVENT_TABLE() -#endif +#endif // wxUSE_WXHTML_HELP + diff --git a/src/motif/files.lst b/src/motif/files.lst index de6dd1410c..84c1b4cb83 100644 --- a/src/motif/files.lst +++ b/src/motif/files.lst @@ -1,4 +1,4 @@ -# This file was automatically generated by tmake at 20:23, 2001/07/02 +# This file was automatically generated by tmake at 21:37, 2001/07/03 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE MOTIF.T! ALL_SOURCES = \ generic/busyinfo.cpp \ @@ -33,7 +33,8 @@ ALL_SOURCES = \ generic/propform.cpp \ generic/proplist.cpp \ generic/sashwin.cpp \ - generic/scrolwin.cpp \ + generic/scrlwing.cpp \ + generic/spinctlg.cpp \ generic/splash.cpp \ generic/splitter.cpp \ generic/statline.cpp \ @@ -87,6 +88,7 @@ ALL_SOURCES = \ common/fs_mem.cpp \ common/fs_zip.cpp \ common/ftp.cpp \ + common/gaugecmn.cpp \ common/gdicmn.cpp \ common/geometry.cpp \ common/gifdecod.cpp \ @@ -623,6 +625,7 @@ COMMONOBJS = \ fs_mem.o \ fs_zip.o \ ftp.o \ + gaugecmn.o \ gdicmn.o \ geometry.o \ gifdecod.o \ @@ -738,6 +741,7 @@ COMMONDEPS = \ fs_mem.d \ fs_zip.d \ ftp.d \ + gaugecmn.d \ gdicmn.d \ geometry.d \ gifdecod.d \ @@ -843,7 +847,8 @@ GENERICOBJS = \ propform.o \ proplist.o \ sashwin.o \ - scrolwin.o \ + scrlwing.o \ + spinctlg.o \ splash.o \ splitter.o \ statline.o \ @@ -890,7 +895,8 @@ GENERICDEPS = \ propform.d \ proplist.d \ sashwin.d \ - scrolwin.d \ + scrlwing.d \ + spinctlg.d \ splash.d \ splitter.d \ statline.d \ diff --git a/src/msw/files.lst b/src/msw/files.lst index 9d5797fab4..13424fd721 100644 --- a/src/msw/files.lst +++ b/src/msw/files.lst @@ -1,4 +1,4 @@ -# This file was automatically generated by tmake at 20:23, 2001/07/02 +# This file was automatically generated by tmake at 21:37, 2001/07/03 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE MSW.T! ALL_SOURCES = \ generic/busyinfo.cpp \ @@ -18,7 +18,8 @@ ALL_SOURCES = \ generic/propform.cpp \ generic/proplist.cpp \ generic/sashwin.cpp \ - generic/scrolwin.cpp \ + generic/scrlwing.cpp \ + generic/spinctlg.cpp \ generic/splash.cpp \ generic/splitter.cpp \ generic/statusbr.cpp \ @@ -70,6 +71,7 @@ ALL_SOURCES = \ common/fs_mem.cpp \ common/fs_zip.cpp \ common/ftp.cpp \ + common/gaugecmn.cpp \ common/gdicmn.cpp \ common/geometry.cpp \ common/gifdecod.cpp \ @@ -677,6 +679,7 @@ COMMONOBJS = \ fs_mem.o \ fs_zip.o \ ftp.o \ + gaugecmn.o \ gdicmn.o \ geometry.o \ gifdecod.o \ @@ -792,6 +795,7 @@ COMMONDEPS = \ fs_mem.d \ fs_zip.d \ ftp.d \ + gaugecmn.d \ gdicmn.d \ geometry.d \ gifdecod.d \ @@ -882,7 +886,8 @@ GENERICOBJS = \ propform.o \ proplist.o \ sashwin.o \ - scrolwin.o \ + scrlwing.o \ + spinctlg.o \ splash.o \ splitter.o \ statusbr.o \ @@ -912,7 +917,8 @@ GENERICDEPS = \ propform.d \ proplist.d \ sashwin.d \ - scrolwin.d \ + scrlwing.d \ + spinctlg.d \ splash.d \ splitter.d \ statusbr.d \ diff --git a/src/msw/makefile.b32 b/src/msw/makefile.b32 index 4cedcb2ca4..5a4bd9dc98 100644 --- a/src/msw/makefile.b32 +++ b/src/msw/makefile.b32 @@ -1,6 +1,6 @@ -# This file was automatically generated by tmake at 20:23, 2001/07/02 +# This file was automatically generated by tmake at 21:37, 2001/07/03 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE B32.T! # @@ -88,7 +88,8 @@ GENERICOBJS= $(MSWDIR)\busyinfo.obj \ $(MSWDIR)\propform.obj \ $(MSWDIR)\proplist.obj \ $(MSWDIR)\sashwin.obj \ - $(MSWDIR)\scrolwin.obj \ + $(MSWDIR)\scrlwing.obj \ + $(MSWDIR)\spinctlg.obj \ $(MSWDIR)\splash.obj \ $(MSWDIR)\splitter.obj \ $(MSWDIR)\statusbr.obj \ @@ -154,6 +155,7 @@ COMMONOBJS = \ $(MSWDIR)\fs_mem.obj \ $(MSWDIR)\fs_zip.obj \ $(MSWDIR)\ftp.obj \ + $(MSWDIR)\gaugecmn.obj \ $(MSWDIR)\gdicmn.obj \ $(MSWDIR)\geometry.obj \ $(MSWDIR)\gifdecod.obj \ @@ -693,6 +695,8 @@ $(MSWDIR)\fs_zip.obj: $(COMMDIR)\fs_zip.$(SRCSUFF) $(MSWDIR)\ftp.obj: $(COMMDIR)\ftp.$(SRCSUFF) +$(MSWDIR)\gaugecmn.obj: $(COMMDIR)\gaugecmn.$(SRCSUFF) + $(MSWDIR)\gdicmn.obj: $(COMMDIR)\gdicmn.$(SRCSUFF) $(MSWDIR)\geometry.obj: $(COMMDIR)\geometry.$(SRCSUFF) @@ -877,7 +881,9 @@ $(MSWDIR)\proplist.obj: $(GENDIR)\proplist.$(SRCSUFF) $(MSWDIR)\sashwin.obj: $(GENDIR)\sashwin.$(SRCSUFF) -$(MSWDIR)\scrolwin.obj: $(GENDIR)\scrolwin.$(SRCSUFF) +$(MSWDIR)\scrlwing.obj: $(GENDIR)\scrlwing.$(SRCSUFF) + +$(MSWDIR)\spinctlg.obj: $(GENDIR)\spinctlg.$(SRCSUFF) $(MSWDIR)\splash.obj: $(GENDIR)\splash.$(SRCSUFF) diff --git a/src/msw/makefile.bcc b/src/msw/makefile.bcc index 2b8088af68..bb10e7eee7 100644 --- a/src/msw/makefile.bcc +++ b/src/msw/makefile.bcc @@ -1,6 +1,6 @@ -# This file was automatically generated by tmake at 20:23, 2001/07/02 +# This file was automatically generated by tmake at 21:37, 2001/07/03 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE BCC.T! # @@ -88,7 +88,8 @@ GENERICOBJS= $(MSWDIR)\busyinfo.obj \ $(MSWDIR)\propform.obj \ $(MSWDIR)\proplist.obj \ $(MSWDIR)\sashwin.obj \ - $(MSWDIR)\scrolwin.obj \ + $(MSWDIR)\scrlwing.obj \ + $(MSWDIR)\spinctlg.obj \ $(MSWDIR)\splash.obj \ $(MSWDIR)\splitter.obj \ $(MSWDIR)\statusbr.obj \ @@ -140,6 +141,7 @@ COMMONOBJS = \ $(MSWDIR)\fs_inet.obj \ $(MSWDIR)\fs_mem.obj \ $(MSWDIR)\fs_zip.obj \ + $(MSWDIR)\gaugecmn.obj \ $(MSWDIR)\gdicmn.obj \ $(MSWDIR)\geometry.obj \ $(MSWDIR)\gifdecod.obj \ @@ -559,6 +561,8 @@ $(MSWDIR)\fs_mem.obj: $(COMMDIR)\fs_mem.$(SRCSUFF) $(MSWDIR)\fs_zip.obj: $(COMMDIR)\fs_zip.$(SRCSUFF) +$(MSWDIR)\gaugecmn.obj: $(COMMDIR)\gaugecmn.$(SRCSUFF) + $(MSWDIR)\gdicmn.obj: $(COMMDIR)\gdicmn.$(SRCSUFF) $(MSWDIR)\geometry.obj: $(COMMDIR)\geometry.$(SRCSUFF) @@ -723,7 +727,9 @@ $(MSWDIR)\proplist.obj: $(GENDIR)\proplist.$(SRCSUFF) $(MSWDIR)\sashwin.obj: $(GENDIR)\sashwin.$(SRCSUFF) -$(MSWDIR)\scrolwin.obj: $(GENDIR)\scrolwin.$(SRCSUFF) +$(MSWDIR)\scrlwing.obj: $(GENDIR)\scrlwing.$(SRCSUFF) + +$(MSWDIR)\spinctlg.obj: $(GENDIR)\spinctlg.$(SRCSUFF) $(MSWDIR)\splash.obj: $(GENDIR)\splash.$(SRCSUFF) diff --git a/src/msw/makefile.dos b/src/msw/makefile.dos index 903c6e7411..48f475ae3d 100644 --- a/src/msw/makefile.dos +++ b/src/msw/makefile.dos @@ -1,4 +1,4 @@ -# This file was automatically generated by tmake at 20:23, 2001/07/02 +# This file was automatically generated by tmake at 21:37, 2001/07/03 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE DOS.T! # @@ -71,7 +71,8 @@ GENERICOBJS= $(GENDIR)\busyinfo.obj \ $(GENDIR)\propform.obj \ $(GENDIR)\proplist.obj \ $(GENDIR)\sashwin.obj \ - $(GENDIR)\scrolwin.obj \ + $(GENDIR)\scrlwing.obj \ + $(GENDIR)\spinctlg.obj \ $(GENDIR)\splash.obj \ $(GENDIR)\splitter.obj \ $(GENDIR)\statusbr.obj \ @@ -124,6 +125,7 @@ COMMONOBJS1 = \ $(COMMDIR)\fs_inet.obj \ $(COMMDIR)\fs_mem.obj \ $(COMMDIR)\fs_zip.obj \ + $(COMMDIR)\gaugecmn.obj \ $(COMMDIR)\gdicmn.obj \ $(COMMDIR)\geometry.obj \ $(COMMDIR)\gifdecod.obj \ @@ -941,6 +943,11 @@ $(COMMDIR)/fs_zip.obj: $*.$(SRCSUFF) $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) << +$(COMMDIR)/gaugecmn.obj: $*.$(SRCSUFF) + cl @<< +$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) +<< + $(COMMDIR)/gdicmn.obj: $*.$(SRCSUFF) cl @<< $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) @@ -1336,7 +1343,12 @@ $(GENDIR)/sashwin.obj: $*.$(SRCSUFF) $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) << -$(GENDIR)/scrolwin.obj: $*.$(SRCSUFF) +$(GENDIR)/scrlwing.obj: $*.$(SRCSUFF) + cl @<< +$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) +<< + +$(GENDIR)/spinctlg.obj: $*.$(SRCSUFF) cl @<< $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) << diff --git a/src/msw/makefile.g95 b/src/msw/makefile.g95 index bb562e2ed5..f8c6369172 100644 --- a/src/msw/makefile.g95 +++ b/src/msw/makefile.g95 @@ -1,4 +1,4 @@ -# This file was automatically generated by tmake at 20:23, 2001/07/02 +# This file was automatically generated by tmake at 21:37, 2001/07/03 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE G95.T! # @@ -84,7 +84,8 @@ GENERICOBJS = \ $(GENDIR)/propform.$(OBJSUFF) \ $(GENDIR)/proplist.$(OBJSUFF) \ $(GENDIR)/sashwin.$(OBJSUFF) \ - $(GENDIR)/scrolwin.$(OBJSUFF) \ + $(GENDIR)/scrlwing.$(OBJSUFF) \ + $(GENDIR)/spinctlg.$(OBJSUFF) \ $(GENDIR)/splash.$(OBJSUFF) \ $(GENDIR)/splitter.$(OBJSUFF) \ $(GENDIR)/statusbr.$(OBJSUFF) \ @@ -139,6 +140,7 @@ COMMONOBJS = \ $(COMMDIR)/fs_mem.$(OBJSUFF) \ $(COMMDIR)/fs_zip.$(OBJSUFF) \ $(COMMDIR)/ftp.$(OBJSUFF) \ + $(COMMDIR)/gaugecmn.$(OBJSUFF) \ $(COMMDIR)/gdicmn.$(OBJSUFF) \ $(COMMDIR)/geometry.$(OBJSUFF) \ $(COMMDIR)/gifdecod.$(OBJSUFF) \ diff --git a/src/msw/makefile.sc b/src/msw/makefile.sc index 6517842006..08d4dfd928 100644 --- a/src/msw/makefile.sc +++ b/src/msw/makefile.sc @@ -1,6 +1,6 @@ -# This file was automatically generated by tmake at 20:23, 2001/07/02 +# This file was automatically generated by tmake at 21:37, 2001/07/03 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE SC.T! # Symantec C++ makefile for the msw objects @@ -42,7 +42,8 @@ GENERICOBJS= $(GENDIR)\busyinfo.obj \ $(GENDIR)\propform.obj \ $(GENDIR)\proplist.obj \ $(GENDIR)\sashwin.obj \ - $(GENDIR)\scrolwin.obj \ + $(GENDIR)\scrlwing.obj \ + $(GENDIR)\spinctlg.obj \ $(GENDIR)\splash.obj \ $(GENDIR)\splitter.obj \ $(GENDIR)\statusbr.obj \ @@ -97,6 +98,7 @@ COMMONOBJS = \ $(COMMDIR)\fs_mem.obj \ $(COMMDIR)\fs_zip.obj \ $(COMMDIR)\ftp.obj \ + $(COMMDIR)\gaugecmn.obj \ $(COMMDIR)\gdicmn.obj \ $(COMMDIR)\geometry.obj \ $(COMMDIR)\gifdecod.obj \ diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc index baecd51df2..a16ebeedd3 100644 --- a/src/msw/makefile.vc +++ b/src/msw/makefile.vc @@ -1,4 +1,4 @@ -# This file was automatically generated by tmake at 20:23, 2001/07/02 +# This file was automatically generated by tmake at 21:37, 2001/07/03 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE VC.T! # File: makefile.vc @@ -102,7 +102,8 @@ GENERICOBJS= ..\generic\$D\busyinfo.obj \ ..\generic\$D\propform.obj \ ..\generic\$D\proplist.obj \ ..\generic\$D\sashwin.obj \ - ..\generic\$D\scrolwin.obj \ + ..\generic\$D\scrlwing.obj \ + ..\generic\$D\spinctlg.obj \ ..\generic\$D\splash.obj \ ..\generic\$D\splitter.obj \ ..\generic\$D\statusbr.obj \ @@ -180,6 +181,7 @@ COMMONOBJS = \ ..\common\$D\fs_mem.obj \ ..\common\$D\fs_zip.obj \ ..\common\$D\ftp.obj \ + ..\common\$D\gaugecmn.obj \ ..\common\$D\gdicmn.obj \ ..\common\$D\geometry.obj \ ..\common\$D\gifdecod.obj \ diff --git a/src/msw/makefile.wat b/src/msw/makefile.wat index 40c7e79f93..9679ff2684 100644 --- a/src/msw/makefile.wat +++ b/src/msw/makefile.wat @@ -1,6 +1,6 @@ #!/binb/wmake.exe -# This file was automatically generated by tmake at 20:23, 2001/07/02 +# This file was automatically generated by tmake at 21:37, 2001/07/03 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE WAT.T! # @@ -58,7 +58,8 @@ GENERICOBJS= busyinfo.obj & propform.obj & proplist.obj & sashwin.obj & - scrolwin.obj & + scrlwing.obj & + spinctlg.obj & splash.obj & splitter.obj & statusbr.obj & @@ -136,6 +137,7 @@ COMMONOBJS = & fs_mem.obj & fs_zip.obj & ftp.obj & + gaugecmn.obj & gdicmn.obj & geometry.obj & gifdecod.obj & @@ -808,6 +810,9 @@ fs_zip.obj: $(COMMDIR)\fs_zip.cpp ftp.obj: $(COMMDIR)\ftp.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +gaugecmn.obj: $(COMMDIR)\gaugecmn.cpp + *$(CCC) $(CPPFLAGS) $(IFLAGS) $< + gdicmn.obj: $(COMMDIR)\gdicmn.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< @@ -1092,7 +1097,10 @@ proplist.obj: $(GENDIR)\proplist.cpp sashwin.obj: $(GENDIR)\sashwin.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< -scrolwin.obj: $(GENDIR)\scrolwin.cpp +scrlwing.obj: $(GENDIR)\scrlwing.cpp + *$(CCC) $(CPPFLAGS) $(IFLAGS) $< + +spinctlg.obj: $(GENDIR)\spinctlg.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< splash.obj: $(GENDIR)\splash.cpp diff --git a/src/univ/files.lst b/src/univ/files.lst index a880cd0817..9e533293e7 100644 --- a/src/univ/files.lst +++ b/src/univ/files.lst @@ -1,17 +1,18 @@ -# This file was automatically generated by tmake at 20:23, 2001/07/02 +# This file was automatically generated by tmake at 21:37, 2001/07/03 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE GTK.T! UNIVOBJS = \ bmpbuttn.o \ button.o \ checkbox.o \ checklst.o \ - cmdproc.o \ colschem.o \ control.o \ framuniv.o \ + gauge.o \ gtk.o \ inphand.o \ listbox.o \ + notebook.o \ radiobox.o \ radiobut.o \ renderer.o \ @@ -34,13 +35,14 @@ UNIVDEPS = \ button.d \ checkbox.d \ checklst.d \ - cmdproc.d \ colschem.d \ control.d \ framuniv.d \ + gauge.d \ gtk.d \ inphand.d \ listbox.d \ + notebook.d \ radiobox.d \ radiobut.d \ renderer.d \ diff --git a/src/univ/framuniv.cpp b/src/univ/framuniv.cpp index 392227d60f..fdd0927bf6 100644 --- a/src/univ/framuniv.cpp +++ b/src/univ/framuniv.cpp @@ -68,19 +68,22 @@ wxFrame::wxFrame(wxWindow *parent, } // ---------------------------------------------------------------------------- -// geometry +// menu support // ---------------------------------------------------------------------------- void wxFrame::OnSize(wxSizeEvent& event) { +#if wxUSE_MENUS PositionMenuBar(); +#endif // wxUSE_WAVE event.Skip(); } +#if wxUSE_MENUS + void wxFrame::PositionMenuBar() { -#if wxUSE_MENUS if ( m_frameMenuBar ) { // the menubar is positioned above the client size, hence the negative @@ -88,9 +91,10 @@ void wxFrame::PositionMenuBar() m_frameMenuBar->SetSize(0, -m_frameMenuBar->GetSize().y, GetClientSize().x, -1); } -#endif // wxUSE_MENUS } +#endif // wxUSE_MENUS + wxPoint wxFrame::GetClientAreaOrigin() const { wxPoint pt = wxFrameNative::GetClientAreaOrigin(); diff --git a/src/univ/stattext.cpp b/src/univ/stattext.cpp index bef5b6e80e..589179cd9c 100644 --- a/src/univ/stattext.cpp +++ b/src/univ/stattext.cpp @@ -42,6 +42,8 @@ // implementation // ============================================================================ +IMPLEMENT_ABSTRACT_CLASS(wxStaticText, wxControl) + // ---------------------------------------------------------------------------- // creation // ---------------------------------------------------------------------------- diff --git a/src/univ/themes/gtk.cpp b/src/univ/themes/gtk.cpp index 68e3117dbc..131d81a17a 100644 --- a/src/univ/themes/gtk.cpp +++ b/src/univ/themes/gtk.cpp @@ -1454,11 +1454,13 @@ void wxGTKRenderer::DrawRadioButton(wxDC& dc, // text control // ---------------------------------------------------------------------------- +static const int TEXT_BORDER = 2; + wxRect wxGTKRenderer::GetTextTotalArea(const wxTextCtrl *text, const wxRect& rect) { wxRect rectTotal = rect; - rectTotal.Inflate(2); + rectTotal.Inflate(TEXT_BORDER); return rectTotal; } @@ -1467,7 +1469,7 @@ wxRect wxGTKRenderer::GetTextClientArea(const wxTextCtrl *text, wxCoord *extraSpaceBeyond) { wxRect rectText = rect; - rectText.Inflate(-2); + rectText.Inflate(-TEXT_BORDER); if ( text->WrapLines() ) { diff --git a/src/univ/themes/win32.cpp b/src/univ/themes/win32.cpp index 0289dd747f..15b397e6a7 100644 --- a/src/univ/themes/win32.cpp +++ b/src/univ/themes/win32.cpp @@ -1801,14 +1801,6 @@ void wxWin32Renderer::DoDrawLabel(wxDC& dc, { if ( focusOffset.x || focusOffset.y ) { - // before calling Inflate(), ensure that we will have a valid rect - // afterwards - if ( rectLabel.x < focusOffset.x ) - rectLabel.x = focusOffset.x; - - if ( rectLabel.y < focusOffset.y ) - rectLabel.y = focusOffset.y; - rectLabel.Inflate(focusOffset.x, focusOffset.y); } @@ -2419,6 +2411,8 @@ void wxWin32Renderer::DrawSliderTicks(wxDC& dc, // menu and menubar // ---------------------------------------------------------------------------- +#if wxUSE_MENUS + // wxWin32MenuGeometryInfo: the wxMenuGeometryInfo used by wxWin32Renderer class WXDLLEXPORT wxWin32MenuGeometryInfo : public wxMenuGeometryInfo { @@ -2447,6 +2441,8 @@ private: GetMenuGeometry(wxWindow *, const wxMenu&) const; }; +#endif // wxUSE_WAVE + // FIXME: all constants are hardcoded but shouldn't be static const wxCoord MENU_LEFT_MARGIN = 9; static const wxCoord MENU_RIGHT_MARGIN = 18; @@ -2466,6 +2462,10 @@ static const wxCoord MENU_SEPARATOR_HEIGHT = 3; // the size of the standard checkmark bitmap static const wxCoord MENU_CHECK_SIZE = 9; +// we can't implement these methods without wxMenuGeometryInfo implementation +// which we don't have if !wxUSE_MENUS +#if wxUSE_MENUS + void wxWin32Renderer::DrawMenuBarItem(wxDC& dc, const wxRect& rectOrig, const wxString& label, @@ -2677,6 +2677,47 @@ wxMenuGeometryInfo *wxWin32Renderer::GetMenuGeometry(wxWindow *win, return gi; } +#else // !wxUSE_MENUS + +void wxWin32Renderer::DrawMenuBarItem(wxDC& WXUNUSED(dc), + const wxRect& WXUNUSED(rectOrig), + const wxString& WXUNUSED(label), + int WXUNUSED(flags), + int WXUNUSED(indexAccel)) +{ +} + +void wxWin32Renderer::DrawMenuItem(wxDC& WXUNUSED(dc), + wxCoord WXUNUSED(y), + const wxMenuGeometryInfo& WXUNUSED(gi), + const wxString& WXUNUSED(label), + const wxString& WXUNUSED(accel), + const wxBitmap& WXUNUSED(bitmap), + int WXUNUSED(flags), + int WXUNUSED(indexAccel)) +{ +} + +void wxWin32Renderer::DrawMenuSeparator(wxDC& WXUNUSED(dc), + wxCoord WXUNUSED(y), + const wxMenuGeometryInfo& WXUNUSED(gi)) +{ +} + +wxSize wxWin32Renderer::GetMenuBarItemSize(const wxSize& size) const +{ + return size; +} + +wxMenuGeometryInfo * +wxWin32Renderer::GetMenuGeometry(wxWindow *WXUNUSED(win), + const wxMenu& WXUNUSED(menu)) const +{ + return NULL; +} + +#endif // wxUSE_MENUS/!wxUSE_MENUS + // ---------------------------------------------------------------------------- // combobox // ---------------------------------------------------------------------------- @@ -2880,11 +2921,6 @@ wxRect wxWin32Renderer::GetTextTotalArea(const wxTextCtrl *text, wxRect rectTotal = rect; wxCoord widthBorder = GetTextBorderWidth(); - if ( rectTotal.x < widthBorder ) - rectTotal.x = widthBorder; - if ( rectTotal.y < widthBorder ) - rectTotal.y = widthBorder; - rectTotal.Inflate(widthBorder); // this is what Windows does @@ -2904,11 +2940,6 @@ wxRect wxWin32Renderer::GetTextClientArea(const wxTextCtrl *text, rectText.height--; wxCoord widthBorder = GetTextBorderWidth(); - if ( rectText.width < 2*widthBorder ) - rectText.width = 2*widthBorder; - if ( rectText.height < 2*widthBorder ) - rectText.height = 2*widthBorder; - rectText.Inflate(-widthBorder); if ( extraSpaceBeyond ) diff --git a/src/univ/winuniv.cpp b/src/univ/winuniv.cpp index 80eb9968e1..b3d73e3ed4 100644 --- a/src/univ/winuniv.cpp +++ b/src/univ/winuniv.cpp @@ -482,6 +482,15 @@ wxPoint wxWindow::GetClientAreaOrigin() const void wxWindow::DoGetClientSize(int *width, int *height) const { + // if it is a native window, we assume it handles the scrollbars itself + // too - and if it doesn't, there is not much we can do + if ( !m_renderer ) + { + wxWindowNative::DoGetClientSize(width, height); + + return; + } + int w, h; wxWindowNative::DoGetClientSize(&w, &h); -- 2.45.2