From: Robin Dunn Date: Fri, 28 Mar 2003 23:05:05 +0000 (+0000) Subject: Added wxTLW::SetShape and implementations for wxGTK, wxMSW and an X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/1542ea396a625766c59d683adbb1d613c1344d50 Added wxTLW::SetShape and implementations for wxGTK, wxMSW and an empty stub for wxMac. Added some generic helpers and a new ctor to wxRegion. Added samples/shaped. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19857 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/configure b/configure index 7ed797611d..3e5cc6439f 100755 --- a/configure +++ b/configure @@ -194,8 +194,6 @@ ac_help="$ac_help --enable-cmdline use wxCmdLineParser class" ac_help="$ac_help --enable-datetime use wxDateTime class" -ac_help="$ac_help - --enable-timedate use obsolete wxDate/wxTime classes" ac_help="$ac_help --enable-stopwatch use wxStopWatch class" ac_help="$ac_help @@ -330,8 +328,6 @@ ac_help="$ac_help --enable-gauge use wxGauge class" ac_help="$ac_help --enable-grid use wxGrid class" -ac_help="$ac_help - --enable-newgrid use new wxGrid class" ac_help="$ac_help --enable-imaglist use wxImageList class" ac_help="$ac_help @@ -1026,7 +1022,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:1030: checking host system type" >&5 +echo "configure:1026: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -1047,7 +1043,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:1051: checking target system type" >&5 +echo "configure:1047: checking target system type" >&5 target_alias=$target case "$target_alias" in @@ -1065,7 +1061,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:1069: checking build system type" >&5 +echo "configure:1065: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -1452,7 +1448,6 @@ if test $DEBUG_CONFIGURE = 1; then DEFAULT_wxUSE_STD_IOSTREAM=no DEFAULT_wxUSE_CMDLINE_PARSER=no DEFAULT_wxUSE_DATETIME=no - DEFAULT_wxUSE_TIMEDATE=no DEFAULT_wxUSE_TIMER=no DEFAULT_wxUSE_STOPWATCH=no DEFAULT_wxUSE_FILE=no @@ -1543,7 +1538,6 @@ if test $DEBUG_CONFIGURE = 1; then DEFAULT_wxUSE_DISPLAY=no DEFAULT_wxUSE_GAUGE=no DEFAULT_wxUSE_GRID=no - DEFAULT_wxUSE_NEW_GRID=no DEFAULT_wxUSE_IMAGLIST=no DEFAULT_wxUSE_LISTBOX=no DEFAULT_wxUSE_LISTCTRL=no @@ -1628,7 +1622,6 @@ else DEFAULT_wxUSE_STD_IOSTREAM=no DEFAULT_wxUSE_CMDLINE_PARSER=yes DEFAULT_wxUSE_DATETIME=yes - DEFAULT_wxUSE_TIMEDATE=no DEFAULT_wxUSE_TIMER=yes DEFAULT_wxUSE_STOPWATCH=yes DEFAULT_wxUSE_FILE=yes @@ -1719,7 +1712,6 @@ else DEFAULT_wxUSE_DISPLAY=no DEFAULT_wxUSE_GAUGE=yes DEFAULT_wxUSE_GRID=yes - DEFAULT_wxUSE_NEW_GRID=yes DEFAULT_wxUSE_IMAGLIST=yes DEFAULT_wxUSE_LISTBOX=yes DEFAULT_wxUSE_LISTCTRL=yes @@ -1777,7 +1769,7 @@ done enablestring= echo $ac_n "checking for --${enablestring:-enable}-gui""... $ac_c" 1>&6 -echo "configure:1781: checking for --${enablestring:-enable}-gui" >&5 +echo "configure:1773: checking for --${enablestring:-enable}-gui" >&5 no_cache=0 # Check whether --enable-gui or --disable-gui was given. if test "${enable_gui+set}" = set; then @@ -1820,7 +1812,7 @@ if test "$wxUSE_GUI" = "yes"; then enablestring= echo $ac_n "checking for --${enablestring:-enable}-universal""... $ac_c" 1>&6 -echo "configure:1824: checking for --${enablestring:-enable}-universal" >&5 +echo "configure:1816: checking for --${enablestring:-enable}-universal" >&5 no_cache=0 # Check whether --enable-universal or --disable-universal was given. if test "${enable_universal+set}" = set; then @@ -1920,7 +1912,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-nanox""... $ac_c" 1>&6 -echo "configure:1924: checking for --${enablestring:-enable}-nanox" >&5 +echo "configure:1916: checking for --${enablestring:-enable}-nanox" >&5 no_cache=0 # Check whether --enable-nanox or --disable-nanox was given. if test "${enable_nanox+set}" = set; then @@ -1961,7 +1953,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-gtk2""... $ac_c" 1>&6 -echo "configure:1965: checking for --${enablestring:-enable}-gtk2" >&5 +echo "configure:1957: checking for --${enablestring:-enable}-gtk2" >&5 no_cache=0 # Check whether --enable-gtk2 or --disable-gtk2 was given. if test "${enable_gtk2+set}" = set; then @@ -2001,7 +1993,7 @@ fi echo $ac_n "checking for --with-libpng""... $ac_c" 1>&6 -echo "configure:2005: checking for --with-libpng" >&5 +echo "configure:1997: checking for --with-libpng" >&5 no_cache=0 # Check whether --with-libpng or --without-libpng was given. if test "${with_libpng+set}" = set; then @@ -2052,7 +2044,7 @@ fi echo $ac_n "checking for --with-libjpeg""... $ac_c" 1>&6 -echo "configure:2056: checking for --with-libjpeg" >&5 +echo "configure:2048: checking for --with-libjpeg" >&5 no_cache=0 # Check whether --with-libjpeg or --without-libjpeg was given. if test "${with_libjpeg+set}" = set; then @@ -2103,7 +2095,7 @@ fi echo $ac_n "checking for --with-libtiff""... $ac_c" 1>&6 -echo "configure:2107: checking for --with-libtiff" >&5 +echo "configure:2099: checking for --with-libtiff" >&5 no_cache=0 # Check whether --with-libtiff or --without-libtiff was given. if test "${with_libtiff+set}" = set; then @@ -2154,7 +2146,7 @@ fi echo $ac_n "checking for --with-opengl""... $ac_c" 1>&6 -echo "configure:2158: checking for --with-opengl" >&5 +echo "configure:2150: checking for --with-opengl" >&5 no_cache=0 # Check whether --with-opengl or --without-opengl was given. if test "${with_opengl+set}" = set; then @@ -2196,7 +2188,7 @@ fi echo $ac_n "checking for --with-dmalloc""... $ac_c" 1>&6 -echo "configure:2200: checking for --with-dmalloc" >&5 +echo "configure:2192: checking for --with-dmalloc" >&5 no_cache=0 # Check whether --with-dmalloc or --without-dmalloc was given. if test "${with_dmalloc+set}" = set; then @@ -2235,7 +2227,7 @@ fi echo $ac_n "checking for --with-regex""... $ac_c" 1>&6 -echo "configure:2239: checking for --with-regex" >&5 +echo "configure:2231: checking for --with-regex" >&5 no_cache=0 # Check whether --with-regex or --without-regex was given. if test "${with_regex+set}" = set; then @@ -2286,7 +2278,7 @@ fi echo $ac_n "checking for --with-zlib""... $ac_c" 1>&6 -echo "configure:2290: checking for --with-zlib" >&5 +echo "configure:2282: checking for --with-zlib" >&5 no_cache=0 # Check whether --with-zlib or --without-zlib was given. if test "${with_zlib+set}" = set; then @@ -2337,7 +2329,7 @@ fi echo $ac_n "checking for --with-odbc""... $ac_c" 1>&6 -echo "configure:2341: checking for --with-odbc" >&5 +echo "configure:2333: checking for --with-odbc" >&5 no_cache=0 # Check whether --with-odbc or --without-odbc was given. if test "${with_odbc+set}" = set; then @@ -2379,7 +2371,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-shared""... $ac_c" 1>&6 -echo "configure:2383: checking for --${enablestring:-enable}-shared" >&5 +echo "configure:2375: checking for --${enablestring:-enable}-shared" >&5 no_cache=0 # Check whether --enable-shared or --disable-shared was given. if test "${enable_shared+set}" = set; then @@ -2419,7 +2411,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-soname""... $ac_c" 1>&6 -echo "configure:2423: checking for --${enablestring:-enable}-soname" >&5 +echo "configure:2415: checking for --${enablestring:-enable}-soname" >&5 no_cache=0 # Check whether --enable-soname or --disable-soname was given. if test "${enable_soname+set}" = set; then @@ -2459,7 +2451,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-optimise""... $ac_c" 1>&6 -echo "configure:2463: checking for --${enablestring:-enable}-optimise" >&5 +echo "configure:2455: checking for --${enablestring:-enable}-optimise" >&5 no_cache=0 # Check whether --enable-optimise or --disable-optimise was given. if test "${enable_optimise+set}" = set; then @@ -2499,7 +2491,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-debug""... $ac_c" 1>&6 -echo "configure:2503: checking for --${enablestring:-enable}-debug" >&5 +echo "configure:2495: checking for --${enablestring:-enable}-debug" >&5 no_cache=0 # Check whether --enable-debug or --disable-debug was given. if test "${enable_debug+set}" = set; then @@ -2540,7 +2532,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-precomp""... $ac_c" 1>&6 -echo "configure:2544: checking for --${enablestring:-enable}-precomp" >&5 +echo "configure:2536: checking for --${enablestring:-enable}-precomp" >&5 no_cache=0 # Check whether --enable-precomp or --disable-precomp was given. if test "${enable_precomp+set}" = set; then @@ -2589,7 +2581,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-debug_flag""... $ac_c" 1>&6 -echo "configure:2593: checking for --${enablestring:-enable}-debug_flag" >&5 +echo "configure:2585: checking for --${enablestring:-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 @@ -2629,7 +2621,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-debug_info""... $ac_c" 1>&6 -echo "configure:2633: checking for --${enablestring:-enable}-debug_info" >&5 +echo "configure:2625: checking for --${enablestring:-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 @@ -2669,7 +2661,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-debug_gdb""... $ac_c" 1>&6 -echo "configure:2673: checking for --${enablestring:-enable}-debug_gdb" >&5 +echo "configure:2665: checking for --${enablestring:-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 @@ -2709,7 +2701,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-debug_cntxt""... $ac_c" 1>&6 -echo "configure:2713: checking for --${enablestring:-enable}-debug_cntxt" >&5 +echo "configure:2705: checking for --${enablestring:-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 @@ -2749,7 +2741,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-mem_tracing""... $ac_c" 1>&6 -echo "configure:2753: checking for --${enablestring:-enable}-mem_tracing" >&5 +echo "configure:2745: checking for --${enablestring:-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 @@ -2789,7 +2781,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-profile""... $ac_c" 1>&6 -echo "configure:2793: checking for --${enablestring:-enable}-profile" >&5 +echo "configure:2785: checking for --${enablestring:-enable}-profile" >&5 no_cache=0 # Check whether --enable-profile or --disable-profile was given. if test "${enable_profile+set}" = set; then @@ -2829,7 +2821,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-no_rtti""... $ac_c" 1>&6 -echo "configure:2833: checking for --${enablestring:-enable}-no_rtti" >&5 +echo "configure:2825: checking for --${enablestring:-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 @@ -2869,7 +2861,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-no_exceptions""... $ac_c" 1>&6 -echo "configure:2873: checking for --${enablestring:-enable}-no_exceptions" >&5 +echo "configure:2865: checking for --${enablestring:-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 @@ -2909,7 +2901,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-permissive""... $ac_c" 1>&6 -echo "configure:2913: checking for --${enablestring:-enable}-permissive" >&5 +echo "configure:2905: checking for --${enablestring:-enable}-permissive" >&5 no_cache=0 # Check whether --enable-permissive or --disable-permissive was given. if test "${enable_permissive+set}" = set; then @@ -2949,7 +2941,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-no_deps""... $ac_c" 1>&6 -echo "configure:2953: checking for --${enablestring:-enable}-no_deps" >&5 +echo "configure:2945: checking for --${enablestring:-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 @@ -2990,7 +2982,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-compat20""... $ac_c" 1>&6 -echo "configure:2994: checking for --${enablestring:-enable}-compat20" >&5 +echo "configure:2986: checking for --${enablestring:-enable}-compat20" >&5 no_cache=0 # Check whether --enable-compat20 or --disable-compat20 was given. if test "${enable_compat20+set}" = set; then @@ -3030,7 +3022,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-compat22""... $ac_c" 1>&6 -echo "configure:3034: checking for --${enablestring:-enable}-compat22" >&5 +echo "configure:3026: checking for --${enablestring:-enable}-compat22" >&5 no_cache=0 # Check whether --enable-compat22 or --disable-compat22 was given. if test "${enable_compat22+set}" = set; then @@ -3070,7 +3062,7 @@ fi enablestring=disable echo $ac_n "checking for --${enablestring:-enable}-compat24""... $ac_c" 1>&6 -echo "configure:3074: checking for --${enablestring:-enable}-compat24" >&5 +echo "configure:3066: checking for --${enablestring:-enable}-compat24" >&5 no_cache=0 # Check whether --enable-compat24 or --disable-compat24 was given. if test "${enable_compat24+set}" = set; then @@ -3124,7 +3116,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-intl""... $ac_c" 1>&6 -echo "configure:3128: checking for --${enablestring:-enable}-intl" >&5 +echo "configure:3120: checking for --${enablestring:-enable}-intl" >&5 no_cache=0 # Check whether --enable-intl or --disable-intl was given. if test "${enable_intl+set}" = set; then @@ -3164,7 +3156,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-config""... $ac_c" 1>&6 -echo "configure:3168: checking for --${enablestring:-enable}-config" >&5 +echo "configure:3160: checking for --${enablestring:-enable}-config" >&5 no_cache=0 # Check whether --enable-config or --disable-config was given. if test "${enable_config+set}" = set; then @@ -3205,7 +3197,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-protocols""... $ac_c" 1>&6 -echo "configure:3209: checking for --${enablestring:-enable}-protocols" >&5 +echo "configure:3201: checking for --${enablestring:-enable}-protocols" >&5 no_cache=0 # Check whether --enable-protocols or --disable-protocols was given. if test "${enable_protocols+set}" = set; then @@ -3245,7 +3237,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-ftp""... $ac_c" 1>&6 -echo "configure:3249: checking for --${enablestring:-enable}-ftp" >&5 +echo "configure:3241: checking for --${enablestring:-enable}-ftp" >&5 no_cache=0 # Check whether --enable-ftp or --disable-ftp was given. if test "${enable_ftp+set}" = set; then @@ -3285,7 +3277,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-http""... $ac_c" 1>&6 -echo "configure:3289: checking for --${enablestring:-enable}-http" >&5 +echo "configure:3281: checking for --${enablestring:-enable}-http" >&5 no_cache=0 # Check whether --enable-http or --disable-http was given. if test "${enable_http+set}" = set; then @@ -3325,7 +3317,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-fileproto""... $ac_c" 1>&6 -echo "configure:3329: checking for --${enablestring:-enable}-fileproto" >&5 +echo "configure:3321: checking for --${enablestring:-enable}-fileproto" >&5 no_cache=0 # Check whether --enable-fileproto or --disable-fileproto was given. if test "${enable_fileproto+set}" = set; then @@ -3365,7 +3357,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-sockets""... $ac_c" 1>&6 -echo "configure:3369: checking for --${enablestring:-enable}-sockets" >&5 +echo "configure:3361: checking for --${enablestring:-enable}-sockets" >&5 no_cache=0 # Check whether --enable-sockets or --disable-sockets was given. if test "${enable_sockets+set}" = set; then @@ -3405,7 +3397,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-ole""... $ac_c" 1>&6 -echo "configure:3409: checking for --${enablestring:-enable}-ole" >&5 +echo "configure:3401: checking for --${enablestring:-enable}-ole" >&5 no_cache=0 # Check whether --enable-ole or --disable-ole was given. if test "${enable_ole+set}" = set; then @@ -3445,7 +3437,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-dataobj""... $ac_c" 1>&6 -echo "configure:3449: checking for --${enablestring:-enable}-dataobj" >&5 +echo "configure:3441: checking for --${enablestring:-enable}-dataobj" >&5 no_cache=0 # Check whether --enable-dataobj or --disable-dataobj was given. if test "${enable_dataobj+set}" = set; then @@ -3486,7 +3478,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-ipc""... $ac_c" 1>&6 -echo "configure:3490: checking for --${enablestring:-enable}-ipc" >&5 +echo "configure:3482: checking for --${enablestring:-enable}-ipc" >&5 no_cache=0 # Check whether --enable-ipc or --disable-ipc was given. if test "${enable_ipc+set}" = set; then @@ -3527,7 +3519,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-cmdline""... $ac_c" 1>&6 -echo "configure:3531: checking for --${enablestring:-enable}-cmdline" >&5 +echo "configure:3523: checking for --${enablestring:-enable}-cmdline" >&5 no_cache=0 # Check whether --enable-cmdline or --disable-cmdline was given. if test "${enable_cmdline+set}" = set; then @@ -3567,7 +3559,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-datetime""... $ac_c" 1>&6 -echo "configure:3571: checking for --${enablestring:-enable}-datetime" >&5 +echo "configure:3563: checking for --${enablestring:-enable}-datetime" >&5 no_cache=0 # Check whether --enable-datetime or --disable-datetime was given. if test "${enable_datetime+set}" = set; then @@ -3605,49 +3597,9 @@ fi fi - enablestring= - echo $ac_n "checking for --${enablestring:-enable}-timedate""... $ac_c" 1>&6 -echo "configure:3611: checking for --${enablestring:-enable}-timedate" >&5 - no_cache=0 - # Check whether --enable-timedate or --disable-timedate was given. -if test "${enable_timedate+set}" = set; then - enableval="$enable_timedate" - - if test "$enableval" = yes; then - ac_cv_use_timedate='wxUSE_TIMEDATE=yes' - else - ac_cv_use_timedate='wxUSE_TIMEDATE=no' - fi - -else - - LINE=`grep "wxUSE_TIMEDATE" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - - ac_cv_use_timedate='wxUSE_TIMEDATE='$DEFAULT_wxUSE_TIMEDATE - -fi - - - eval "$ac_cv_use_timedate" - if test "$no_cache" != 1; then - echo $ac_cv_use_timedate >> ${wx_arg_cache_file}.tmp - fi - - if test "$wxUSE_TIMEDATE" = yes; then - echo "$ac_t""yes" 1>&6 - else - echo "$ac_t""no" 1>&6 - fi - - enablestring= echo $ac_n "checking for --${enablestring:-enable}-stopwatch""... $ac_c" 1>&6 -echo "configure:3651: checking for --${enablestring:-enable}-stopwatch" >&5 +echo "configure:3603: checking for --${enablestring:-enable}-stopwatch" >&5 no_cache=0 # Check whether --enable-stopwatch or --disable-stopwatch was given. if test "${enable_stopwatch+set}" = set; then @@ -3687,7 +3639,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-dialupman""... $ac_c" 1>&6 -echo "configure:3691: checking for --${enablestring:-enable}-dialupman" >&5 +echo "configure:3643: checking for --${enablestring:-enable}-dialupman" >&5 no_cache=0 # Check whether --enable-dialupman or --disable-dialupman was given. if test "${enable_dialupman+set}" = set; then @@ -3727,7 +3679,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-apple_ieee""... $ac_c" 1>&6 -echo "configure:3731: checking for --${enablestring:-enable}-apple_ieee" >&5 +echo "configure:3683: checking for --${enablestring:-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 @@ -3767,7 +3719,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-timer""... $ac_c" 1>&6 -echo "configure:3771: checking for --${enablestring:-enable}-timer" >&5 +echo "configure:3723: checking for --${enablestring:-enable}-timer" >&5 no_cache=0 # Check whether --enable-timer or --disable-timer was given. if test "${enable_timer+set}" = set; then @@ -3807,7 +3759,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-wave""... $ac_c" 1>&6 -echo "configure:3811: checking for --${enablestring:-enable}-wave" >&5 +echo "configure:3763: checking for --${enablestring:-enable}-wave" >&5 no_cache=0 # Check whether --enable-wave or --disable-wave was given. if test "${enable_wave+set}" = set; then @@ -3847,7 +3799,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-fraction""... $ac_c" 1>&6 -echo "configure:3851: checking for --${enablestring:-enable}-fraction" >&5 +echo "configure:3803: checking for --${enablestring:-enable}-fraction" >&5 no_cache=0 # Check whether --enable-fraction or --disable-fraction was given. if test "${enable_fraction+set}" = set; then @@ -3887,7 +3839,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-dynlib""... $ac_c" 1>&6 -echo "configure:3891: checking for --${enablestring:-enable}-dynlib" >&5 +echo "configure:3843: checking for --${enablestring:-enable}-dynlib" >&5 no_cache=0 # Check whether --enable-dynlib or --disable-dynlib was given. if test "${enable_dynlib+set}" = set; then @@ -3927,7 +3879,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-dynamicloader""... $ac_c" 1>&6 -echo "configure:3931: checking for --${enablestring:-enable}-dynamicloader" >&5 +echo "configure:3883: checking for --${enablestring:-enable}-dynamicloader" >&5 no_cache=0 # Check whether --enable-dynamicloader or --disable-dynamicloader was given. if test "${enable_dynamicloader+set}" = set; then @@ -3967,7 +3919,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-longlong""... $ac_c" 1>&6 -echo "configure:3971: checking for --${enablestring:-enable}-longlong" >&5 +echo "configure:3923: checking for --${enablestring:-enable}-longlong" >&5 no_cache=0 # Check whether --enable-longlong or --disable-longlong was given. if test "${enable_longlong+set}" = set; then @@ -4007,7 +3959,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-geometry""... $ac_c" 1>&6 -echo "configure:4011: checking for --${enablestring:-enable}-geometry" >&5 +echo "configure:3963: checking for --${enablestring:-enable}-geometry" >&5 no_cache=0 # Check whether --enable-geometry or --disable-geometry was given. if test "${enable_geometry+set}" = set; then @@ -4047,7 +3999,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-log""... $ac_c" 1>&6 -echo "configure:4051: checking for --${enablestring:-enable}-log" >&5 +echo "configure:4003: checking for --${enablestring:-enable}-log" >&5 no_cache=0 # Check whether --enable-log or --disable-log was given. if test "${enable_log+set}" = set; then @@ -4087,7 +4039,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-streams""... $ac_c" 1>&6 -echo "configure:4091: checking for --${enablestring:-enable}-streams" >&5 +echo "configure:4043: checking for --${enablestring:-enable}-streams" >&5 no_cache=0 # Check whether --enable-streams or --disable-streams was given. if test "${enable_streams+set}" = set; then @@ -4127,7 +4079,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-file""... $ac_c" 1>&6 -echo "configure:4131: checking for --${enablestring:-enable}-file" >&5 +echo "configure:4083: checking for --${enablestring:-enable}-file" >&5 no_cache=0 # Check whether --enable-file or --disable-file was given. if test "${enable_file+set}" = set; then @@ -4167,7 +4119,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-ffile""... $ac_c" 1>&6 -echo "configure:4171: checking for --${enablestring:-enable}-ffile" >&5 +echo "configure:4123: checking for --${enablestring:-enable}-ffile" >&5 no_cache=0 # Check whether --enable-ffile or --disable-ffile was given. if test "${enable_ffile+set}" = set; then @@ -4207,7 +4159,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-textbuf""... $ac_c" 1>&6 -echo "configure:4211: checking for --${enablestring:-enable}-textbuf" >&5 +echo "configure:4163: checking for --${enablestring:-enable}-textbuf" >&5 no_cache=0 # Check whether --enable-textbuf or --disable-textbuf was given. if test "${enable_textbuf+set}" = set; then @@ -4247,7 +4199,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-textfile""... $ac_c" 1>&6 -echo "configure:4251: checking for --${enablestring:-enable}-textfile" >&5 +echo "configure:4203: checking for --${enablestring:-enable}-textfile" >&5 no_cache=0 # Check whether --enable-textfile or --disable-textfile was given. if test "${enable_textfile+set}" = set; then @@ -4287,7 +4239,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-fontmap""... $ac_c" 1>&6 -echo "configure:4291: checking for --${enablestring:-enable}-fontmap" >&5 +echo "configure:4243: checking for --${enablestring:-enable}-fontmap" >&5 no_cache=0 # Check whether --enable-fontmap or --disable-fontmap was given. if test "${enable_fontmap+set}" = set; then @@ -4327,7 +4279,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-unicode""... $ac_c" 1>&6 -echo "configure:4331: checking for --${enablestring:-enable}-unicode" >&5 +echo "configure:4283: checking for --${enablestring:-enable}-unicode" >&5 no_cache=0 # Check whether --enable-unicode or --disable-unicode was given. if test "${enable_unicode+set}" = set; then @@ -4367,7 +4319,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-mslu""... $ac_c" 1>&6 -echo "configure:4371: checking for --${enablestring:-enable}-mslu" >&5 +echo "configure:4323: checking for --${enablestring:-enable}-mslu" >&5 no_cache=0 # Check whether --enable-mslu or --disable-mslu was given. if test "${enable_mslu+set}" = set; then @@ -4407,7 +4359,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-wxprintfv""... $ac_c" 1>&6 -echo "configure:4411: checking for --${enablestring:-enable}-wxprintfv" >&5 +echo "configure:4363: checking for --${enablestring:-enable}-wxprintfv" >&5 no_cache=0 # Check whether --enable-wxprintfv or --disable-wxprintfv was given. if test "${enable_wxprintfv+set}" = set; then @@ -4447,7 +4399,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-std_iostreams""... $ac_c" 1>&6 -echo "configure:4451: checking for --${enablestring:-enable}-std_iostreams" >&5 +echo "configure:4403: checking for --${enablestring:-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 @@ -4487,7 +4439,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-filesystem""... $ac_c" 1>&6 -echo "configure:4491: checking for --${enablestring:-enable}-filesystem" >&5 +echo "configure:4443: checking for --${enablestring:-enable}-filesystem" >&5 no_cache=0 # Check whether --enable-filesystem or --disable-filesystem was given. if test "${enable_filesystem+set}" = set; then @@ -4527,7 +4479,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-fs_inet""... $ac_c" 1>&6 -echo "configure:4531: checking for --${enablestring:-enable}-fs_inet" >&5 +echo "configure:4483: checking for --${enablestring:-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 @@ -4567,7 +4519,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-fs_zip""... $ac_c" 1>&6 -echo "configure:4571: checking for --${enablestring:-enable}-fs_zip" >&5 +echo "configure:4523: checking for --${enablestring:-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 @@ -4607,7 +4559,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-zipstream""... $ac_c" 1>&6 -echo "configure:4611: checking for --${enablestring:-enable}-zipstream" >&5 +echo "configure:4563: checking for --${enablestring:-enable}-zipstream" >&5 no_cache=0 # Check whether --enable-zipstream or --disable-zipstream was given. if test "${enable_zipstream+set}" = set; then @@ -4648,7 +4600,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-catch_segvs""... $ac_c" 1>&6 -echo "configure:4652: checking for --${enablestring:-enable}-catch_segvs" >&5 +echo "configure:4604: checking for --${enablestring:-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 @@ -4688,7 +4640,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-snglinst""... $ac_c" 1>&6 -echo "configure:4692: checking for --${enablestring:-enable}-snglinst" >&5 +echo "configure:4644: checking for --${enablestring:-enable}-snglinst" >&5 no_cache=0 # Check whether --enable-snglinst or --disable-snglinst was given. if test "${enable_snglinst+set}" = set; then @@ -4729,7 +4681,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-mimetype""... $ac_c" 1>&6 -echo "configure:4733: checking for --${enablestring:-enable}-mimetype" >&5 +echo "configure:4685: checking for --${enablestring:-enable}-mimetype" >&5 no_cache=0 # Check whether --enable-mimetype or --disable-mimetype was given. if test "${enable_mimetype+set}" = set; then @@ -4769,7 +4721,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-system_options""... $ac_c" 1>&6 -echo "configure:4773: checking for --${enablestring:-enable}-system_options" >&5 +echo "configure:4725: checking for --${enablestring:-enable}-system_options" >&5 no_cache=0 # Check whether --enable-system_options or --disable-system_options was given. if test "${enable_system_options+set}" = set; then @@ -4810,7 +4762,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-url""... $ac_c" 1>&6 -echo "configure:4814: checking for --${enablestring:-enable}-url" >&5 +echo "configure:4766: checking for --${enablestring:-enable}-url" >&5 no_cache=0 # Check whether --enable-url or --disable-url was given. if test "${enable_url+set}" = set; then @@ -4850,7 +4802,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-protocol""... $ac_c" 1>&6 -echo "configure:4854: checking for --${enablestring:-enable}-protocol" >&5 +echo "configure:4806: checking for --${enablestring:-enable}-protocol" >&5 no_cache=0 # Check whether --enable-protocol or --disable-protocol was given. if test "${enable_protocol+set}" = set; then @@ -4890,7 +4842,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-protocol_http""... $ac_c" 1>&6 -echo "configure:4894: checking for --${enablestring:-enable}-protocol_http" >&5 +echo "configure:4846: checking for --${enablestring:-enable}-protocol_http" >&5 no_cache=0 # Check whether --enable-protocol_http or --disable-protocol_http was given. if test "${enable_protocol_http+set}" = set; then @@ -4930,7 +4882,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-protocol_ftp""... $ac_c" 1>&6 -echo "configure:4934: checking for --${enablestring:-enable}-protocol_ftp" >&5 +echo "configure:4886: checking for --${enablestring:-enable}-protocol_ftp" >&5 no_cache=0 # Check whether --enable-protocol_ftp or --disable-protocol_ftp was given. if test "${enable_protocol_ftp+set}" = set; then @@ -4970,7 +4922,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-protocol_file""... $ac_c" 1>&6 -echo "configure:4974: checking for --${enablestring:-enable}-protocol_file" >&5 +echo "configure:4926: checking for --${enablestring:-enable}-protocol_file" >&5 no_cache=0 # Check whether --enable-protocol_file or --disable-protocol_file was given. if test "${enable_protocol_file+set}" = set; then @@ -5013,7 +4965,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-threads""... $ac_c" 1>&6 -echo "configure:5017: checking for --${enablestring:-enable}-threads" >&5 +echo "configure:4969: checking for --${enablestring:-enable}-threads" >&5 no_cache=0 # Check whether --enable-threads or --disable-threads was given. if test "${enable_threads+set}" = set; then @@ -5057,7 +5009,7 @@ if test "$wxUSE_GUI" = "yes"; then enablestring= echo $ac_n "checking for --${enablestring:-enable}-docview""... $ac_c" 1>&6 -echo "configure:5061: checking for --${enablestring:-enable}-docview" >&5 +echo "configure:5013: checking for --${enablestring:-enable}-docview" >&5 no_cache=0 # Check whether --enable-docview or --disable-docview was given. if test "${enable_docview+set}" = set; then @@ -5097,7 +5049,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-help""... $ac_c" 1>&6 -echo "configure:5101: checking for --${enablestring:-enable}-help" >&5 +echo "configure:5053: checking for --${enablestring:-enable}-help" >&5 no_cache=0 # Check whether --enable-help or --disable-help was given. if test "${enable_help+set}" = set; then @@ -5137,7 +5089,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-mshtmlhelp""... $ac_c" 1>&6 -echo "configure:5141: checking for --${enablestring:-enable}-mshtmlhelp" >&5 +echo "configure:5093: checking for --${enablestring:-enable}-mshtmlhelp" >&5 no_cache=0 # Check whether --enable-mshtmlhelp or --disable-mshtmlhelp was given. if test "${enable_mshtmlhelp+set}" = set; then @@ -5177,7 +5129,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-html""... $ac_c" 1>&6 -echo "configure:5181: checking for --${enablestring:-enable}-html" >&5 +echo "configure:5133: checking for --${enablestring:-enable}-html" >&5 no_cache=0 # Check whether --enable-html or --disable-html was given. if test "${enable_html+set}" = set; then @@ -5217,7 +5169,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-htmlhelp""... $ac_c" 1>&6 -echo "configure:5221: checking for --${enablestring:-enable}-htmlhelp" >&5 +echo "configure:5173: checking for --${enablestring:-enable}-htmlhelp" >&5 no_cache=0 # Check whether --enable-htmlhelp or --disable-htmlhelp was given. if test "${enable_htmlhelp+set}" = set; then @@ -5257,7 +5209,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-constraints""... $ac_c" 1>&6 -echo "configure:5261: checking for --${enablestring:-enable}-constraints" >&5 +echo "configure:5213: checking for --${enablestring:-enable}-constraints" >&5 no_cache=0 # Check whether --enable-constraints or --disable-constraints was given. if test "${enable_constraints+set}" = set; then @@ -5297,7 +5249,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-printarch""... $ac_c" 1>&6 -echo "configure:5301: checking for --${enablestring:-enable}-printarch" >&5 +echo "configure:5253: checking for --${enablestring:-enable}-printarch" >&5 no_cache=0 # Check whether --enable-printarch or --disable-printarch was given. if test "${enable_printarch+set}" = set; then @@ -5337,7 +5289,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-mdi""... $ac_c" 1>&6 -echo "configure:5341: checking for --${enablestring:-enable}-mdi" >&5 +echo "configure:5293: checking for --${enablestring:-enable}-mdi" >&5 no_cache=0 # Check whether --enable-mdi or --disable-mdi was given. if test "${enable_mdi+set}" = set; then @@ -5377,7 +5329,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-loggui""... $ac_c" 1>&6 -echo "configure:5381: checking for --${enablestring:-enable}-loggui" >&5 +echo "configure:5333: checking for --${enablestring:-enable}-loggui" >&5 no_cache=0 # Check whether --enable-loggui or --disable-loggui was given. if test "${enable_loggui+set}" = set; then @@ -5417,7 +5369,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-logwin""... $ac_c" 1>&6 -echo "configure:5421: checking for --${enablestring:-enable}-logwin" >&5 +echo "configure:5373: checking for --${enablestring:-enable}-logwin" >&5 no_cache=0 # Check whether --enable-logwin or --disable-logwin was given. if test "${enable_logwin+set}" = set; then @@ -5457,7 +5409,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-logdialog""... $ac_c" 1>&6 -echo "configure:5461: checking for --${enablestring:-enable}-logdialog" >&5 +echo "configure:5413: checking for --${enablestring:-enable}-logdialog" >&5 no_cache=0 # Check whether --enable-logdialog or --disable-logdialog was given. if test "${enable_logdialog+set}" = set; then @@ -5498,7 +5450,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-postscript""... $ac_c" 1>&6 -echo "configure:5502: checking for --${enablestring:-enable}-postscript" >&5 +echo "configure:5454: checking for --${enablestring:-enable}-postscript" >&5 no_cache=0 # Check whether --enable-postscript or --disable-postscript was given. if test "${enable_postscript+set}" = set; then @@ -5541,7 +5493,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-prologio""... $ac_c" 1>&6 -echo "configure:5545: checking for --${enablestring:-enable}-prologio" >&5 +echo "configure:5497: checking for --${enablestring:-enable}-prologio" >&5 no_cache=0 # Check whether --enable-prologio or --disable-prologio was given. if test "${enable_prologio+set}" = set; then @@ -5581,7 +5533,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-resources""... $ac_c" 1>&6 -echo "configure:5585: checking for --${enablestring:-enable}-resources" >&5 +echo "configure:5537: checking for --${enablestring:-enable}-resources" >&5 no_cache=0 # Check whether --enable-resources or --disable-resources was given. if test "${enable_resources+set}" = set; then @@ -5622,7 +5574,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-xresources""... $ac_c" 1>&6 -echo "configure:5626: checking for --${enablestring:-enable}-xresources" >&5 +echo "configure:5578: checking for --${enablestring:-enable}-xresources" >&5 no_cache=0 # Check whether --enable-xresources or --disable-xresources was given. if test "${enable_xresources+set}" = set; then @@ -5664,7 +5616,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-clipboard""... $ac_c" 1>&6 -echo "configure:5668: checking for --${enablestring:-enable}-clipboard" >&5 +echo "configure:5620: checking for --${enablestring:-enable}-clipboard" >&5 no_cache=0 # Check whether --enable-clipboard or --disable-clipboard was given. if test "${enable_clipboard+set}" = set; then @@ -5704,7 +5656,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-dnd""... $ac_c" 1>&6 -echo "configure:5708: checking for --${enablestring:-enable}-dnd" >&5 +echo "configure:5660: checking for --${enablestring:-enable}-dnd" >&5 no_cache=0 # Check whether --enable-dnd or --disable-dnd was given. if test "${enable_dnd+set}" = set; then @@ -5744,7 +5696,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-metafile""... $ac_c" 1>&6 -echo "configure:5748: checking for --${enablestring:-enable}-metafile" >&5 +echo "configure:5700: checking for --${enablestring:-enable}-metafile" >&5 no_cache=0 # Check whether --enable-metafile or --disable-metafile was given. if test "${enable_metafile+set}" = set; then @@ -5785,7 +5737,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-treelayout""... $ac_c" 1>&6 -echo "configure:5789: checking for --${enablestring:-enable}-treelayout" >&5 +echo "configure:5741: checking for --${enablestring:-enable}-treelayout" >&5 no_cache=0 # Check whether --enable-treelayout or --disable-treelayout was given. if test "${enable_treelayout+set}" = set; then @@ -5827,7 +5779,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-controls""... $ac_c" 1>&6 -echo "configure:5831: checking for --${enablestring:-enable}-controls" >&5 +echo "configure:5783: checking for --${enablestring:-enable}-controls" >&5 no_cache=0 # Check whether --enable-controls or --disable-controls was given. if test "${enable_controls+set}" = set; then @@ -5877,7 +5829,6 @@ if test "$wxUSE_CONTROLS" = "yes"; then DEFAULT_wxUSE_CHOICE=yes DEFAULT_wxUSE_GAUGE=yes DEFAULT_wxUSE_GRID=yes - DEFAULT_wxUSE_NEW_GRID=yes DEFAULT_wxUSE_IMAGLIST=yes DEFAULT_wxUSE_LISTBOX=yes DEFAULT_wxUSE_LISTCTRL=yes @@ -5916,7 +5867,6 @@ elif test "$wxUSE_CONTROLS" = "no"; then DEFAULT_wxUSE_CHOICE=no DEFAULT_wxUSE_GAUGE=no DEFAULT_wxUSE_GRID=no - DEFAULT_wxUSE_NEW_GRID=no DEFAULT_wxUSE_IMAGLIST=no DEFAULT_wxUSE_LISTBOX=no DEFAULT_wxUSE_LISTCTRL=no @@ -5968,7 +5918,6 @@ if test "x$wxUSE_COCOA" != "x" -a "$wxUSE_COCOA" != "0" ; then DEFAULT_wxUSE_FINDREPLDLG=no DEFAULT_wxUSE_FONTDLG=no DEFAULT_wxUSE_GRID=no - DEFAULT_wxUSE_NEW_GRID=no DEFAULT_wxUSE_NUMBERDLG=no DEFAULT_wxUSE_PROGRESSDLG=no DEFAULT_wxUSE_PROPSHEET=no @@ -5983,7 +5932,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-accel""... $ac_c" 1>&6 -echo "configure:5987: checking for --${enablestring:-enable}-accel" >&5 +echo "configure:5936: checking for --${enablestring:-enable}-accel" >&5 no_cache=0 # Check whether --enable-accel or --disable-accel was given. if test "${enable_accel+set}" = set; then @@ -6023,7 +5972,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-button""... $ac_c" 1>&6 -echo "configure:6027: checking for --${enablestring:-enable}-button" >&5 +echo "configure:5976: checking for --${enablestring:-enable}-button" >&5 no_cache=0 # Check whether --enable-button or --disable-button was given. if test "${enable_button+set}" = set; then @@ -6063,7 +6012,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-bmpbutton""... $ac_c" 1>&6 -echo "configure:6067: checking for --${enablestring:-enable}-bmpbutton" >&5 +echo "configure:6016: checking for --${enablestring:-enable}-bmpbutton" >&5 no_cache=0 # Check whether --enable-bmpbutton or --disable-bmpbutton was given. if test "${enable_bmpbutton+set}" = set; then @@ -6103,7 +6052,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-calendar""... $ac_c" 1>&6 -echo "configure:6107: checking for --${enablestring:-enable}-calendar" >&5 +echo "configure:6056: checking for --${enablestring:-enable}-calendar" >&5 no_cache=0 # Check whether --enable-calendar or --disable-calendar was given. if test "${enable_calendar+set}" = set; then @@ -6143,7 +6092,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-caret""... $ac_c" 1>&6 -echo "configure:6147: checking for --${enablestring:-enable}-caret" >&5 +echo "configure:6096: checking for --${enablestring:-enable}-caret" >&5 no_cache=0 # Check whether --enable-caret or --disable-caret was given. if test "${enable_caret+set}" = set; then @@ -6183,7 +6132,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-checkbox""... $ac_c" 1>&6 -echo "configure:6187: checking for --${enablestring:-enable}-checkbox" >&5 +echo "configure:6136: checking for --${enablestring:-enable}-checkbox" >&5 no_cache=0 # Check whether --enable-checkbox or --disable-checkbox was given. if test "${enable_checkbox+set}" = set; then @@ -6223,7 +6172,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-checklst""... $ac_c" 1>&6 -echo "configure:6227: checking for --${enablestring:-enable}-checklst" >&5 +echo "configure:6176: checking for --${enablestring:-enable}-checklst" >&5 no_cache=0 # Check whether --enable-checklst or --disable-checklst was given. if test "${enable_checklst+set}" = set; then @@ -6263,7 +6212,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-choice""... $ac_c" 1>&6 -echo "configure:6267: checking for --${enablestring:-enable}-choice" >&5 +echo "configure:6216: checking for --${enablestring:-enable}-choice" >&5 no_cache=0 # Check whether --enable-choice or --disable-choice was given. if test "${enable_choice+set}" = set; then @@ -6303,7 +6252,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-combobox""... $ac_c" 1>&6 -echo "configure:6307: checking for --${enablestring:-enable}-combobox" >&5 +echo "configure:6256: checking for --${enablestring:-enable}-combobox" >&5 no_cache=0 # Check whether --enable-combobox or --disable-combobox was given. if test "${enable_combobox+set}" = set; then @@ -6343,7 +6292,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-display""... $ac_c" 1>&6 -echo "configure:6347: checking for --${enablestring:-enable}-display" >&5 +echo "configure:6296: checking for --${enablestring:-enable}-display" >&5 no_cache=0 # Check whether --enable-display or --disable-display was given. if test "${enable_display+set}" = set; then @@ -6383,7 +6332,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-gauge""... $ac_c" 1>&6 -echo "configure:6387: checking for --${enablestring:-enable}-gauge" >&5 +echo "configure:6336: checking for --${enablestring:-enable}-gauge" >&5 no_cache=0 # Check whether --enable-gauge or --disable-gauge was given. if test "${enable_gauge+set}" = set; then @@ -6423,7 +6372,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-grid""... $ac_c" 1>&6 -echo "configure:6427: checking for --${enablestring:-enable}-grid" >&5 +echo "configure:6376: checking for --${enablestring:-enable}-grid" >&5 no_cache=0 # Check whether --enable-grid or --disable-grid was given. if test "${enable_grid+set}" = set; then @@ -6461,49 +6410,9 @@ fi fi - enablestring= - echo $ac_n "checking for --${enablestring:-enable}-newgrid""... $ac_c" 1>&6 -echo "configure:6467: checking for --${enablestring:-enable}-newgrid" >&5 - no_cache=0 - # Check whether --enable-newgrid or --disable-newgrid was given. -if test "${enable_newgrid+set}" = set; then - enableval="$enable_newgrid" - - if test "$enableval" = yes; then - ac_cv_use_newgrid='wxUSE_NEW_GRID=yes' - else - ac_cv_use_newgrid='wxUSE_NEW_GRID=no' - fi - -else - - LINE=`grep "wxUSE_NEW_GRID" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - - ac_cv_use_newgrid='wxUSE_NEW_GRID='$DEFAULT_wxUSE_NEW_GRID - -fi - - - eval "$ac_cv_use_newgrid" - if test "$no_cache" != 1; then - echo $ac_cv_use_newgrid >> ${wx_arg_cache_file}.tmp - fi - - if test "$wxUSE_NEW_GRID" = yes; then - echo "$ac_t""yes" 1>&6 - else - echo "$ac_t""no" 1>&6 - fi - - enablestring= echo $ac_n "checking for --${enablestring:-enable}-imaglist""... $ac_c" 1>&6 -echo "configure:6507: checking for --${enablestring:-enable}-imaglist" >&5 +echo "configure:6416: checking for --${enablestring:-enable}-imaglist" >&5 no_cache=0 # Check whether --enable-imaglist or --disable-imaglist was given. if test "${enable_imaglist+set}" = set; then @@ -6543,7 +6452,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-listbox""... $ac_c" 1>&6 -echo "configure:6547: checking for --${enablestring:-enable}-listbox" >&5 +echo "configure:6456: checking for --${enablestring:-enable}-listbox" >&5 no_cache=0 # Check whether --enable-listbox or --disable-listbox was given. if test "${enable_listbox+set}" = set; then @@ -6583,7 +6492,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-listctrl""... $ac_c" 1>&6 -echo "configure:6587: checking for --${enablestring:-enable}-listctrl" >&5 +echo "configure:6496: checking for --${enablestring:-enable}-listctrl" >&5 no_cache=0 # Check whether --enable-listctrl or --disable-listctrl was given. if test "${enable_listctrl+set}" = set; then @@ -6623,7 +6532,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-notebook""... $ac_c" 1>&6 -echo "configure:6627: checking for --${enablestring:-enable}-notebook" >&5 +echo "configure:6536: checking for --${enablestring:-enable}-notebook" >&5 no_cache=0 # Check whether --enable-notebook or --disable-notebook was given. if test "${enable_notebook+set}" = set; then @@ -6663,7 +6572,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-propsheet""... $ac_c" 1>&6 -echo "configure:6667: checking for --${enablestring:-enable}-propsheet" >&5 +echo "configure:6576: checking for --${enablestring:-enable}-propsheet" >&5 no_cache=0 # Check whether --enable-propsheet or --disable-propsheet was given. if test "${enable_propsheet+set}" = set; then @@ -6703,7 +6612,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-radiobox""... $ac_c" 1>&6 -echo "configure:6707: checking for --${enablestring:-enable}-radiobox" >&5 +echo "configure:6616: checking for --${enablestring:-enable}-radiobox" >&5 no_cache=0 # Check whether --enable-radiobox or --disable-radiobox was given. if test "${enable_radiobox+set}" = set; then @@ -6743,7 +6652,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-radiobtn""... $ac_c" 1>&6 -echo "configure:6747: checking for --${enablestring:-enable}-radiobtn" >&5 +echo "configure:6656: checking for --${enablestring:-enable}-radiobtn" >&5 no_cache=0 # Check whether --enable-radiobtn or --disable-radiobtn was given. if test "${enable_radiobtn+set}" = set; then @@ -6783,7 +6692,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-sash""... $ac_c" 1>&6 -echo "configure:6787: checking for --${enablestring:-enable}-sash" >&5 +echo "configure:6696: checking for --${enablestring:-enable}-sash" >&5 no_cache=0 # Check whether --enable-sash or --disable-sash was given. if test "${enable_sash+set}" = set; then @@ -6823,7 +6732,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-scrollbar""... $ac_c" 1>&6 -echo "configure:6827: checking for --${enablestring:-enable}-scrollbar" >&5 +echo "configure:6736: checking for --${enablestring:-enable}-scrollbar" >&5 no_cache=0 # Check whether --enable-scrollbar or --disable-scrollbar was given. if test "${enable_scrollbar+set}" = set; then @@ -6863,7 +6772,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-slider""... $ac_c" 1>&6 -echo "configure:6867: checking for --${enablestring:-enable}-slider" >&5 +echo "configure:6776: checking for --${enablestring:-enable}-slider" >&5 no_cache=0 # Check whether --enable-slider or --disable-slider was given. if test "${enable_slider+set}" = set; then @@ -6903,7 +6812,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-spinbtn""... $ac_c" 1>&6 -echo "configure:6907: checking for --${enablestring:-enable}-spinbtn" >&5 +echo "configure:6816: checking for --${enablestring:-enable}-spinbtn" >&5 no_cache=0 # Check whether --enable-spinbtn or --disable-spinbtn was given. if test "${enable_spinbtn+set}" = set; then @@ -6943,7 +6852,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-spinctrl""... $ac_c" 1>&6 -echo "configure:6947: checking for --${enablestring:-enable}-spinctrl" >&5 +echo "configure:6856: checking for --${enablestring:-enable}-spinctrl" >&5 no_cache=0 # Check whether --enable-spinctrl or --disable-spinctrl was given. if test "${enable_spinctrl+set}" = set; then @@ -6983,7 +6892,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-splitter""... $ac_c" 1>&6 -echo "configure:6987: checking for --${enablestring:-enable}-splitter" >&5 +echo "configure:6896: checking for --${enablestring:-enable}-splitter" >&5 no_cache=0 # Check whether --enable-splitter or --disable-splitter was given. if test "${enable_splitter+set}" = set; then @@ -7023,7 +6932,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-statbmp""... $ac_c" 1>&6 -echo "configure:7027: checking for --${enablestring:-enable}-statbmp" >&5 +echo "configure:6936: checking for --${enablestring:-enable}-statbmp" >&5 no_cache=0 # Check whether --enable-statbmp or --disable-statbmp was given. if test "${enable_statbmp+set}" = set; then @@ -7063,7 +6972,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-statbox""... $ac_c" 1>&6 -echo "configure:7067: checking for --${enablestring:-enable}-statbox" >&5 +echo "configure:6976: checking for --${enablestring:-enable}-statbox" >&5 no_cache=0 # Check whether --enable-statbox or --disable-statbox was given. if test "${enable_statbox+set}" = set; then @@ -7103,7 +7012,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-statline""... $ac_c" 1>&6 -echo "configure:7107: checking for --${enablestring:-enable}-statline" >&5 +echo "configure:7016: checking for --${enablestring:-enable}-statline" >&5 no_cache=0 # Check whether --enable-statline or --disable-statline was given. if test "${enable_statline+set}" = set; then @@ -7143,7 +7052,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-stattext""... $ac_c" 1>&6 -echo "configure:7147: checking for --${enablestring:-enable}-stattext" >&5 +echo "configure:7056: checking for --${enablestring:-enable}-stattext" >&5 no_cache=0 # Check whether --enable-stattext or --disable-stattext was given. if test "${enable_stattext+set}" = set; then @@ -7183,7 +7092,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-statusbar""... $ac_c" 1>&6 -echo "configure:7187: checking for --${enablestring:-enable}-statusbar" >&5 +echo "configure:7096: checking for --${enablestring:-enable}-statusbar" >&5 no_cache=0 # Check whether --enable-statusbar or --disable-statusbar was given. if test "${enable_statusbar+set}" = set; then @@ -7223,7 +7132,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-tabdialog""... $ac_c" 1>&6 -echo "configure:7227: checking for --${enablestring:-enable}-tabdialog" >&5 +echo "configure:7136: checking for --${enablestring:-enable}-tabdialog" >&5 no_cache=0 # Check whether --enable-tabdialog or --disable-tabdialog was given. if test "${enable_tabdialog+set}" = set; then @@ -7263,7 +7172,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-textctrl""... $ac_c" 1>&6 -echo "configure:7267: checking for --${enablestring:-enable}-textctrl" >&5 +echo "configure:7176: checking for --${enablestring:-enable}-textctrl" >&5 no_cache=0 # Check whether --enable-textctrl or --disable-textctrl was given. if test "${enable_textctrl+set}" = set; then @@ -7303,7 +7212,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-togglebtn""... $ac_c" 1>&6 -echo "configure:7307: checking for --${enablestring:-enable}-togglebtn" >&5 +echo "configure:7216: checking for --${enablestring:-enable}-togglebtn" >&5 no_cache=0 # Check whether --enable-togglebtn or --disable-togglebtn was given. if test "${enable_togglebtn+set}" = set; then @@ -7343,7 +7252,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-toolbar""... $ac_c" 1>&6 -echo "configure:7347: checking for --${enablestring:-enable}-toolbar" >&5 +echo "configure:7256: checking for --${enablestring:-enable}-toolbar" >&5 no_cache=0 # Check whether --enable-toolbar or --disable-toolbar was given. if test "${enable_toolbar+set}" = set; then @@ -7383,7 +7292,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-tbarnative""... $ac_c" 1>&6 -echo "configure:7387: checking for --${enablestring:-enable}-tbarnative" >&5 +echo "configure:7296: checking for --${enablestring:-enable}-tbarnative" >&5 no_cache=0 # Check whether --enable-tbarnative or --disable-tbarnative was given. if test "${enable_tbarnative+set}" = set; then @@ -7423,7 +7332,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-tbarsmpl""... $ac_c" 1>&6 -echo "configure:7427: checking for --${enablestring:-enable}-tbarsmpl" >&5 +echo "configure:7336: checking for --${enablestring:-enable}-tbarsmpl" >&5 no_cache=0 # Check whether --enable-tbarsmpl or --disable-tbarsmpl was given. if test "${enable_tbarsmpl+set}" = set; then @@ -7463,7 +7372,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-treectrl""... $ac_c" 1>&6 -echo "configure:7467: checking for --${enablestring:-enable}-treectrl" >&5 +echo "configure:7376: checking for --${enablestring:-enable}-treectrl" >&5 no_cache=0 # Check whether --enable-treectrl or --disable-treectrl was given. if test "${enable_treectrl+set}" = set; then @@ -7503,7 +7412,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-tipwindow""... $ac_c" 1>&6 -echo "configure:7507: checking for --${enablestring:-enable}-tipwindow" >&5 +echo "configure:7416: checking for --${enablestring:-enable}-tipwindow" >&5 no_cache=0 # Check whether --enable-tipwindow or --disable-tipwindow was given. if test "${enable_tipwindow+set}" = set; then @@ -7543,7 +7452,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-popupwin""... $ac_c" 1>&6 -echo "configure:7547: checking for --${enablestring:-enable}-popupwin" >&5 +echo "configure:7456: checking for --${enablestring:-enable}-popupwin" >&5 no_cache=0 # Check whether --enable-popupwin or --disable-popupwin was given. if test "${enable_popupwin+set}" = set; then @@ -7585,7 +7494,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-commondlg""... $ac_c" 1>&6 -echo "configure:7589: checking for --${enablestring:-enable}-commondlg" >&5 +echo "configure:7498: checking for --${enablestring:-enable}-commondlg" >&5 no_cache=0 # Check whether --enable-commondlg or --disable-commondlg was given. if test "${enable_commondlg+set}" = set; then @@ -7625,7 +7534,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-choicedlg""... $ac_c" 1>&6 -echo "configure:7629: checking for --${enablestring:-enable}-choicedlg" >&5 +echo "configure:7538: checking for --${enablestring:-enable}-choicedlg" >&5 no_cache=0 # Check whether --enable-choicedlg or --disable-choicedlg was given. if test "${enable_choicedlg+set}" = set; then @@ -7665,7 +7574,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-coldlg""... $ac_c" 1>&6 -echo "configure:7669: checking for --${enablestring:-enable}-coldlg" >&5 +echo "configure:7578: checking for --${enablestring:-enable}-coldlg" >&5 no_cache=0 # Check whether --enable-coldlg or --disable-coldlg was given. if test "${enable_coldlg+set}" = set; then @@ -7705,7 +7614,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-filedlg""... $ac_c" 1>&6 -echo "configure:7709: checking for --${enablestring:-enable}-filedlg" >&5 +echo "configure:7618: checking for --${enablestring:-enable}-filedlg" >&5 no_cache=0 # Check whether --enable-filedlg or --disable-filedlg was given. if test "${enable_filedlg+set}" = set; then @@ -7745,7 +7654,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-finddlg""... $ac_c" 1>&6 -echo "configure:7749: checking for --${enablestring:-enable}-finddlg" >&5 +echo "configure:7658: checking for --${enablestring:-enable}-finddlg" >&5 no_cache=0 # Check whether --enable-finddlg or --disable-finddlg was given. if test "${enable_finddlg+set}" = set; then @@ -7785,7 +7694,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-fontdlg""... $ac_c" 1>&6 -echo "configure:7789: checking for --${enablestring:-enable}-fontdlg" >&5 +echo "configure:7698: checking for --${enablestring:-enable}-fontdlg" >&5 no_cache=0 # Check whether --enable-fontdlg or --disable-fontdlg was given. if test "${enable_fontdlg+set}" = set; then @@ -7825,7 +7734,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-dirdlg""... $ac_c" 1>&6 -echo "configure:7829: checking for --${enablestring:-enable}-dirdlg" >&5 +echo "configure:7738: checking for --${enablestring:-enable}-dirdlg" >&5 no_cache=0 # Check whether --enable-dirdlg or --disable-dirdlg was given. if test "${enable_dirdlg+set}" = set; then @@ -7865,7 +7774,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-msgdlg""... $ac_c" 1>&6 -echo "configure:7869: checking for --${enablestring:-enable}-msgdlg" >&5 +echo "configure:7778: checking for --${enablestring:-enable}-msgdlg" >&5 no_cache=0 # Check whether --enable-msgdlg or --disable-msgdlg was given. if test "${enable_msgdlg+set}" = set; then @@ -7905,7 +7814,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-numberdlg""... $ac_c" 1>&6 -echo "configure:7909: checking for --${enablestring:-enable}-numberdlg" >&5 +echo "configure:7818: checking for --${enablestring:-enable}-numberdlg" >&5 no_cache=0 # Check whether --enable-numberdlg or --disable-numberdlg was given. if test "${enable_numberdlg+set}" = set; then @@ -7945,7 +7854,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-splash""... $ac_c" 1>&6 -echo "configure:7949: checking for --${enablestring:-enable}-splash" >&5 +echo "configure:7858: checking for --${enablestring:-enable}-splash" >&5 no_cache=0 # Check whether --enable-splash or --disable-splash was given. if test "${enable_splash+set}" = set; then @@ -7985,7 +7894,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-textdlg""... $ac_c" 1>&6 -echo "configure:7989: checking for --${enablestring:-enable}-textdlg" >&5 +echo "configure:7898: checking for --${enablestring:-enable}-textdlg" >&5 no_cache=0 # Check whether --enable-textdlg or --disable-textdlg was given. if test "${enable_textdlg+set}" = set; then @@ -8025,7 +7934,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-tipdlg""... $ac_c" 1>&6 -echo "configure:8029: checking for --${enablestring:-enable}-tipdlg" >&5 +echo "configure:7938: checking for --${enablestring:-enable}-tipdlg" >&5 no_cache=0 # Check whether --enable-tipdlg or --disable-tipdlg was given. if test "${enable_tipdlg+set}" = set; then @@ -8065,7 +7974,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-progressdlg""... $ac_c" 1>&6 -echo "configure:8069: checking for --${enablestring:-enable}-progressdlg" >&5 +echo "configure:7978: checking for --${enablestring:-enable}-progressdlg" >&5 no_cache=0 # Check whether --enable-progressdlg or --disable-progressdlg was given. if test "${enable_progressdlg+set}" = set; then @@ -8105,7 +8014,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-wizarddlg""... $ac_c" 1>&6 -echo "configure:8109: checking for --${enablestring:-enable}-wizarddlg" >&5 +echo "configure:8018: checking for --${enablestring:-enable}-wizarddlg" >&5 no_cache=0 # Check whether --enable-wizarddlg or --disable-wizarddlg was given. if test "${enable_wizarddlg+set}" = set; then @@ -8147,7 +8056,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-menus""... $ac_c" 1>&6 -echo "configure:8151: checking for --${enablestring:-enable}-menus" >&5 +echo "configure:8060: checking for --${enablestring:-enable}-menus" >&5 no_cache=0 # Check whether --enable-menus or --disable-menus was given. if test "${enable_menus+set}" = set; then @@ -8187,7 +8096,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-miniframe""... $ac_c" 1>&6 -echo "configure:8191: checking for --${enablestring:-enable}-miniframe" >&5 +echo "configure:8100: checking for --${enablestring:-enable}-miniframe" >&5 no_cache=0 # Check whether --enable-miniframe or --disable-miniframe was given. if test "${enable_miniframe+set}" = set; then @@ -8227,7 +8136,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-tooltips""... $ac_c" 1>&6 -echo "configure:8231: checking for --${enablestring:-enable}-tooltips" >&5 +echo "configure:8140: checking for --${enablestring:-enable}-tooltips" >&5 no_cache=0 # Check whether --enable-tooltips or --disable-tooltips was given. if test "${enable_tooltips+set}" = set; then @@ -8267,7 +8176,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-splines""... $ac_c" 1>&6 -echo "configure:8271: checking for --${enablestring:-enable}-splines" >&5 +echo "configure:8180: checking for --${enablestring:-enable}-splines" >&5 no_cache=0 # Check whether --enable-splines or --disable-splines was given. if test "${enable_splines+set}" = set; then @@ -8307,7 +8216,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-validators""... $ac_c" 1>&6 -echo "configure:8311: checking for --${enablestring:-enable}-validators" >&5 +echo "configure:8220: checking for --${enablestring:-enable}-validators" >&5 no_cache=0 # Check whether --enable-validators or --disable-validators was given. if test "${enable_validators+set}" = set; then @@ -8347,7 +8256,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-busyinfo""... $ac_c" 1>&6 -echo "configure:8351: checking for --${enablestring:-enable}-busyinfo" >&5 +echo "configure:8260: checking for --${enablestring:-enable}-busyinfo" >&5 no_cache=0 # Check whether --enable-busyinfo or --disable-busyinfo was given. if test "${enable_busyinfo+set}" = set; then @@ -8387,7 +8296,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-joystick""... $ac_c" 1>&6 -echo "configure:8391: checking for --${enablestring:-enable}-joystick" >&5 +echo "configure:8300: checking for --${enablestring:-enable}-joystick" >&5 no_cache=0 # Check whether --enable-joystick or --disable-joystick was given. if test "${enable_joystick+set}" = set; then @@ -8427,7 +8336,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-metafile""... $ac_c" 1>&6 -echo "configure:8431: checking for --${enablestring:-enable}-metafile" >&5 +echo "configure:8340: checking for --${enablestring:-enable}-metafile" >&5 no_cache=0 # Check whether --enable-metafile or --disable-metafile was given. if test "${enable_metafile+set}" = set; then @@ -8467,7 +8376,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-dragimage""... $ac_c" 1>&6 -echo "configure:8471: checking for --${enablestring:-enable}-dragimage" >&5 +echo "configure:8380: checking for --${enablestring:-enable}-dragimage" >&5 no_cache=0 # Check whether --enable-dragimage or --disable-dragimage was given. if test "${enable_dragimage+set}" = set; then @@ -8509,7 +8418,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-palette""... $ac_c" 1>&6 -echo "configure:8513: checking for --${enablestring:-enable}-palette" >&5 +echo "configure:8422: checking for --${enablestring:-enable}-palette" >&5 no_cache=0 # Check whether --enable-palette or --disable-palette was given. if test "${enable_palette+set}" = set; then @@ -8549,7 +8458,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-image""... $ac_c" 1>&6 -echo "configure:8553: checking for --${enablestring:-enable}-image" >&5 +echo "configure:8462: checking for --${enablestring:-enable}-image" >&5 no_cache=0 # Check whether --enable-image or --disable-image was given. if test "${enable_image+set}" = set; then @@ -8589,7 +8498,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-gif""... $ac_c" 1>&6 -echo "configure:8593: checking for --${enablestring:-enable}-gif" >&5 +echo "configure:8502: checking for --${enablestring:-enable}-gif" >&5 no_cache=0 # Check whether --enable-gif or --disable-gif was given. if test "${enable_gif+set}" = set; then @@ -8629,7 +8538,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-pcx""... $ac_c" 1>&6 -echo "configure:8633: checking for --${enablestring:-enable}-pcx" >&5 +echo "configure:8542: checking for --${enablestring:-enable}-pcx" >&5 no_cache=0 # Check whether --enable-pcx or --disable-pcx was given. if test "${enable_pcx+set}" = set; then @@ -8669,7 +8578,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-iff""... $ac_c" 1>&6 -echo "configure:8673: checking for --${enablestring:-enable}-iff" >&5 +echo "configure:8582: checking for --${enablestring:-enable}-iff" >&5 no_cache=0 # Check whether --enable-iff or --disable-iff was given. if test "${enable_iff+set}" = set; then @@ -8709,7 +8618,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-pnm""... $ac_c" 1>&6 -echo "configure:8713: checking for --${enablestring:-enable}-pnm" >&5 +echo "configure:8622: checking for --${enablestring:-enable}-pnm" >&5 no_cache=0 # Check whether --enable-pnm or --disable-pnm was given. if test "${enable_pnm+set}" = set; then @@ -8749,7 +8658,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-xpm""... $ac_c" 1>&6 -echo "configure:8753: checking for --${enablestring:-enable}-xpm" >&5 +echo "configure:8662: checking for --${enablestring:-enable}-xpm" >&5 no_cache=0 # Check whether --enable-xpm or --disable-xpm was given. if test "${enable_xpm+set}" = set; then @@ -8789,7 +8698,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-ico_cur""... $ac_c" 1>&6 -echo "configure:8793: checking for --${enablestring:-enable}-ico_cur" >&5 +echo "configure:8702: checking for --${enablestring:-enable}-ico_cur" >&5 no_cache=0 # Check whether --enable-ico_cur or --disable-ico_cur was given. if test "${enable_ico_cur+set}" = set; then @@ -8848,7 +8757,7 @@ esac echo $ac_n "checking for toolkit""... $ac_c" 1>&6 -echo "configure:8852: checking for toolkit" >&5 +echo "configure:8761: checking for toolkit" >&5 # In Wine, we need to default to MSW, not GTK or MOTIF if test "$wxUSE_WINE" = "yes"; then @@ -9050,7 +8959,7 @@ CFLAGS=${CFLAGS:=} # 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:9054: checking for $ac_word" >&5 +echo "configure:8963: 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 @@ -9080,7 +8989,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:9084: checking for $ac_word" >&5 +echo "configure:8993: 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 @@ -9131,7 +9040,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:9135: checking for $ac_word" >&5 +echo "configure:9044: 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 @@ -9163,7 +9072,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:9167: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:9076: 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. @@ -9174,12 +9083,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 9178 "configure" +#line 9087 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:9183: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9092: \"$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 @@ -9205,12 +9114,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:9209: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:9118: 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:9214: checking whether we are using GNU C" >&5 +echo "configure:9123: 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 @@ -9219,7 +9128,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:9223: \"$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:9132: \"$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 @@ -9238,7 +9147,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:9242: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:9151: 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 @@ -9271,7 +9180,7 @@ fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:9275: checking how to run the C preprocessor" >&5 +echo "configure:9184: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -9286,13 +9195,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:9296: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9205: \"$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 : @@ -9303,13 +9212,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:9313: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9222: \"$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 : @@ -9320,13 +9229,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:9330: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9239: \"$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 : @@ -9352,13 +9261,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:9356: checking whether ${CC-cc} needs -traditional" >&5 +echo "configure:9265: 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 @@ -9376,7 +9285,7 @@ rm -f conftest* if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext < Autoconf TCGETA @@ -9413,7 +9322,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:9417: checking for $ac_word" >&5 +echo "configure:9326: 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 @@ -9445,7 +9354,7 @@ test -n "$CXX" || CXX="gcc" echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:9449: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 +echo "configure:9358: 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. @@ -9456,12 +9365,12 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext << EOF -#line 9460 "configure" +#line 9369 "configure" #include "confdefs.h" int main(){return(0);} EOF -if { (eval echo configure:9465: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9374: \"$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 @@ -9487,12 +9396,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:9491: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:9400: 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:9496: checking whether we are using GNU C++" >&5 +echo "configure:9405: 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 @@ -9501,7 +9410,7 @@ else yes; #endif EOF -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:9505: \"$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:9414: \"$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 @@ -9520,7 +9429,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:9524: checking whether ${CXX-g++} accepts -g" >&5 +echo "configure:9433: 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 @@ -9563,7 +9472,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:9567: checking for $ac_word" >&5 +echo "configure:9476: 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 @@ -9594,7 +9503,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:9598: checking for $ac_word" >&5 +echo "configure:9507: 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 @@ -9634,7 +9543,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:9638: checking for a BSD compatible install" >&5 +echo "configure:9547: 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 @@ -9719,7 +9628,7 @@ esac # 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:9723: checking for $ac_word" >&5 +echo "configure:9632: 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 @@ -9748,7 +9657,7 @@ fi echo $ac_n "checking if make is GNU make""... $ac_c" 1>&6 -echo "configure:9752: checking if make is GNU make" >&5 +echo "configure:9661: checking if make is GNU make" >&5 if eval "test \"`echo '$''{'wx_cv_prog_makeisgnu'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9774,7 +9683,7 @@ fi if test "x$wx_cv_prog_makeisgnu" != "xyes"; then echo $ac_n "checking if make supports VPATH""... $ac_c" 1>&6 -echo "configure:9778: checking if make supports VPATH" >&5 +echo "configure:9687: checking if make supports VPATH" >&5 if eval "test \"`echo '$''{'wx_cv_prog_makevpath'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9821,7 +9730,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:9825: checking for $ac_word" >&5 +echo "configure:9734: 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 @@ -9855,7 +9764,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:9859: checking for $ac_word" >&5 +echo "configure:9768: 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 @@ -9889,7 +9798,7 @@ then *) ac_lib=l ;; esac echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6 -echo "configure:9893: checking for yywrap in -l$ac_lib" >&5 +echo "configure:9802: 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 @@ -9897,7 +9806,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:9821: \"$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 @@ -9932,7 +9841,7 @@ fi echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:9936: checking whether ln -s works" >&5 +echo "configure:9845: 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 @@ -9958,7 +9867,7 @@ case "${host}" in LIBS="$LIBS -lstdcpp" if test "$wxUSE_MOTIF" = 1 -o "$wxUSE_GTK" = 1 -o "$wxUSE_X11" = 1; then echo $ac_n "checking for drand48 in -lcExt""... $ac_c" 1>&6 -echo "configure:9962: checking for drand48 in -lcExt" >&5 +echo "configure:9871: checking for drand48 in -lcExt" >&5 ac_lib_var=`echo cExt'_'drand48 | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -9966,7 +9875,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcExt $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9890: \"$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 @@ -10009,17 +9918,17 @@ if test "$wxUSE_MAC" != 1 -a "$wxUSE_COCOA" != 1; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:10013: checking for $ac_hdr" >&5 +echo "configure:9922: 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:10023: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9932: \"$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* @@ -10051,17 +9960,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:10055: checking for $ac_hdr" >&5 +echo "configure:9964: 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:10065: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9974: \"$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* @@ -10091,17 +10000,17 @@ for ac_hdr in malloc.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:10095: checking for $ac_hdr" >&5 +echo "configure:10004: 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:10105: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10014: \"$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* @@ -10131,17 +10040,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:10135: checking for $ac_hdr" >&5 +echo "configure:10044: 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:10145: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10054: \"$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* @@ -10171,17 +10080,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:10175: checking for $ac_hdr" >&5 +echo "configure:10084: 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:10185: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10094: \"$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* @@ -10213,17 +10122,17 @@ if test "$ac_cv_header_wchar_h" != "yes"; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:10217: checking for $ac_hdr" >&5 +echo "configure:10126: 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:10227: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10136: \"$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* @@ -10255,17 +10164,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:10259: checking for $ac_hdr" >&5 +echo "configure:10168: 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:10269: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10178: \"$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* @@ -10296,12 +10205,12 @@ if test "x$ac_cv_header_fnmatch_h" = "xyes"; then for ac_func in fnmatch do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:10300: checking for $ac_func" >&5 +echo "configure:10209: 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:10237: \"$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 @@ -10354,17 +10263,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:10358: checking for $ac_hdr" >&5 +echo "configure:10267: 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:10368: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10277: \"$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* @@ -10398,24 +10307,24 @@ case "${host}" in fi ;; esac - + if test "$wxUSE_GUI" = "yes"; then if test "$wxUSE_UNIX" = "yes"; then for ac_hdr in X11/XKBlib.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:10409: checking for $ac_hdr" >&5 +echo "configure:10318: 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:10419: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10328: \"$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* @@ -10446,12 +10355,12 @@ fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:10450: checking for working const" >&5 +echo "configure:10359: 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:10413: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -10521,21 +10430,21 @@ EOF fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:10525: checking for inline" >&5 +echo "configure:10434: 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:10448: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -10562,7 +10471,7 @@ esac echo $ac_n "checking size of char""... $ac_c" 1>&6 -echo "configure:10566: checking size of char" >&5 +echo "configure:10475: 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 @@ -10570,7 +10479,7 @@ else ac_cv_sizeof_char=1 else cat > conftest.$ac_ext < main() @@ -10581,7 +10490,7 @@ main() exit(0); } EOF -if { (eval echo configure:10585: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:10494: \"$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 @@ -10601,7 +10510,7 @@ EOF echo $ac_n "checking size of short""... $ac_c" 1>&6 -echo "configure:10605: checking size of short" >&5 +echo "configure:10514: 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 @@ -10609,7 +10518,7 @@ else ac_cv_sizeof_short=2 else cat > conftest.$ac_ext < main() @@ -10620,7 +10529,7 @@ main() exit(0); } EOF -if { (eval echo configure:10624: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:10533: \"$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 @@ -10640,7 +10549,7 @@ EOF echo $ac_n "checking size of void *""... $ac_c" 1>&6 -echo "configure:10644: checking size of void *" >&5 +echo "configure:10553: checking size of void *" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_void_p'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -10648,7 +10557,7 @@ else ac_cv_sizeof_void_p=4 else cat > conftest.$ac_ext < main() @@ -10659,7 +10568,7 @@ main() exit(0); } EOF -if { (eval echo configure:10663: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:10572: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_void_p=`cat conftestval` else @@ -10679,7 +10588,7 @@ EOF echo $ac_n "checking size of int""... $ac_c" 1>&6 -echo "configure:10683: checking size of int" >&5 +echo "configure:10592: 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 @@ -10687,7 +10596,7 @@ else ac_cv_sizeof_int=4 else cat > conftest.$ac_ext < main() @@ -10698,7 +10607,7 @@ main() exit(0); } EOF -if { (eval echo configure:10702: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:10611: \"$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 @@ -10718,7 +10627,7 @@ EOF echo $ac_n "checking size of long""... $ac_c" 1>&6 -echo "configure:10722: checking size of long" >&5 +echo "configure:10631: 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 @@ -10726,7 +10635,7 @@ else ac_cv_sizeof_long=4 else cat > conftest.$ac_ext < main() @@ -10737,7 +10646,7 @@ main() exit(0); } EOF -if { (eval echo configure:10741: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:10650: \"$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 @@ -10760,7 +10669,7 @@ EOF case "${host}" in arm-*-linux* ) echo $ac_n "checking size of long long""... $ac_c" 1>&6 -echo "configure:10764: checking size of long long" >&5 +echo "configure:10673: 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 @@ -10768,7 +10677,7 @@ else ac_cv_sizeof_long_long=8 else cat > conftest.$ac_ext < main() @@ -10779,7 +10688,7 @@ main() exit(0); } EOF -if { (eval echo configure:10783: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:10692: \"$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 @@ -10801,7 +10710,7 @@ EOF ;; *-hp-hpux* ) echo $ac_n "checking size of long long""... $ac_c" 1>&6 -echo "configure:10805: checking size of long long" >&5 +echo "configure:10714: 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 @@ -10809,7 +10718,7 @@ else ac_cv_sizeof_long_long=0 else cat > conftest.$ac_ext < main() @@ -10820,7 +10729,7 @@ main() exit(0); } EOF -if { (eval echo configure:10824: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:10733: \"$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 @@ -10845,7 +10754,7 @@ EOF ;; * ) echo $ac_n "checking size of long long""... $ac_c" 1>&6 -echo "configure:10849: checking size of long long" >&5 +echo "configure:10758: 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 @@ -10853,7 +10762,7 @@ else ac_cv_sizeof_long_long=0 else cat > conftest.$ac_ext < main() @@ -10864,7 +10773,7 @@ main() exit(0); } EOF -if { (eval echo configure:10868: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:10777: \"$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 @@ -10886,7 +10795,7 @@ EOF esac echo $ac_n "checking size of wchar_t""... $ac_c" 1>&6 -echo "configure:10890: checking size of wchar_t" >&5 +echo "configure:10799: 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 @@ -10905,7 +10814,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:10844: \"$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 @@ -10963,13 +10872,13 @@ if test "$enable_largefile" != no; then wx_largefile=no echo $ac_n "checking for _FILE_OFFSET_BITS value needed for large files""... $ac_c" 1>&6 -echo "configure:10967: checking for _FILE_OFFSET_BITS value needed for large files" >&5 +echo "configure:10876: checking for _FILE_OFFSET_BITS value needed for large files" >&5 if eval "test \"`echo '$''{'ac_cv_sys_file_offset_bits'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -10980,7 +10889,7 @@ typedef struct { ; return 0; } EOF -if { (eval echo configure:10984: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10893: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_sys_file_offset_bits=64 else @@ -11007,13 +10916,13 @@ EOF if test "x$wx_largefile" != "xyes"; then echo $ac_n "checking for _LARGE_FILES value needed for large files""... $ac_c" 1>&6 -echo "configure:11011: checking for _LARGE_FILES value needed for large files" >&5 +echo "configure:10920: checking for _LARGE_FILES value needed for large files" >&5 if eval "test \"`echo '$''{'ac_cv_sys_large_files'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -11024,7 +10933,7 @@ typedef struct { ; return 0; } EOF -if { (eval echo configure:11028: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10937: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_sys_large_files=1 else @@ -11051,7 +10960,7 @@ EOF fi echo $ac_n "checking if large file support is available""... $ac_c" 1>&6 -echo "configure:11055: checking if large file support is available" >&5 +echo "configure:10964: checking if large file support is available" >&5 if test "x$wx_largefile" = "xyes"; then cat >> confdefs.h <<\EOF #define HAVE_LARGEFILE_SUPPORT 1 @@ -11072,14 +10981,14 @@ if test "x$wx_largefile" = "xyes"; then fi echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 -echo "configure:11076: checking whether byte ordering is bigendian" >&5 +echo "configure:10985: 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 @@ -11090,11 +10999,11 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:11094: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11003: \"$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 @@ -11105,7 +11014,7 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:11109: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11018: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_bigendian=yes else @@ -11125,7 +11034,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:11051: \"$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 @@ -11166,7 +11075,7 @@ fi echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 -echo "configure:11170: checking how to run the C++ preprocessor" >&5 +echo "configure:11079: 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 @@ -11179,12 +11088,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:11188: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11097: \"$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 : @@ -11228,17 +11137,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:11232: checking for $ac_hdr" >&5 +echo "configure:11141: 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:11242: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11151: \"$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* @@ -11286,7 +11195,7 @@ cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking if C++ compiler supports bool""... $ac_c" 1>&6 -echo "configure:11290: checking if C++ compiler supports bool" >&5 +echo "configure:11199: 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 @@ -11301,7 +11210,7 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11226: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_cpp_bool=yes @@ -11351,7 +11260,7 @@ EOF echo $ac_n "checking if C++ compiler supports the explicit keyword""... $ac_c" 1>&6 -echo "configure:11355: checking if C++ compiler supports the explicit keyword" >&5 +echo "configure:11264: checking if C++ compiler supports the explicit keyword" >&5 if eval "test \"`echo '$''{'wx_cv_explicit'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -11366,7 +11275,7 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11290: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11307: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_explicit=no else @@ -11436,7 +11345,7 @@ EOF echo $ac_n "checking whether the compiler supports const_cast<>""... $ac_c" 1>&6 -echo "configure:11440: checking whether the compiler supports const_cast<>" >&5 +echo "configure:11349: checking whether the compiler supports const_cast<>" >&5 if eval "test \"`echo '$''{'ac_cv_cxx_const_cast'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -11449,14 +11358,14 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <(y);return z; ; return 0; } EOF -if { (eval echo configure:11460: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11369: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cxx_const_cast=yes else @@ -11604,13 +11513,13 @@ rm -f confcache if test "$USE_LINUX" = 1; then echo $ac_n "checking for glibc 2.1 or later""... $ac_c" 1>&6 -echo "configure:11608: checking for glibc 2.1 or later" >&5 +echo "configure:11517: checking for glibc 2.1 or later" >&5 if eval "test \"`echo '$''{'wx_cv_lib_glibc21'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { @@ -11621,7 +11530,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:11625: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11534: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_lib_glibc21=yes @@ -11669,17 +11578,17 @@ EOF if test "$wxUSE_REGEX" = "sys" -o "$wxUSE_REGEX" = "yes" ; then ac_safe=`echo "regex.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for regex.h""... $ac_c" 1>&6 -echo "configure:11673: checking for regex.h" >&5 +echo "configure:11582: checking for regex.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:11683: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11592: \"$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* @@ -11698,12 +11607,12 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then for ac_func in regcomp do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:11702: checking for $ac_func" >&5 +echo "configure:11611: 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:11639: \"$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 @@ -11786,7 +11695,7 @@ EOF system_zlib_h_ok="yes" else echo $ac_n "checking for zlib.h >= 1.1.4""... $ac_c" 1>&6 -echo "configure:11790: checking for zlib.h >= 1.1.4" >&5 +echo "configure:11699: checking for zlib.h >= 1.1.4" >&5 if eval "test \"`echo '$''{'ac_cv_header_zlib_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -11795,7 +11704,7 @@ else else cat > conftest.$ac_ext < @@ -11816,7 +11725,7 @@ else EOF -if { (eval echo configure:11820: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:11729: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_header_zlib_h=`cat conftestval` else @@ -11834,17 +11743,17 @@ fi echo "$ac_t""$ac_cv_header_zlib_h" 1>&6 ac_safe=`echo "zlib.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for zlib.h""... $ac_c" 1>&6 -echo "configure:11838: checking for zlib.h" >&5 +echo "configure:11747: 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:11848: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11757: \"$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* @@ -11871,7 +11780,7 @@ fi if test "$system_zlib_h_ok" = "yes"; then echo $ac_n "checking for deflate in -lz""... $ac_c" 1>&6 -echo "configure:11875: checking for deflate in -lz" >&5 +echo "configure:11784: 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 @@ -11879,7 +11788,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:11803: \"$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 @@ -11951,7 +11860,7 @@ EOF if test "$wxUSE_MGL" != 1 ; then if test "$wxUSE_LIBPNG" = "sys" -o "$wxUSE_LIBPNG" = "yes" ; then echo $ac_n "checking for png.h > 0.90""... $ac_c" 1>&6 -echo "configure:11955: checking for png.h > 0.90" >&5 +echo "configure:11864: checking for png.h > 0.90" >&5 if eval "test \"`echo '$''{'ac_cv_header_png_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -11960,7 +11869,7 @@ else else cat > conftest.$ac_ext < @@ -11976,7 +11885,7 @@ else } EOF -if { (eval echo configure:11980: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:11889: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_header_png_h=`cat conftestval` else @@ -11994,17 +11903,17 @@ fi echo "$ac_t""$ac_cv_header_png_h" 1>&6 ac_safe=`echo "png.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for png.h""... $ac_c" 1>&6 -echo "configure:11998: checking for png.h" >&5 +echo "configure:11907: 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:12008: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11917: \"$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* @@ -12028,7 +11937,7 @@ fi if test "$ac_cv_header_png_h" = "yes"; then echo $ac_n "checking for png_check_sig in -lpng""... $ac_c" 1>&6 -echo "configure:12032: checking for png_check_sig in -lpng" >&5 +echo "configure:11941: 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 @@ -12036,7 +11945,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:11960: \"$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 @@ -12106,12 +12015,12 @@ EOF if test "$wxUSE_MGL" != 1 ; then if test "$wxUSE_LIBJPEG" = "sys" -o "$wxUSE_LIBJPEG" = "yes" ; then echo $ac_n "checking for jpeglib.h""... $ac_c" 1>&6 -echo "configure:12110: checking for jpeglib.h" >&5 +echo "configure:12019: 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:12036: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_jpeglib_h=yes else @@ -12141,7 +12050,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:12145: checking for jpeg_read_header in -ljpeg" >&5 +echo "configure:12054: 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 @@ -12149,7 +12058,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:12073: \"$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 @@ -12219,17 +12128,17 @@ EOF fi ac_safe=`echo "tiffio.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for tiffio.h""... $ac_c" 1>&6 -echo "configure:12223: checking for tiffio.h" >&5 +echo "configure:12132: 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:12233: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12142: \"$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* @@ -12246,7 +12155,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:12250: checking for TIFFError in -ltiff" >&5 +echo "configure:12159: 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 @@ -12254,7 +12163,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ltiff $TIFF_PREREQ_LINKS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12178: \"$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 @@ -12321,17 +12230,17 @@ if test "$USE_WIN32" = 1 ; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:12325: checking for $ac_hdr" >&5 +echo "configure:12234: 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:12335: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12244: \"$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* @@ -12359,17 +12268,17 @@ done ac_safe=`echo "windows.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for windows.h""... $ac_c" 1>&6 -echo "configure:12363: checking for windows.h" >&5 +echo "configure:12272: checking for windows.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:12373: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12282: \"$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* @@ -12395,13 +12304,13 @@ fi echo $ac_n "checking if w32api has good enough MSIE support""... $ac_c" 1>&6 -echo "configure:12399: checking if w32api has good enough MSIE support" >&5 +echo "configure:12308: checking if w32api has good enough MSIE support" >&5 if eval "test \"`echo '$''{'wx_cv_w32api_win32_ie'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { @@ -12417,7 +12326,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:12421: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12330: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_w32api_win32_ie=yes @@ -12483,7 +12392,7 @@ if test "$wxUSE_GUI" = "yes"; then if test "$wxUSE_GTK" = 1; then echo $ac_n "checking for GTK+ version""... $ac_c" 1>&6 -echo "configure:12487: checking for GTK+ version" >&5 +echo "configure:12396: checking for GTK+ version" >&5 gtk_version_cached=1 if eval "test \"`echo '$''{'wx_cv_lib_gtk'+set}'`\" = set"; then @@ -12524,7 +12433,7 @@ fi # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:12528: checking for $ac_word" >&5 +echo "configure:12437: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -12572,7 +12481,7 @@ fi min_gtk_version=2.0.0 echo $ac_n "checking for GTK+ - version >= $min_gtk_version""... $ac_c" 1>&6 -echo "configure:12576: checking for GTK+ - version >= $min_gtk_version" >&5 +echo "configure:12485: checking for GTK+ - version >= $min_gtk_version" >&5 if test x$PKG_CONFIG != xno ; then ## don't try to run the test against uninstalled libtool libs @@ -12607,7 +12516,7 @@ echo "configure:12576: checking for GTK+ - version >= $min_gtk_version" >&5 echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < @@ -12682,7 +12591,7 @@ main () } EOF -if { (eval echo configure:12686: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:12595: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -12716,7 +12625,7 @@ fi CFLAGS="$CFLAGS $GTK_CFLAGS" LIBS="$LIBS $GTK_LIBS" cat > conftest.$ac_ext < @@ -12726,7 +12635,7 @@ int main() { return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ; return 0; } EOF -if { (eval echo configure:12730: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12639: \"$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" @@ -12808,7 +12717,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:12812: checking for $ac_word" >&5 +echo "configure:12721: 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 @@ -12843,7 +12752,7 @@ fi min_gtk_version=1.2.7 echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6 -echo "configure:12847: checking for GTK - version >= $min_gtk_version" >&5 +echo "configure:12756: checking for GTK - version >= $min_gtk_version" >&5 no_gtk="" if test "$GTK_CONFIG" = "no" ; then no_gtk=yes @@ -12866,7 +12775,7 @@ echo "configure:12847: checking for GTK - version >= $min_gtk_version" >&5 echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < @@ -12944,7 +12853,7 @@ main () } EOF -if { (eval echo configure:12948: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:12857: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -12978,7 +12887,7 @@ fi CFLAGS="$CFLAGS $GTK_CFLAGS" LIBS="$LIBS $GTK_LIBS" cat > conftest.$ac_ext < @@ -12988,7 +12897,7 @@ int main() { return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ; return 0; } EOF -if { (eval echo configure:12992: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12901: \"$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" @@ -13078,7 +12987,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:13082: checking for $ac_word" >&5 +echo "configure:12991: 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 @@ -13113,7 +13022,7 @@ fi min_gtk_version=1.2.3 echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6 -echo "configure:13117: checking for GTK - version >= $min_gtk_version" >&5 +echo "configure:13026: checking for GTK - version >= $min_gtk_version" >&5 no_gtk="" if test "$GTK_CONFIG" = "no" ; then no_gtk=yes @@ -13136,7 +13045,7 @@ echo "configure:13117: checking for GTK - version >= $min_gtk_version" >&5 echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < @@ -13214,7 +13123,7 @@ main () } EOF -if { (eval echo configure:13218: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:13127: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -13248,7 +13157,7 @@ fi CFLAGS="$CFLAGS $GTK_CFLAGS" LIBS="$LIBS $GTK_LIBS" cat > conftest.$ac_ext < @@ -13258,7 +13167,7 @@ int main() { return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ; return 0; } EOF -if { (eval echo configure:13262: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13171: \"$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" @@ -13341,7 +13250,7 @@ equivalent variable and GTK+ is version 1.2.3 or above. # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:13345: checking for $ac_word" >&5 +echo "configure:13254: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -13385,19 +13294,19 @@ fi PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then echo $ac_n "checking for pangoft2""... $ac_c" 1>&6 -echo "configure:13389: checking for pangoft2" >&5 +echo "configure:13298: checking for pangoft2" >&5 if $PKG_CONFIG --exists "pangoft2" ; then echo "$ac_t""yes" 1>&6 succeeded=yes echo $ac_n "checking PANGOFT2_CFLAGS""... $ac_c" 1>&6 -echo "configure:13396: checking PANGOFT2_CFLAGS" >&5 +echo "configure:13305: checking PANGOFT2_CFLAGS" >&5 PANGOFT2_CFLAGS=`$PKG_CONFIG --cflags "pangoft2"` echo "$ac_t""$PANGOFT2_CFLAGS" 1>&6 echo $ac_n "checking PANGOFT2_LIBS""... $ac_c" 1>&6 -echo "configure:13401: checking PANGOFT2_LIBS" >&5 +echo "configure:13310: checking PANGOFT2_LIBS" >&5 PANGOFT2_LIBS=`$PKG_CONFIG --libs "pangoft2"` echo "$ac_t""$PANGOFT2_LIBS" 1>&6 else @@ -13442,12 +13351,12 @@ echo "configure:13401: checking PANGOFT2_LIBS" >&5 for ac_func in poll do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:13446: checking for $ac_func" >&5 +echo "configure:13355: 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:13383: \"$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 @@ -13504,7 +13413,7 @@ done GUIDIST=GTK_DIST echo $ac_n "checking for gdk_im_open in -lgdk""... $ac_c" 1>&6 -echo "configure:13508: checking for gdk_im_open in -lgdk" >&5 +echo "configure:13417: 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 @@ -13512,7 +13421,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:13436: \"$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 @@ -13550,7 +13459,7 @@ fi if test "$wxUSE_MGL" = 1; then echo $ac_n "checking for SciTech MGL library""... $ac_c" 1>&6 -echo "configure:13554: checking for SciTech MGL library" >&5 +echo "configure:13463: 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; } @@ -13559,7 +13468,7 @@ echo "configure:13554: checking for SciTech MGL library" >&5 fi echo $ac_n "checking for libmgl location""... $ac_c" 1>&6 -echo "configure:13563: checking for libmgl location" >&5 +echo "configure:13472: checking for libmgl location" >&5 case "${host}" in *-*-linux* ) if test "x$wxUSE_SHARED" = xyes ; then @@ -13602,7 +13511,7 @@ echo "configure:13563: checking for libmgl location" >&5 { echo "configure: error: Cannot find MGL libraries, make sure they are compiled." 1>&2; exit 1; } fi echo "$ac_t"""$MGL_ROOT/lib/$mgl_lib_type/$mgl_os"" 1>&6 - + wxUSE_UNIVERSAL="yes" TOOLKIT_INCLUDE="-I$MGL_ROOT/include" @@ -13615,7 +13524,7 @@ echo "configure:13563: checking for libmgl location" >&5 if test "$wxUSE_MICROWIN" = 1; then echo $ac_n "checking for MicroWindows""... $ac_c" 1>&6 -echo "configure:13619: checking for MicroWindows" >&5 +echo "configure:13528: checking for MicroWindows" >&5 if test "x$MICROWINDOWS" = x ; then echo "$ac_t""not found" 1>&6 { echo "configure: error: Cannot find MicroWindows library. Make sure MICROWINDOWS is set." 1>&2; exit 1; } @@ -13647,7 +13556,7 @@ echo "configure:13619: checking for MicroWindows" >&5 # 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:13651: checking for X" >&5 +echo "configure:13560: checking for X" >&5 # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then @@ -13709,12 +13618,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:13718: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13627: \"$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* @@ -13783,14 +13692,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:13703: \"$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. @@ -13896,17 +13805,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:13900: checking whether -R must be followed by a space" >&5 +echo "configure:13809: 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:13819: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_nospace=yes else @@ -13922,14 +13831,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:13842: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_space=yes else @@ -13961,7 +13870,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:13965: checking for dnet_ntoa in -ldnet" >&5 +echo "configure:13874: 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 @@ -13969,7 +13878,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:13893: \"$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 @@ -14002,7 +13911,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:14006: checking for dnet_ntoa in -ldnet_stub" >&5 +echo "configure:13915: 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 @@ -14010,7 +13919,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:13934: \"$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 @@ -14050,12 +13959,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:14054: checking for gethostbyname" >&5 +echo "configure:13963: 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:13991: \"$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 @@ -14099,7 +14008,7 @@ fi if test $ac_cv_func_gethostbyname = no; then echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:14103: checking for gethostbyname in -lnsl" >&5 +echo "configure:14012: 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 @@ -14107,7 +14016,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:14031: \"$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 @@ -14148,12 +14057,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:14152: checking for connect" >&5 +echo "configure:14061: 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:14089: \"$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 @@ -14197,7 +14106,7 @@ fi if test $ac_cv_func_connect = no; then echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 -echo "configure:14201: checking for connect in -lsocket" >&5 +echo "configure:14110: 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 @@ -14205,7 +14114,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: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 @@ -14240,12 +14149,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:14244: checking for remove" >&5 +echo "configure:14153: 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:14181: \"$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 @@ -14289,7 +14198,7 @@ fi if test $ac_cv_func_remove = no; then echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 -echo "configure:14293: checking for remove in -lposix" >&5 +echo "configure:14202: 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 @@ -14297,7 +14206,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:14221: \"$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 @@ -14332,12 +14241,12 @@ fi # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. echo $ac_n "checking for shmat""... $ac_c" 1>&6 -echo "configure:14336: checking for shmat" >&5 +echo "configure:14245: 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:14273: \"$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 @@ -14381,7 +14290,7 @@ fi if test $ac_cv_func_shmat = no; then echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 -echo "configure:14385: checking for shmat in -lipc" >&5 +echo "configure:14294: 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 @@ -14389,7 +14298,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:14313: \"$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 @@ -14433,7 +14342,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:14437: checking for IceConnectionNumber in -lICE" >&5 +echo "configure:14346: 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 @@ -14441,7 +14350,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:14365: \"$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 @@ -14488,7 +14397,7 @@ fi if test "$wxUSE_NANOX" = "yes"; then echo $ac_n "checking for MicroWindows/NanoX distribution""... $ac_c" 1>&6 -echo "configure:14492: checking for MicroWindows/NanoX distribution" >&5 +echo "configure:14401: checking for MicroWindows/NanoX distribution" >&5 if test "x$MICROWIN" = x ; then echo "$ac_t""not found" 1>&6 { echo "configure: error: Cannot find MicroWindows library. Make sure MICROWIN is set." 1>&2; exit 1; } @@ -14503,7 +14412,7 @@ EOF xpm_link= echo $ac_n "checking for Xpm library""... $ac_c" 1>&6 -echo "configure:14507: checking for Xpm library" >&5 +echo "configure:14416: checking for Xpm library" >&5 ac_find_libraries= for ac_dir in $SEARCH_LIB /usr/lib; @@ -14535,7 +14444,7 @@ EOF echo "$ac_t""found at $ac_find_libraries" 1>&6 else cat > conftest.$ac_ext < @@ -14547,7 +14456,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:14551: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:14460: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* xpm_link=" -lXpm" @@ -14579,7 +14488,7 @@ rm -f conftest* # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:14583: checking for $ac_word" >&5 +echo "configure:14492: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -14623,19 +14532,19 @@ fi PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then echo $ac_n "checking for pangox""... $ac_c" 1>&6 -echo "configure:14627: checking for pangox" >&5 +echo "configure:14536: checking for pangox" >&5 if $PKG_CONFIG --exists "pangox" ; then echo "$ac_t""yes" 1>&6 succeeded=yes echo $ac_n "checking PANGOX_CFLAGS""... $ac_c" 1>&6 -echo "configure:14634: checking PANGOX_CFLAGS" >&5 +echo "configure:14543: checking PANGOX_CFLAGS" >&5 PANGOX_CFLAGS=`$PKG_CONFIG --cflags "pangox"` echo "$ac_t""$PANGOX_CFLAGS" 1>&6 echo $ac_n "checking PANGOX_LIBS""... $ac_c" 1>&6 -echo "configure:14639: checking PANGOX_LIBS" >&5 +echo "configure:14548: checking PANGOX_LIBS" >&5 PANGOX_LIBS=`$PKG_CONFIG --libs "pangox"` echo "$ac_t""$PANGOX_LIBS" 1>&6 else @@ -14674,7 +14583,7 @@ echo "configure:14639: checking PANGOX_LIBS" >&5 # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:14678: checking for $ac_word" >&5 +echo "configure:14587: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -14718,19 +14627,19 @@ fi PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then echo $ac_n "checking for pangoft2""... $ac_c" 1>&6 -echo "configure:14722: checking for pangoft2" >&5 +echo "configure:14631: checking for pangoft2" >&5 if $PKG_CONFIG --exists "pangoft2" ; then echo "$ac_t""yes" 1>&6 succeeded=yes echo $ac_n "checking PANGOFT2_CFLAGS""... $ac_c" 1>&6 -echo "configure:14729: checking PANGOFT2_CFLAGS" >&5 +echo "configure:14638: checking PANGOFT2_CFLAGS" >&5 PANGOFT2_CFLAGS=`$PKG_CONFIG --cflags "pangoft2"` echo "$ac_t""$PANGOFT2_CFLAGS" 1>&6 echo $ac_n "checking PANGOFT2_LIBS""... $ac_c" 1>&6 -echo "configure:14734: checking PANGOFT2_LIBS" >&5 +echo "configure:14643: checking PANGOFT2_LIBS" >&5 PANGOFT2_LIBS=`$PKG_CONFIG --libs "pangoft2"` echo "$ac_t""$PANGOFT2_LIBS" 1>&6 else @@ -14770,7 +14679,7 @@ echo "configure:14734: checking PANGOFT2_LIBS" >&5 # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:14774: checking for $ac_word" >&5 +echo "configure:14683: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -14814,19 +14723,19 @@ fi PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then echo $ac_n "checking for pangoxft""... $ac_c" 1>&6 -echo "configure:14818: checking for pangoxft" >&5 +echo "configure:14727: checking for pangoxft" >&5 if $PKG_CONFIG --exists "pangoxft" ; then echo "$ac_t""yes" 1>&6 succeeded=yes echo $ac_n "checking PANGOXFT_CFLAGS""... $ac_c" 1>&6 -echo "configure:14825: checking PANGOXFT_CFLAGS" >&5 +echo "configure:14734: checking PANGOXFT_CFLAGS" >&5 PANGOXFT_CFLAGS=`$PKG_CONFIG --cflags "pangoxft"` echo "$ac_t""$PANGOXFT_CFLAGS" 1>&6 echo $ac_n "checking PANGOXFT_LIBS""... $ac_c" 1>&6 -echo "configure:14830: checking PANGOXFT_LIBS" >&5 +echo "configure:14739: checking PANGOXFT_LIBS" >&5 PANGOXFT_LIBS=`$PKG_CONFIG --libs "pangoxft"` echo "$ac_t""$PANGOXFT_LIBS" 1>&6 else @@ -14896,17 +14805,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:14900: checking whether -R must be followed by a space" >&5 +echo "configure:14809: 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:14819: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_nospace=yes else @@ -14922,14 +14831,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:14842: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_space=yes else @@ -14961,7 +14870,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:14965: checking for dnet_ntoa in -ldnet" >&5 +echo "configure:14874: 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 @@ -14969,7 +14878,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:14893: \"$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 @@ -15002,7 +14911,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:15006: checking for dnet_ntoa in -ldnet_stub" >&5 +echo "configure:14915: 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 @@ -15010,7 +14919,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:14934: \"$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 @@ -15050,12 +14959,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:15054: checking for gethostbyname" >&5 +echo "configure:14963: 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:14991: \"$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 @@ -15099,7 +15008,7 @@ fi if test $ac_cv_func_gethostbyname = no; then echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:15103: checking for gethostbyname in -lnsl" >&5 +echo "configure:15012: 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 @@ -15107,7 +15016,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:15031: \"$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 @@ -15148,12 +15057,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:15152: checking for connect" >&5 +echo "configure:15061: 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:15089: \"$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 @@ -15197,7 +15106,7 @@ fi if test $ac_cv_func_connect = no; then echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 -echo "configure:15201: checking for connect in -lsocket" >&5 +echo "configure:15110: 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 @@ -15205,7 +15114,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:15129: \"$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 @@ -15240,12 +15149,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:15244: checking for remove" >&5 +echo "configure:15153: 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:15181: \"$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 @@ -15289,7 +15198,7 @@ fi if test $ac_cv_func_remove = no; then echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 -echo "configure:15293: checking for remove in -lposix" >&5 +echo "configure:15202: 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 @@ -15297,7 +15206,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:15221: \"$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 @@ -15332,12 +15241,12 @@ fi # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. echo $ac_n "checking for shmat""... $ac_c" 1>&6 -echo "configure:15336: checking for shmat" >&5 +echo "configure:15245: 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:15273: \"$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 @@ -15381,7 +15290,7 @@ fi if test $ac_cv_func_shmat = no; then echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 -echo "configure:15385: checking for shmat in -lipc" >&5 +echo "configure:15294: 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 @@ -15389,7 +15298,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:15313: \"$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 @@ -15433,7 +15342,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:15437: checking for IceConnectionNumber in -lICE" >&5 +echo "configure:15346: 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 @@ -15441,7 +15350,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:15365: \"$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 @@ -15487,7 +15396,7 @@ fi COMPILED_X_PROGRAM=0 echo $ac_n "checking for Motif/Lesstif headers""... $ac_c" 1>&6 -echo "configure:15491: checking for Motif/Lesstif headers" >&5 +echo "configure:15400: checking for Motif/Lesstif headers" >&5 ac_find_includes= for ac_dir in $SEARCH_INCLUDE /usr/include; @@ -15516,7 +15425,7 @@ for ac_dir in $SEARCH_INCLUDE /usr/include; TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE$ac_path_to_include" else cat > conftest.$ac_ext < @@ -15528,7 +15437,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:15532: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:15441: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""found in default search path" 1>&6 @@ -15549,7 +15458,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:15553: checking for Motif/Lesstif library" >&5 +echo "configure:15462: checking for Motif/Lesstif library" >&5 ac_find_libraries= for ac_dir in $SEARCH_LIB /usr/lib; @@ -15580,7 +15489,7 @@ for ac_dir in $SEARCH_LIB /usr/lib; CFLAGS="$CFLAGS $TOOLKIT_INCLUDE" cat > conftest.$ac_ext < @@ -15592,7 +15501,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:15596: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:15505: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""found in default search path" 1>&6 @@ -15616,7 +15525,7 @@ rm -f conftest* xpm_link= echo $ac_n "checking for Xpm library""... $ac_c" 1>&6 -echo "configure:15620: checking for Xpm library" >&5 +echo "configure:15529: checking for Xpm library" >&5 ac_find_libraries= for ac_dir in $SEARCH_LIB /usr/lib; @@ -15652,7 +15561,7 @@ EOF CFLAGS="$CFLAGS $TOOLKIT_INCLUDE" cat > conftest.$ac_ext < @@ -15664,7 +15573,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:15668: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:15577: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* xpm_link=" -lXpm" @@ -15691,7 +15600,7 @@ rm -f conftest* fi echo $ac_n "checking if we need -lXp and/or -lSM -lICE""... $ac_c" 1>&6 -echo "configure:15695: checking if we need -lXp and/or -lSM -lICE" >&5 +echo "configure:15604: checking if we need -lXp and/or -lSM -lICE" >&5 libp_link="" libsm_ice_link="" libs_found=0 @@ -15705,7 +15614,7 @@ echo "configure:15695: checking if we need -lXp and/or -lSM -lICE" >&5 CFLAGS="$CFLAGS $TOOLKIT_INCLUDE" cat > conftest.$ac_ext < @@ -15720,7 +15629,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:15724: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15633: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* libp_link="$libp" @@ -15752,9 +15661,9 @@ rm -f conftest* save_CFLAGS=$CFLAGS CFLAGS="$CFLAGS $TOOLKIT_INCLUDE" echo $ac_n "checking for Motif 2""... $ac_c" 1>&6 -echo "configure:15756: checking for Motif 2" >&5 +echo "configure:15665: checking for Motif 2" >&5 cat > conftest.$ac_ext < @@ -15767,7 +15676,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:15771: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:15680: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF @@ -15916,17 +15825,17 @@ if test "$wxUSE_OPENGL" = "yes"; then else ac_safe=`echo "GL/gl.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for GL/gl.h""... $ac_c" 1>&6 -echo "configure:15920: checking for GL/gl.h" >&5 +echo "configure:15829: 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:15930: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:15839: \"$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* @@ -15944,7 +15853,7 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for -lGL""... $ac_c" 1>&6 -echo "configure:15948: checking for -lGL" >&5 +echo "configure:15857: checking for -lGL" >&5 ac_find_libraries= for ac_dir in $SEARCH_LIB /usr/lib; @@ -15977,7 +15886,7 @@ for ac_dir in $SEARCH_LIB /usr/lib; else echo "$ac_t""no" 1>&6 echo $ac_n "checking for -lMesaGL""... $ac_c" 1>&6 -echo "configure:15981: checking for -lMesaGL" >&5 +echo "configure:15890: checking for -lMesaGL" >&5 ac_find_libraries= for ac_dir in $SEARCH_LIB /usr/lib; @@ -16088,7 +15997,7 @@ case "${host}" in ;; *-*-darwin* ) - + WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}.${SO_SUFFIX}" WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY_GL}.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}.${SO_SUFFIX}" @@ -16148,7 +16057,7 @@ if test "$wxUSE_SHARED" = "yes"; then if test $found_versioning = no ; then echo $ac_n "checking if the linker accepts --version-script""... $ac_c" 1>&6 -echo "configure:16152: checking if the linker accepts --version-script" >&5 +echo "configure:16061: checking if the linker accepts --version-script" >&5 if eval "test \"`echo '$''{'wx_cv_version_script'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -16158,7 +16067,7 @@ else if { ac_try=' $CXX -o conftest.output $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.cpp - -Wl,--version-script,conftest.sym >/dev/null 2>conftest.stderr'; { (eval echo configure:16162: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } ; then + -Wl,--version-script,conftest.sym >/dev/null 2>conftest.stderr'; { (eval echo configure:16071: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } ; then if test -s conftest.stderr ; then wx_cv_version_script=no else @@ -16202,13 +16111,13 @@ echo "$ac_t""$wx_cv_version_script" 1>&6 *-*-linux* ) if test "$GCC" != "yes"; then echo $ac_n "checking for Intel compiler""... $ac_c" 1>&6 -echo "configure:16206: checking for Intel compiler" >&5 +echo "configure:16115: checking for Intel compiler" >&5 if eval "test \"`echo '$''{'wx_cv_prog_icc'+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:16132: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_prog_icc=yes else @@ -16272,7 +16181,7 @@ echo "$ac_t""$wx_cv_prog_icc" 1>&6 # Extract the first word of "makeC++SharedLib", so it can be a program name with args. set dummy makeC++SharedLib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:16276: checking for $ac_word" >&5 +echo "configure:16185: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AIX_CXX_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -16388,7 +16297,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:16392: checking for $ac_word" >&5 +echo "configure:16301: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RESCOMP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -16418,7 +16327,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:16422: checking for $ac_word" >&5 +echo "configure:16331: 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 @@ -16448,7 +16357,7 @@ fi # Extract the first word of "SetFile", so it can be a program name with args. set dummy SetFile; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:16452: checking for $ac_word" >&5 +echo "configure:16361: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_SETFILE'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -16487,12 +16396,12 @@ fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:16491: checking for ANSI C header files" >&5 +echo "configure:16400: 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 @@ -16500,7 +16409,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:16504: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:16413: \"$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* @@ -16517,7 +16426,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 @@ -16535,7 +16444,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 @@ -16556,7 +16465,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -16567,7 +16476,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:16571: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:16480: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -16591,12 +16500,12 @@ EOF fi echo $ac_n "checking for mode_t""... $ac_c" 1>&6 -echo "configure:16595: checking for mode_t" >&5 +echo "configure:16504: 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 @@ -16624,12 +16533,12 @@ EOF fi echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:16628: checking for off_t" >&5 +echo "configure:16537: 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 @@ -16657,12 +16566,12 @@ EOF fi echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:16661: checking for pid_t" >&5 +echo "configure:16570: 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 @@ -16690,12 +16599,12 @@ EOF fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:16694: checking for size_t" >&5 +echo "configure:16603: 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 @@ -16723,12 +16632,12 @@ EOF fi echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:16727: checking for uid_t in sys/types.h" >&5 +echo "configure:16636: 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 @@ -16766,12 +16675,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:16770: checking if size_t is unsigned int" >&5 +echo "configure:16679: 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() { @@ -16784,7 +16693,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:16788: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:16697: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_size_t_is_uint=no else @@ -16807,12 +16716,12 @@ EOF else echo $ac_n "checking if size_t is unsigned long""... $ac_c" 1>&6 -echo "configure:16811: checking if size_t is unsigned long" >&5 +echo "configure:16720: 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() { @@ -16825,7 +16734,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:16829: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:16738: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_size_t_is_ulong=no else @@ -16859,13 +16768,13 @@ cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking for pw_gecos in struct passwd""... $ac_c" 1>&6 -echo "configure:16863: checking for pw_gecos in struct passwd" >&5 +echo "configure:16772: 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() { @@ -16876,7 +16785,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:16880: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:16789: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_struct_pw_gecos=yes @@ -16916,12 +16825,12 @@ EOF for ac_func in wcslen do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:16920: checking for $ac_func" >&5 +echo "configure:16829: 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:16857: \"$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 @@ -16972,7 +16881,7 @@ done if test "$WCSLEN_FOUND" = 0; then if test "$TOOLKIT" = "MSW"; then echo $ac_n "checking for wcslen in -lmsvcrt""... $ac_c" 1>&6 -echo "configure:16976: checking for wcslen in -lmsvcrt" >&5 +echo "configure:16885: checking for wcslen in -lmsvcrt" >&5 ac_lib_var=`echo msvcrt'_'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 @@ -16980,7 +16889,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lmsvcrt $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16904: \"$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 @@ -17013,7 +16922,7 @@ fi else echo $ac_n "checking for wcslen in -lw""... $ac_c" 1>&6 -echo "configure:17017: checking for wcslen in -lw" >&5 +echo "configure:16926: 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 @@ -17021,7 +16930,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:16945: \"$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 @@ -17068,12 +16977,12 @@ EOF for ac_func in wcsrtombs do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:17072: checking for $ac_func" >&5 +echo "configure:16981: 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:17009: \"$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 @@ -17136,12 +17045,12 @@ cross_compiling=$ac_cv_prog_cxx_cross for ac_func in vsnprintf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:17140: checking for $ac_func" >&5 +echo "configure:17049: 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:17080: \"$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 @@ -17194,13 +17103,13 @@ done if test "$ac_cv_func_vsnprintf" = "yes"; then echo $ac_n "checking for vsnprintf declaration""... $ac_c" 1>&6 -echo "configure:17198: checking for vsnprintf declaration" >&5 +echo "configure:17107: checking for vsnprintf declaration" >&5 if eval "test \"`echo '$''{'wx_cv_func_vsnprintf_decl'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -17214,7 +17123,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:17218: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:17127: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_func_vsnprintf_decl=yes else @@ -17243,12 +17152,12 @@ if test "$wxUSE_UNICODE" = yes; then for ac_func in fputwc wprintf vswprintf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:17247: checking for $ac_func" >&5 +echo "configure:17156: 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:17187: \"$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 @@ -17300,16 +17209,16 @@ done echo $ac_n "checking for _vsnwprintf""... $ac_c" 1>&6 -echo "configure:17304: checking for _vsnwprintf" >&5 +echo "configure:17213: checking for _vsnwprintf" >&5 cat > conftest.$ac_ext < int main() { &_vsnwprintf; ; return 0; } EOF -if { (eval echo configure:17313: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:17222: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 cat >> confdefs.h <<\EOF @@ -17361,7 +17270,7 @@ fi echo $ac_n "checking for iconv""... $ac_c" 1>&6 -echo "configure:17365: checking for iconv" >&5 +echo "configure:17274: checking for iconv" >&5 if eval "test \"`echo '$''{'am_cv_func_iconv'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -17369,7 +17278,7 @@ else am_cv_func_iconv="no, consider installing GNU libiconv" am_cv_lib_iconv=no cat > conftest.$ac_ext < #include @@ -17379,7 +17288,7 @@ iconv_t cd = iconv_open("",""); iconv_close(cd); ; return 0; } EOF -if { (eval echo configure:17383: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17292: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_func_iconv=yes else @@ -17391,7 +17300,7 @@ rm -f conftest* am_save_LIBS="$LIBS" LIBS="$LIBS -liconv" cat > conftest.$ac_ext < #include @@ -17401,7 +17310,7 @@ iconv_t cd = iconv_open("",""); iconv_close(cd); ; return 0; } EOF -if { (eval echo configure:17405: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17314: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_lib_iconv=yes am_cv_func_iconv=yes @@ -17422,12 +17331,12 @@ echo "$ac_t""$am_cv_func_iconv" 1>&6 EOF echo $ac_n "checking if iconv needs const""... $ac_c" 1>&6 -echo "configure:17426: checking if iconv needs const" >&5 +echo "configure:17335: checking if iconv needs const" >&5 if eval "test \"`echo '$''{'wx_cv_func_iconv_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -17446,7 +17355,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:17450: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:17359: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_func_iconv_const="no" else @@ -17491,12 +17400,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:17495: checking for $ac_func" >&5 +echo "configure:17404: 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:17432: \"$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 @@ -17560,13 +17469,13 @@ cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking for sa_handler type""... $ac_c" 1>&6 -echo "configure:17564: checking for sa_handler type" >&5 +echo "configure:17473: 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() { @@ -17578,7 +17487,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:17582: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:17491: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_type_sa_handler=int @@ -17615,12 +17524,12 @@ fi for ac_func in mkstemp mktemp do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:17619: checking for $ac_func" >&5 +echo "configure:17528: 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:17556: \"$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 @@ -17669,12 +17578,12 @@ done echo $ac_n "checking for statfs""... $ac_c" 1>&6 -echo "configure:17673: checking for statfs" >&5 +echo "configure:17582: checking for statfs" >&5 if eval "test \"`echo '$''{'wx_cv_func_statfs'+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:17608: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_func_statfs=yes @@ -17723,12 +17632,12 @@ EOF else echo $ac_n "checking for statvfs""... $ac_c" 1>&6 -echo "configure:17727: checking for statvfs" >&5 +echo "configure:17636: checking for statvfs" >&5 if eval "test \"`echo '$''{'wx_cv_func_statvfs'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -17740,7 +17649,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:17744: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:17653: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_func_statvfs=yes else @@ -17767,12 +17676,12 @@ cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking for statvfs argument type""... $ac_c" 1>&6 -echo "configure:17771: checking for statvfs argument type" >&5 +echo "configure:17680: checking for statvfs argument type" >&5 if eval "test \"`echo '$''{'wx_cv_type_statvfs_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -17788,7 +17697,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:17792: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:17701: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_type_statvfs_t=statvfs_t else @@ -17797,7 +17706,7 @@ else rm -rf conftest* cat > conftest.$ac_ext < @@ -17813,7 +17722,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:17817: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:17726: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_type_statvfs_t="struct statvfs" else @@ -17865,12 +17774,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:17869: checking for $ac_func" >&5 +echo "configure:17778: 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:17806: \"$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 @@ -17927,12 +17836,12 @@ fi for ac_func in timegm do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:17931: checking for $ac_func" >&5 +echo "configure:17840: 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:17868: \"$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 @@ -17983,12 +17892,12 @@ done for ac_func in putenv setenv do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:17987: checking for $ac_func" >&5 +echo "configure:17896: 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:17924: \"$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 @@ -18058,12 +17967,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:18062: checking for $ac_func" >&5 +echo "configure:17971: 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:17999: \"$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 @@ -18111,7 +18020,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for nanosleep in -lposix4""... $ac_c" 1>&6 -echo "configure:18115: checking for nanosleep in -lposix4" >&5 +echo "configure:18024: 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 @@ -18119,7 +18028,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:18043: \"$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 @@ -18158,12 +18067,12 @@ else for ac_func in usleep do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:18162: checking for $ac_func" >&5 +echo "configure:18071: 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:18099: \"$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 @@ -18229,12 +18138,12 @@ fi for ac_func in uname gethostname do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:18233: checking for $ac_func" >&5 +echo "configure:18142: 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:18170: \"$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 @@ -18294,12 +18203,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:18298: checking for $ac_func" >&5 +echo "configure:18207: 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:18238: \"$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 @@ -18362,12 +18271,12 @@ INET_LINK= for ac_func in inet_addr do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:18366: checking for $ac_func" >&5 +echo "configure:18275: 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:18303: \"$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 @@ -18415,7 +18324,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for inet_addr in -lnsl""... $ac_c" 1>&6 -echo "configure:18419: checking for inet_addr in -lnsl" >&5 +echo "configure:18328: 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 @@ -18423,7 +18332,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:18347: \"$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 @@ -18453,7 +18362,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:18457: checking for inet_addr in -lresolv" >&5 +echo "configure:18366: 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 @@ -18461,7 +18370,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:18385: \"$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 @@ -18491,7 +18400,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 -lsocket""... $ac_c" 1>&6 -echo "configure:18495: checking for inet_addr in -lsocket" >&5 +echo "configure:18404: checking for inet_addr in -lsocket" >&5 ac_lib_var=`echo socket'_'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 @@ -18499,7 +18408,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:18423: \"$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 @@ -18546,12 +18455,12 @@ done for ac_func in inet_aton do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:18550: checking for $ac_func" >&5 +echo "configure:18459: 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:18487: \"$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 @@ -18599,7 +18508,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:18603: checking for inet_aton in -l$INET_LINK" >&5 +echo "configure:18512: 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 @@ -18607,7 +18516,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:18531: \"$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 @@ -18754,18 +18663,18 @@ if test "$TOOLKIT" != "MSW"; then case $flag in none) echo $ac_n "checking whether pthreads work without any flags""... $ac_c" 1>&6 -echo "configure:18758: checking whether pthreads work without any flags" >&5 +echo "configure:18667: checking whether pthreads work without any flags" >&5 ;; -*) echo $ac_n "checking whether pthreads work with $flag""... $ac_c" 1>&6 -echo "configure:18763: checking whether pthreads work with $flag" >&5 +echo "configure:18672: checking whether pthreads work with $flag" >&5 THREADS_CFLAGS="$flag" ;; *) echo $ac_n "checking for the pthreads library -l$flag""... $ac_c" 1>&6 -echo "configure:18769: checking for the pthreads library -l$flag" >&5 +echo "configure:18678: checking for the pthreads library -l$flag" >&5 THREADS_LINK="-l$flag" ;; esac @@ -18776,14 +18685,14 @@ echo "configure:18769: checking for the pthreads library -l$flag" >&5 CFLAGS="$THREADS_CFLAGS $CFLAGS" cat > conftest.$ac_ext < int main() { pthread_create(0,0,0,0); ; return 0; } EOF -if { (eval echo configure:18787: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:18696: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* THREADS_OK=yes else @@ -18812,7 +18721,7 @@ rm -f conftest* LIBS="$THREADS_LINK $LIBS" echo $ac_n "checking if more special flags are required for pthreads""... $ac_c" 1>&6 -echo "configure:18816: checking if more special flags are required for pthreads" >&5 +echo "configure:18725: checking if more special flags are required for pthreads" >&5 flag=no case "${host}" in *-aix*) @@ -18848,12 +18757,12 @@ echo "configure:18816: checking if more special flags are required for pthreads" for ac_func in thr_setconcurrency do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:18852: checking for $ac_func" >&5 +echo "configure:18761: 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:18789: \"$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 @@ -18905,17 +18814,17 @@ done do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:18909: checking for $ac_hdr" >&5 +echo "configure:18818: 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:18919: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:18828: \"$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* @@ -18943,12 +18852,12 @@ done if test "$ac_cv_header_sched_h" = "yes"; then echo $ac_n "checking for sched_yield""... $ac_c" 1>&6 -echo "configure:18947: checking for sched_yield" >&5 +echo "configure:18856: checking for sched_yield" >&5 if eval "test \"`echo '$''{'ac_cv_func_sched_yield'+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:18884: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_sched_yield=yes" else @@ -18993,7 +18902,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for sched_yield in -lposix4""... $ac_c" 1>&6 -echo "configure:18997: checking for sched_yield in -lposix4" >&5 +echo "configure:18906: 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 @@ -19001,7 +18910,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:18925: \"$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 @@ -19045,12 +18954,12 @@ fi HAVE_PRIOR_FUNCS=0 echo $ac_n "checking for pthread_attr_getschedpolicy""... $ac_c" 1>&6 -echo "configure:19049: checking for pthread_attr_getschedpolicy" >&5 +echo "configure:18958: checking for pthread_attr_getschedpolicy" >&5 if eval "test \"`echo '$''{'ac_cv_func_pthread_attr_getschedpolicy'+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:18986: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_pthread_attr_getschedpolicy=yes" else @@ -19088,12 +18997,12 @@ fi if eval "test \"`echo '$ac_cv_func_'pthread_attr_getschedpolicy`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for pthread_attr_setschedparam""... $ac_c" 1>&6 -echo "configure:19092: checking for pthread_attr_setschedparam" >&5 +echo "configure:19001: checking for pthread_attr_setschedparam" >&5 if eval "test \"`echo '$''{'ac_cv_func_pthread_attr_setschedparam'+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:19029: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_pthread_attr_setschedparam=yes" else @@ -19131,12 +19040,12 @@ fi if eval "test \"`echo '$ac_cv_func_'pthread_attr_setschedparam`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for sched_get_priority_max""... $ac_c" 1>&6 -echo "configure:19135: checking for sched_get_priority_max" >&5 +echo "configure:19044: checking for sched_get_priority_max" >&5 if eval "test \"`echo '$''{'ac_cv_func_sched_get_priority_max'+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:19074: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_sched_get_priority_max=yes" else @@ -19179,7 +19088,7 @@ if eval "test \"`echo '$ac_cv_func_'sched_get_priority_max`\" = 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:19183: checking for sched_get_priority_max in -lposix4" >&5 +echo "configure:19092: 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 @@ -19187,7 +19096,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:19111: \"$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 @@ -19243,12 +19152,12 @@ EOF fi echo $ac_n "checking for pthread_cancel""... $ac_c" 1>&6 -echo "configure:19247: checking for pthread_cancel" >&5 +echo "configure:19156: checking for pthread_cancel" >&5 if eval "test \"`echo '$''{'ac_cv_func_pthread_cancel'+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:19184: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_pthread_cancel=yes" else @@ -19296,13 +19205,13 @@ fi echo $ac_n "checking for pthread_cleanup_push/pop""... $ac_c" 1>&6 -echo "configure:19300: checking for pthread_cleanup_push/pop" >&5 +echo "configure:19209: 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() { @@ -19312,7 +19221,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:19316: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:19225: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_func_pthread_cleanup_push=yes @@ -19340,13 +19249,13 @@ EOF echo $ac_n "checking for pthread_mutexattr_t""... $ac_c" 1>&6 -echo "configure:19344: checking for pthread_mutexattr_t" >&5 +echo "configure:19253: 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() { @@ -19356,7 +19265,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:19360: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:19269: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_type_pthread_mutexattr_t=yes @@ -19383,13 +19292,13 @@ EOF else echo $ac_n "checking for PTHREAD_RECURSIVE_MUTEX_INITIALIZER""... $ac_c" 1>&6 -echo "configure:19387: checking for PTHREAD_RECURSIVE_MUTEX_INITIALIZER" >&5 +echo "configure:19296: 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() { @@ -19398,7 +19307,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:19402: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:19311: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_type_pthread_rec_mutex_init=yes @@ -19433,7 +19342,7 @@ else case "${host}" in *-*-mingw32* ) echo $ac_n "checking if compiler supports -mthreads""... $ac_c" 1>&6 -echo "configure:19437: checking if compiler supports -mthreads" >&5 +echo "configure:19346: checking if compiler supports -mthreads" >&5 if eval "test \"`echo '$''{'wx_cv_cflags_mthread'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -19441,14 +19350,14 @@ else CFLAGS_OLD="$CFLAGS" CFLAGS="$CFLAGS -mthreads" cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:19361: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_cflags_mthread=yes else @@ -19487,7 +19396,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:19491: checking if -D_REENTRANT is needed" >&5 +echo "configure:19400: checking if -D_REENTRANT is needed" >&5 if test "$NEEDS_D_REENTRANT_FOR_R_FUNCS" = 1; then TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D_REENTRANT" echo "$ac_t""yes" 1>&6 @@ -19707,13 +19616,6 @@ EOF fi -if test "$wxUSE_TIMEDATE" = "yes"; then - cat >> confdefs.h <<\EOF -#define wxUSE_TIMEDATE 1 -EOF - -fi - if test "$wxUSE_FILE" = "yes"; then cat >> confdefs.h <<\EOF #define wxUSE_FILE 1 @@ -19889,12 +19791,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:19893: checking for $ac_func" >&5 +echo "configure:19795: 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:19823: \"$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 @@ -19943,13 +19845,13 @@ done echo $ac_n "checking for timezone variable in ""... $ac_c" 1>&6 -echo "configure:19947: checking for timezone variable in " >&5 +echo "configure:19849: 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 < @@ -19961,7 +19863,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:19965: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:19867: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_var_timezone=timezone @@ -19972,7 +19874,7 @@ else rm -rf conftest* cat > conftest.$ac_ext < @@ -19984,7 +19886,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:19988: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:19890: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_var_timezone=_timezone @@ -19995,7 +19897,7 @@ else rm -rf conftest* cat > conftest.$ac_ext < @@ -20007,7 +19909,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:20011: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:19913: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_var_timezone=__timezone @@ -20048,12 +19950,12 @@ EOF for ac_func in localtime do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:20052: checking for $ac_func" >&5 +echo "configure:19954: 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:19982: \"$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 @@ -20103,13 +20005,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:20107: checking for tm_gmtoff in struct tm" >&5 +echo "configure:20009: 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 < @@ -20121,7 +20023,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:20125: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:20027: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_struct_tm_has_gmtoff=yes @@ -20150,12 +20052,12 @@ EOF for ac_func in gettimeofday ftime do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:20154: checking for $ac_func" >&5 +echo "configure:20056: 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:20084: \"$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 @@ -20205,7 +20107,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:20209: checking whether gettimeofday takes two arguments" >&5 +echo "configure:20111: 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 @@ -20220,7 +20122,7 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext < @@ -20233,7 +20135,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:20237: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:20139: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_func_gettimeofday_has_2_args=yes else @@ -20241,7 +20143,7 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext < @@ -20254,7 +20156,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:20258: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:20160: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_func_gettimeofday_has_2_args=no else @@ -20291,10 +20193,6 @@ EOF fi fi - cat >> confdefs.h <<\EOF -#define wxUSE_TIMEDATE 1 -EOF - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS typetest" fi @@ -20309,12 +20207,12 @@ fi if test "$wxUSE_SOCKETS" = "yes"; then if test "$TOOLKIT" != "MSW"; then echo $ac_n "checking for socket""... $ac_c" 1>&6 -echo "configure:20313: checking for socket" >&5 +echo "configure:20211: 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:20239: \"$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 @@ -20355,7 +20253,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:20359: checking for socket in -lsocket" >&5 +echo "configure:20257: 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 @@ -20363,7 +20261,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:20276: \"$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 @@ -20410,7 +20308,7 @@ fi if test "$wxUSE_SOCKETS" = "yes" ; then if test "$TOOLKIT" != "MSW"; then echo $ac_n "checking what is the type of the third argument of getsockname""... $ac_c" 1>&6 -echo "configure:20414: checking what is the type of the third argument of getsockname" >&5 +echo "configure:20312: 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 @@ -20425,7 +20323,7 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext < @@ -20438,7 +20336,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:20442: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:20340: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_type_getsockname3=socklen_t else @@ -20446,7 +20344,7 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext < @@ -20459,7 +20357,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:20463: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:20361: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_type_getsockname3=size_t else @@ -20467,7 +20365,7 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext < @@ -20480,7 +20378,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:20484: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:20382: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_type_getsockname3=int else @@ -20552,17 +20450,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:20556: checking for $ac_hdr" >&5 +echo "configure:20454: 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:20566: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:20464: \"$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* @@ -20616,12 +20514,12 @@ if test "$TOOLKIT" != "MSW"; then for ac_func in dlopen do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:20620: checking for $ac_func" >&5 +echo "configure:20518: 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:20546: \"$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 @@ -20672,7 +20570,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:20676: checking for dlopen in -ldl" >&5 +echo "configure:20574: 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 @@ -20680,7 +20578,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:20593: \"$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 @@ -20720,12 +20618,12 @@ else for ac_func in shl_load do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:20724: checking for $ac_func" >&5 +echo "configure:20622: 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:20650: \"$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 @@ -20776,7 +20674,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dld in -lshl_load""... $ac_c" 1>&6 -echo "configure:20780: checking for dld in -lshl_load" >&5 +echo "configure:20678: 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 @@ -20784,7 +20682,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:20697: \"$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 @@ -20834,12 +20732,12 @@ done for ac_func in dlerror do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:20838: checking for $ac_func" >&5 +echo "configure:20736: 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:20764: \"$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 @@ -20887,7 +20785,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dlerror in -ldl""... $ac_c" 1>&6 -echo "configure:20891: checking for dlerror in -ldl" >&5 +echo "configure:20789: 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 @@ -20895,7 +20793,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:20808: \"$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 @@ -20981,7 +20879,7 @@ EOF if test "$wxUSE_MSW" = 1 -a "$wxUSE_UNICODE_MSLU" = "yes"; then echo $ac_n "checking for main in -lunicows""... $ac_c" 1>&6 -echo "configure:20985: checking for main in -lunicows" >&5 +echo "configure:20883: checking for main in -lunicows" >&5 ac_lib_var=`echo unicows'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -20989,14 +20887,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lunicows $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:20898: \"$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 @@ -21178,17 +21076,17 @@ if test "$wxUSE_MSW" = 1 -a \( "$wxUSE_DATAOBJ" = "yes" \ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:21182: checking for $ac_hdr" >&5 +echo "configure:21080: 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:21192: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:21090: \"$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* @@ -21227,9 +21125,9 @@ cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking if g++ requires -fvtable-thunks""... $ac_c" 1>&6 -echo "configure:21231: checking if g++ requires -fvtable-thunks" >&5 +echo "configure:21129: checking if g++ requires -fvtable-thunks" >&5 cat > conftest.$ac_ext < #include @@ -21237,7 +21135,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:21241: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:21139: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""no" 1>&6 else @@ -21457,16 +21355,6 @@ EOF USES_CONTROLS=1 fi -if test "$wxUSE_NEW_GRID" = "yes"; then - wxUSE_GRID="yes" - cat >> confdefs.h <<\EOF -#define wxUSE_NEW_GRID 1 -EOF - - USES_CONTROLS=1 - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS newgrid" -fi - if test "$wxUSE_GRID" = "yes"; then cat >> confdefs.h <<\EOF #define wxUSE_GRID 1 @@ -22093,12 +21981,12 @@ have_floor=0 for ac_func in cos do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:22097: checking for $ac_func" >&5 +echo "configure:21985: 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:22013: \"$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 @@ -22148,12 +22036,12 @@ done for ac_func in floor do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:22152: checking for $ac_func" >&5 +echo "configure:22040: 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:22068: \"$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 @@ -22201,7 +22089,7 @@ fi done echo $ac_n "checking if floating point functions link without -lm""... $ac_c" 1>&6 -echo "configure:22205: checking if floating point functions link without -lm" >&5 +echo "configure:22093: checking if floating point functions link without -lm" >&5 if test "$have_cos" = 1 -a "$have_floor" = 1; then echo "$ac_t""yes" 1>&6 else @@ -22213,12 +22101,12 @@ else for ac_func in sin do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:22217: checking for $ac_func" >&5 +echo "configure:22105: 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:22133: \"$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 @@ -22268,12 +22156,12 @@ done for ac_func in ceil do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:22272: checking for $ac_func" >&5 +echo "configure:22160: 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:22188: \"$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 @@ -22321,7 +22209,7 @@ fi done echo $ac_n "checking if floating point functions link with -lm""... $ac_c" 1>&6 -echo "configure:22325: checking if floating point functions link with -lm" >&5 +echo "configure:22213: checking if floating point functions link with -lm" >&5 if test "$have_sin" = 1 -a "$have_ceil" = 1; then echo "$ac_t""yes" 1>&6 else @@ -22337,7 +22225,7 @@ if test "$wxUSE_GUI" = "yes"; then SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS artprov controls dialogs \ drawing dynamic erase event exec font image \ - minimal propsize rotate widgets" + minimal propsize rotate shaped widgets" CPPFLAGS="$CPPFLAGS \$(EXTRADEFS) \$(APPEXTRADEFS)" else @@ -22477,7 +22365,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:22481: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:22369: 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 3f9a95025d..898a70c917 100644 --- a/configure.in +++ b/configure.in @@ -228,7 +228,7 @@ case "${host}" in dnl dnl Both archive libraries and shared libraries on AIX have an .a dnl extension. This will explain why you can't link with an .so and - dnl why it works with the name changed to .a. + dnl why it works with the name changed to .a. SO_SUFFIX=a AC_DEFINE(__AIX__) AC_DEFINE(__SYSV__) @@ -1469,7 +1469,7 @@ case "${host}" in fi ;; esac - + if test "$wxUSE_GUI" = "yes"; then if test "$wxUSE_UNIX" = "yes"; then dnl defines HAVE_X11_XKBLIB_H @@ -2275,7 +2275,7 @@ equivalent variable and GTK+ is version 1.2.3 or above. AC_MSG_ERROR([Cannot find MGL libraries, make sure they are compiled.]) fi AC_MSG_RESULT("$MGL_ROOT/lib/$mgl_lib_type/$mgl_os") - + wxUSE_UNIVERSAL="yes" TOOLKIT_INCLUDE="-I$MGL_ROOT/include" @@ -2850,7 +2850,7 @@ case "${host}" in *-*-darwin* ) dnl Under Mac OS X, the naming conventions for shared libraries dnl are different: the number precedes the suffix. - + WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}.${SO_SUFFIX}" WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY_GL}.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}.${SO_SUFFIX}" @@ -5355,7 +5355,7 @@ if test "$wxUSE_GUI" = "yes"; then dnl ipc, mfc, nativdlg, oleauto, ownerdrw SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS artprov controls dialogs \ drawing dynamic erase event exec font image \ - minimal propsize rotate widgets" + minimal propsize rotate shaped widgets" dnl this is needed to be able to find AFM files CPPFLAGS="$CPPFLAGS \$(EXTRADEFS) \$(APPEXTRADEFS)" diff --git a/distrib/msw/tmake/filelist.txt b/distrib/msw/tmake/filelist.txt index 69f874cc28..c21352da02 100644 --- a/distrib/msw/tmake/filelist.txt +++ b/distrib/msw/tmake/filelist.txt @@ -221,6 +221,7 @@ protocol.cpp Common Socket,Base quantize.cpp Common radiocmn.cpp Common regex.cpp Common Base +rgncmn.cpp Common resource.cpp Common sckaddr.cpp Common Socket,Base sckfile.cpp Common Socket,Base diff --git a/docs/changes.txt b/docs/changes.txt index 2958c1de90..328513bbda 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -63,6 +63,9 @@ All GUI ports: - use typesafe Get* instead wxListBase::operator wxList&() - use typesafe lists instead +- Added wxTLW::SetShape with implementations for wxMSW and wxGTK (so + far). + Unix: diff --git a/docs/latex/wx/frame.tex b/docs/latex/wx/frame.tex index e351ee10dc..6cbe7276e0 100644 --- a/docs/latex/wx/frame.tex +++ b/docs/latex/wx/frame.tex @@ -52,7 +52,7 @@ caption. When pressed, Windows will go into a context-sensitive help mode and wx a wxEVT\_HELP event if the user clicked on an application window. {\it Note} that this is an extended style and must be set by calling \helpref{SetExtraStyle}{wxwindowsetextrastyle} before Create is called (two-step construction). You cannot use this style together with wxMAXIMIZE\_BOX or wxMINIMIZE\_BOX, so -you should use +you should use {\tt wxDEFAULT\_FRAME\_STYLE \& (wxMINIMIZE\_BOX | wxMAXIMIZE\_BOX)} for the frames having this style (the dialogs don't have minimize nor maximize box by default)} @@ -73,7 +73,7 @@ wxFrame processes the following events: \twocolitem{\helpref{wxEVT\_SIZE}{wxsizeevent}}{If the frame has exactly one child window, not counting the status and toolbar, this child is resized to take the entire frame client area. If two or more windows are present, they -should be laid out explicitly either by manually handling wxEVT\_SIZE or using +should be laid out explicitly either by manually handling wxEVT\_SIZE or using \helpref{sizers}{sizeroverview}} \twocolitem{\helpref{wxEVT\_MENU\_HIGHLIGHT}{wxmenuevent}}{The default @@ -466,7 +466,7 @@ Sets the icons for this frame. See also \helpref{wxIconBundle}{wxiconbundle}. -% VZ: we don't have all this any more (18.08.00) +% VZ: we don't have all this any more (18.08.00) % %Under Windows, instead of using {\bf SetIcon}, you can add the %following lines to your MS Windows resource file: @@ -519,6 +519,17 @@ Note that it is not possible to call this function twice for the same frame obje \helpref{wxFrame::GetMenuBar}{wxframegetmenubar}, \helpref{wxMenuBar}{wxmenubar}, \helpref{wxMenu}{wxmenu}. +\membersection{wxFrame::SetShape}\label{wxframesetshape} + +\func{bool}{SetShape}{\param{const wxRegion&}{ region}} + +If the platform supports it, sets the shape of the window to that +depicted by \it{region}. The system will not display or +respond to any mouse event for the pixels that lie outside of the +region. To reset the window to the normal rectangular shape simply +call \it{SetShape} again with an empty region. Returns TRUE if the +operation is successful. + \membersection{wxFrame::SetStatusBar}\label{wxframesetstatusbar} \func{void}{SetStatusBar}{\param{wxStatusBar*}{ statusBar}} @@ -628,7 +639,7 @@ to hide in full-screen mode: This function has not been tested with MDI frames. -Note that showing a frame full screen also actually +Note that showing a frame full screen also actually \helpref{Show()s}{wxwindowshow} if it hadn't been shown yet. \wxheading{See also} diff --git a/docs/latex/wx/region.tex b/docs/latex/wx/region.tex index d9dd27d181..1f26deea5d 100644 --- a/docs/latex/wx/region.tex +++ b/docs/latex/wx/region.tex @@ -43,11 +43,19 @@ Constructs a region by copying another region. \func{}{wxRegion}{\param{size\_t}{ n}, \param{const wxPoint }{*points}, \param{int }{fillStyle = wxWINDING\_RULE}} Constructs a region corresponding to the polygon made of {\it n} points in the -provided array. {\it fillStyle} parameter may have values +provided array. {\it fillStyle} parameter may have values {\tt wxWINDING\_RULE} or {\tt wxODDEVEN\_RULE}. {\bf NB:} This constructor is only implemented for Win32 and GTK+ wxWindows ports. +\func{}{wxRegion}{\param{const wxBitmap&}{ bmp}, + \param{const wxColour&}{ transColour = wxNullColour}, + \param{int}{ tolerance = 0}} + +Constructs a region using the non-transparent pixels of a bitmap. See +\helpref{Union}{wxregionunion} for more details. + + \membersection{wxRegion::\destruct{wxRegion}} \func{}{\destruct{wxRegion}}{\void} @@ -85,6 +93,13 @@ The return value is one of wxOutRegion, wxPartRegion and wxInRegion. On Windows, only wxOutRegion and wxInRegion are returned; a value wxInRegion then indicates that all or some part of the region is contained in this region. +\membersection{wxRegion::ConvertToBitmap}\label{wxregionconverttobitmap} + +\constfunc{wxBitmap}{ConvertToBitmap}{} + +Convert the region to a black and white bitmap with the black pixels +being inside the region. + \membersection{wxRegion::GetBox}\label{wxregiongetbox} \constfunc{void}{GetBox}{\param{long\& }{x}, \param{long\& }{y}, \param{long\& }{width}, \param{long\& }{height}} @@ -168,6 +183,15 @@ Finds the union of this region and another, rectangular region. Finds the union of this region and another region. +\func{bool}{Union}{\param{const wxBitmap&}{ bmp}, + \param{const wxColour&}{ transColour = wxNullColour}, + \param{int}{ tolerance = 0}} + +Finds the union of this region and the the non-transparent pixels of a +bitmap. If the bitmap has a mask then it will be used, otherwise the +colour to be treated as transparent may be specified, along with an +optional colour tolerance value. + \wxheading{Return value} {\tt true} if successful, {\tt false} otherwise. diff --git a/include/wx/cocoa/region.h b/include/wx/cocoa/region.h index 1d26425b96..93f94719f3 100644 --- a/include/wx/cocoa/region.h +++ b/include/wx/cocoa/region.h @@ -44,19 +44,26 @@ public: wxRegion(const wxPoint& topLeft, const wxPoint& bottomRight); wxRegion(const wxRect& rect); wxRegion(); + wxRegion( const wxBitmap& bmp, + const wxColour& transColour = wxNullColour, + int tolerance = 0) + { + Union(bmp, transColour, tolerance); + } + ~wxRegion(); - + //# Copying wxRegion(const wxRegion& r) : wxGDIObject() { Ref(r); } wxRegion& operator = (const wxRegion& r) { Ref(r); return (*this); } - + //# Modify region // Clear current region void Clear(); - + // Union rectangle or region with this. bool Union(long x, long y, long width, long height) { return Combine(x, y, width, height, wxRGN_OR); } @@ -64,7 +71,7 @@ public: { return Combine(rect, wxRGN_OR); } bool Union(const wxRegion& region) { return Combine(region, wxRGN_OR); } - + // Intersect rectangle or region with this. bool Intersect(long x, long y, long width, long height) { return Combine(x, y, width, height, wxRGN_AND); } @@ -72,7 +79,7 @@ public: { return Combine(rect, wxRGN_AND); } bool Intersect(const wxRegion& region) { return Combine(region, wxRGN_AND); } - + // Subtract rectangle or region from this: // Combines the parts of 'this' that are not part of the second region. bool Subtract(long x, long y, long width, long height) @@ -81,7 +88,7 @@ public: { return Combine(rect, wxRGN_DIFF); } bool Subtract(const wxRegion& region) { return Combine(region, wxRGN_DIFF); } - + // XOR: the union of two combined regions except for any overlapping areas. bool Xor(long x, long y, long width, long height) { return Combine(x, y, width, height, wxRGN_XOR); } @@ -89,16 +96,16 @@ public: { return Combine(rect, wxRGN_XOR); } bool Xor(const wxRegion& region) { return Combine(region, wxRGN_XOR); } - + //# Information on region // Outer bounds of region void GetBox(wxCoord& x, wxCoord& y, wxCoord&w, wxCoord &h) const; wxRect GetBox() const ; - + // Is region empty? bool Empty() const; inline bool IsEmpty() const { return Empty(); } - + //# Tests // Does the region contain the point (x,y)? wxRegionContain Contains(long x, long y) const; @@ -108,7 +115,20 @@ public: wxRegionContain Contains(long x, long y, long w, long h) const; // Does the region contain the rectangle rect? wxRegionContain Contains(const wxRect& rect) const; - + + // Convert the region to a B&W bitmap with the black pixels being inside + // the region. + wxBitmap ConvertToBitmap() const; + + // Use the non-transparent pixels of a wxBitmap for the region to combine + // with this region. If the bitmap has a mask then it will be used, + // otherwise the colour to be treated as transparent may be specified, + // along with an optional tolerance value. + bool Union(const wxBitmap& bmp, + const wxColour& transColour = wxNullColour, + int tolerance = 0); + + // Internal bool Combine(long x, long y, long width, long height, wxRegionOp op); bool Combine(const wxRegion& region, wxRegionOp op); @@ -118,7 +138,7 @@ public: class WXDLLEXPORT wxRegionIterator : public wxObject { DECLARE_DYNAMIC_CLASS(wxRegionIterator) - + public: wxRegionIterator(); wxRegionIterator(const wxRegion& region); @@ -129,13 +149,13 @@ public: void Reset() { m_current = 0; } void Reset(const wxRegion& region); - + operator bool () const { return m_current < m_numRects; } bool HaveRects() const { return m_current < m_numRects; } wxRegionIterator& operator++(); wxRegionIterator operator++(int); - + long GetX() const; long GetY() const; long GetW() const; diff --git a/include/wx/gtk/region.h b/include/wx/gtk/region.h index 51e739c73f..03c2844e0b 100644 --- a/include/wx/gtk/region.h +++ b/include/wx/gtk/region.h @@ -53,7 +53,7 @@ class wxRegion : public wxGDIObject { public: wxRegion() { } - + wxRegion( wxCoord x, wxCoord y, wxCoord w, wxCoord h ) { InitRect(x, y, w, h); @@ -71,6 +71,14 @@ public: } wxRegion( size_t n, const wxPoint *points, int fillStyle = wxODDEVEN_RULE ); + + wxRegion( const wxBitmap& bmp, + const wxColour& transColour = wxNullColour, + int tolerance = 0) + { + Union(bmp, transColour, tolerance); + } + ~wxRegion(); wxRegion( const wxRegion& region ) @@ -114,18 +122,31 @@ public: wxRegionContain Contains(const wxPoint& pt) const; wxRegionContain Contains(const wxRect& rect) const; + // Convert the region to a B&W bitmap with the black pixels being inside + // the region. + wxBitmap ConvertToBitmap() const; + + // Use the non-transparent pixels of a wxBitmap for the region to combine + // with this region. If the bitmap has a mask then it will be used, + // otherwise the colour to be treated as transparent may be specified, + // along with an optional tolerance value. + bool Union(const wxBitmap& bmp, + const wxColour& transColour = wxNullColour, + int tolerance = 0); + + public: // Init with GdkRegion, set ref count to 2 so that // the C++ class will not destroy the region! wxRegion( GdkRegion *region ); - + GdkRegion *GetRegion() const; protected: // ref counting code virtual wxObjectRefData *CreateRefData() const; virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const; - + // common part of ctors for a rectangle region void InitRect(wxCoord x, wxCoord y, wxCoord w, wxCoord h); diff --git a/include/wx/gtk/toplevel.h b/include/wx/gtk/toplevel.h index 21c5532c76..0271b4c353 100644 --- a/include/wx/gtk/toplevel.h +++ b/include/wx/gtk/toplevel.h @@ -60,6 +60,8 @@ public: virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL); virtual bool IsFullScreen() const { return m_fsIsShowing; }; + virtual bool SetShape(const wxRegion& region); + virtual bool Show(bool show = TRUE); virtual void SetTitle( const wxString &title ); diff --git a/include/wx/gtk1/region.h b/include/wx/gtk1/region.h index 51e739c73f..03c2844e0b 100644 --- a/include/wx/gtk1/region.h +++ b/include/wx/gtk1/region.h @@ -53,7 +53,7 @@ class wxRegion : public wxGDIObject { public: wxRegion() { } - + wxRegion( wxCoord x, wxCoord y, wxCoord w, wxCoord h ) { InitRect(x, y, w, h); @@ -71,6 +71,14 @@ public: } wxRegion( size_t n, const wxPoint *points, int fillStyle = wxODDEVEN_RULE ); + + wxRegion( const wxBitmap& bmp, + const wxColour& transColour = wxNullColour, + int tolerance = 0) + { + Union(bmp, transColour, tolerance); + } + ~wxRegion(); wxRegion( const wxRegion& region ) @@ -114,18 +122,31 @@ public: wxRegionContain Contains(const wxPoint& pt) const; wxRegionContain Contains(const wxRect& rect) const; + // Convert the region to a B&W bitmap with the black pixels being inside + // the region. + wxBitmap ConvertToBitmap() const; + + // Use the non-transparent pixels of a wxBitmap for the region to combine + // with this region. If the bitmap has a mask then it will be used, + // otherwise the colour to be treated as transparent may be specified, + // along with an optional tolerance value. + bool Union(const wxBitmap& bmp, + const wxColour& transColour = wxNullColour, + int tolerance = 0); + + public: // Init with GdkRegion, set ref count to 2 so that // the C++ class will not destroy the region! wxRegion( GdkRegion *region ); - + GdkRegion *GetRegion() const; protected: // ref counting code virtual wxObjectRefData *CreateRefData() const; virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const; - + // common part of ctors for a rectangle region void InitRect(wxCoord x, wxCoord y, wxCoord w, wxCoord h); diff --git a/include/wx/gtk1/toplevel.h b/include/wx/gtk1/toplevel.h index 21c5532c76..0271b4c353 100644 --- a/include/wx/gtk1/toplevel.h +++ b/include/wx/gtk1/toplevel.h @@ -60,6 +60,8 @@ public: virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL); virtual bool IsFullScreen() const { return m_fsIsShowing; }; + virtual bool SetShape(const wxRegion& region); + virtual bool Show(bool show = TRUE); virtual void SetTitle( const wxString &title ); diff --git a/include/wx/mac/region.h b/include/wx/mac/region.h index e91e4ab36d..33c31e7d0d 100644 --- a/include/wx/mac/region.h +++ b/include/wx/mac/region.h @@ -45,19 +45,26 @@ public: wxRegion(const wxRect& rect); wxRegion( WXHRGN hRegion ); wxRegion(); + wxRegion( const wxBitmap& bmp, + const wxColour& transColour = wxNullColour, + int tolerance = 0) + { + Union(bmp, transColour, tolerance); + } + ~wxRegion(); - + //# Copying wxRegion(const wxRegion& r) : wxGDIObject() { Ref(r); } wxRegion& operator = (const wxRegion& r) { Ref(r); return (*this); } - + //# Modify region // Clear current region void Clear(); - + // Union rectangle or region with this. bool Union(long x, long y, long width, long height) { return Combine(x, y, width, height, wxRGN_OR); } @@ -65,7 +72,7 @@ public: { return Combine(rect, wxRGN_OR); } bool Union(const wxRegion& region) { return Combine(region, wxRGN_OR); } - + // Intersect rectangle or region with this. bool Intersect(long x, long y, long width, long height) { return Combine(x, y, width, height, wxRGN_AND); } @@ -73,7 +80,7 @@ public: { return Combine(rect, wxRGN_AND); } bool Intersect(const wxRegion& region) { return Combine(region, wxRGN_AND); } - + // Subtract rectangle or region from this: // Combines the parts of 'this' that are not part of the second region. bool Subtract(long x, long y, long width, long height) @@ -82,7 +89,7 @@ public: { return Combine(rect, wxRGN_DIFF); } bool Subtract(const wxRegion& region) { return Combine(region, wxRGN_DIFF); } - + // XOR: the union of two combined regions except for any overlapping areas. bool Xor(long x, long y, long width, long height) { return Combine(x, y, width, height, wxRGN_XOR); } @@ -90,16 +97,16 @@ public: { return Combine(rect, wxRGN_XOR); } bool Xor(const wxRegion& region) { return Combine(region, wxRGN_XOR); } - + //# Information on region // Outer bounds of region void GetBox(wxCoord& x, wxCoord& y, wxCoord&w, wxCoord &h) const; wxRect GetBox() const ; - + // Is region empty? bool Empty() const; inline bool IsEmpty() const { return Empty(); } - + //# Tests // Does the region contain the point (x,y)? wxRegionContain Contains(long x, long y) const; @@ -109,7 +116,19 @@ public: wxRegionContain Contains(long x, long y, long w, long h) const; // Does the region contain the rectangle rect? wxRegionContain Contains(const wxRect& rect) const; - + + // Convert the region to a B&W bitmap with the black pixels being inside + // the region. + wxBitmap ConvertToBitmap() const; + + // Use the non-transparent pixels of a wxBitmap for the region to combine + // with this region. If the bitmap has a mask then it will be used, + // otherwise the colour to be treated as transparent may be specified, + // along with an optional tolerance value. + bool Union(const wxBitmap& bmp, + const wxColour& transColour = wxNullColour, + int tolerance = 0); + // Internal bool Combine(long x, long y, long width, long height, wxRegionOp op); bool Combine(const wxRegion& region, wxRegionOp op); @@ -120,7 +139,7 @@ public: class WXDLLEXPORT wxRegionIterator : public wxObject { DECLARE_DYNAMIC_CLASS(wxRegionIterator) - + public: wxRegionIterator(); wxRegionIterator(const wxRegion& region); @@ -131,13 +150,13 @@ public: void Reset() { m_current = 0; } void Reset(const wxRegion& region); - + operator bool () const { return m_current < m_numRects; } bool HaveRects() const { return m_current < m_numRects; } wxRegionIterator& operator++(); wxRegionIterator operator++(int); - + long GetX() const; long GetY() const; long GetW() const; diff --git a/include/wx/mac/toplevel.h b/include/wx/mac/toplevel.h index aa32bec6ee..182c916c03 100644 --- a/include/wx/mac/toplevel.h +++ b/include/wx/mac/toplevel.h @@ -58,6 +58,8 @@ public: virtual void SetIcons(const wxIconBundle& icons) { SetIcon( icons.GetIcon( -1 ) ); } virtual void Restore(); + virtual bool SetShape(const wxRegion& region); + virtual bool ShowFullScreen(bool WXUNUSED(show), long WXUNUSED(style) = wxFULLSCREEN_ALL) { return FALSE; } virtual bool IsFullScreen() const { return FALSE; } diff --git a/include/wx/mgl/region.h b/include/wx/mgl/region.h index 62c5386502..3508341a19 100644 --- a/include/wx/mgl/region.h +++ b/include/wx/mgl/region.h @@ -24,14 +24,14 @@ class WXDLLEXPORT wxRect; class WXDLLEXPORT wxPoint; class MGLRegion; -enum wxRegionContain +enum wxRegionContain { - wxOutRegion = 0, - wxPartRegion = 1, + wxOutRegion = 0, + wxPartRegion = 1, wxInRegion = 2 }; -class WXDLLEXPORT wxRegion : public wxGDIObject +class WXDLLEXPORT wxRegion : public wxGDIObject { DECLARE_DYNAMIC_CLASS(wxRegion); friend class WXDLLEXPORT wxRegionIterator; @@ -41,6 +41,12 @@ public: wxRegion(const wxPoint& topLeft, const wxPoint& bottomRight); wxRegion(const wxRect& rect); wxRegion(const MGLRegion& region); + wxRegion( const wxBitmap& bmp, + const wxColour& transColour = wxNullColour, + int tolerance = 0) + { + Union(bmp, transColour, tolerance); + } wxRegion(); ~wxRegion(); @@ -96,7 +102,20 @@ public: wxRegionContain Contains(wxCoord x, wxCoord y, wxCoord w, wxCoord h) const; // Does the region contain the rectangle rect? wxRegionContain Contains(const wxRect& rect) const; - + + // Convert the region to a B&W bitmap with the black pixels being inside + // the region. + wxBitmap ConvertToBitmap() const; + + // Use the non-transparent pixels of a wxBitmap for the region to combine + // with this region. If the bitmap has a mask then it will be used, + // otherwise the colour to be treated as transparent may be specified, + // along with an optional tolerance value. + bool Union(const wxBitmap& bmp, + const wxColour& transColour = wxNullColour, + int tolerance = 0); + + // implementation from now on: const MGLRegion& GetMGLRegion() const; @@ -109,7 +128,7 @@ protected: WX_DECLARE_EXPORTED_LIST(wxRect, wxRegionRectList); -class WXDLLEXPORT wxRegionIterator : public wxObject +class WXDLLEXPORT wxRegionIterator : public wxObject { DECLARE_DYNAMIC_CLASS(wxRegionIterator); public: diff --git a/include/wx/motif/region.h b/include/wx/motif/region.h index 052eb872f7..7e9517c765 100644 --- a/include/wx/motif/region.h +++ b/include/wx/motif/region.h @@ -48,49 +48,55 @@ public: wxRegion(const wxPoint& topLeft, const wxPoint& bottomRight); wxRegion(const wxRect& rect); wxRegion(); + wxRegion( const wxBitmap& bmp, + const wxColour& transColour = wxNullColour, + int tolerance = 0) + { + Union(bmp, transColour, tolerance); + } ~wxRegion(); - + //# Copying inline wxRegion(const wxRegion& r) { Ref(r); } inline wxRegion& operator = (const wxRegion& r) { Ref(r); return (*this); } - + //# Modify region // Clear current region void Clear(); - + // Union rectangle or region with this. inline bool Union(wxCoord x, wxCoord y, wxCoord width, wxCoord height) { return Combine(x, y, width, height, wxRGN_OR); } inline bool Union(const wxRect& rect) { return Combine(rect, wxRGN_OR); } inline bool Union(const wxRegion& region) { return Combine(region, wxRGN_OR); } - + // Intersect rectangle or region with this. inline bool Intersect(wxCoord x, wxCoord y, wxCoord width, wxCoord height) { return Combine(x, y, width, height, wxRGN_AND); } inline bool Intersect(const wxRect& rect) { return Combine(rect, wxRGN_AND); } inline bool Intersect(const wxRegion& region) { return Combine(region, wxRGN_AND); } - + // Subtract rectangle or region from this: // Combines the parts of 'this' that are not part of the second region. inline bool Subtract(wxCoord x, wxCoord y, wxCoord width, wxCoord height) { return Combine(x, y, width, height, wxRGN_DIFF); } inline bool Subtract(const wxRect& rect) { return Combine(rect, wxRGN_DIFF); } inline bool Subtract(const wxRegion& region) { return Combine(region, wxRGN_DIFF); } - + // XOR: the union of two combined regions except for any overlapping areas. inline bool Xor(wxCoord x, wxCoord y, wxCoord width, wxCoord height) { return Combine(x, y, width, height, wxRGN_XOR); } inline bool Xor(const wxRect& rect) { return Combine(rect, wxRGN_XOR); } inline bool Xor(const wxRegion& region) { return Combine(region, wxRGN_XOR); } - + //# Information on region // Outer bounds of region void GetBox(wxCoord& x, wxCoord& y, wxCoord&w, wxCoord &h) const; wxRect GetBox() const ; - + // Is region empty? bool Empty() const; inline bool IsEmpty() const { return Empty(); } bool Ok() const { return (m_refData != NULL) ; } - + //# Tests // Does the region contain the point (x,y)? wxRegionContain Contains(wxCoord x, wxCoord y) const; @@ -100,15 +106,27 @@ public: wxRegionContain Contains(wxCoord x, wxCoord y, wxCoord w, wxCoord h) const; // Does the region contain the rectangle rect? wxRegionContain Contains(const wxRect& rect) const; - + + // Convert the region to a B&W bitmap with the black pixels being inside + // the region. + wxBitmap ConvertToBitmap() const; + + // Use the non-transparent pixels of a wxBitmap for the region to combine + // with this region. If the bitmap has a mask then it will be used, + // otherwise the colour to be treated as transparent may be specified, + // along with an optional tolerance value. + bool Union(const wxBitmap& bmp, + const wxColour& transColour = wxNullColour, + int tolerance = 0); + // Internal bool Combine(wxCoord x, wxCoord y, wxCoord width, wxCoord height, wxRegionOp op); bool Combine(const wxRegion& region, wxRegionOp op); bool Combine(const wxRect& rect, wxRegionOp op); - + // Get the internal Region handle WXRegion GetXRegion() const; - + // 'Naughty' functions that allow wxWindows to use a list of rects // instead of the region, in certain circumstances (e.g. when // making a region out of the update rectangles). @@ -126,16 +144,16 @@ public: wxRegionIterator(); wxRegionIterator(const wxRegion& region); ~wxRegionIterator(); - + void Reset() { m_current = 0; } void Reset(const wxRegion& region); - + operator bool () const { return m_current < m_numRects; } bool HaveRects() const { return m_current < m_numRects; } - + void operator ++ (); void operator ++ (int); - + wxCoord GetX() const; wxCoord GetY() const; wxCoord GetW() const; @@ -143,7 +161,7 @@ public: wxCoord GetH() const; wxCoord GetHeight() const { return GetH(); } wxRect GetRect() const { return wxRect(GetX(), GetY(), GetWidth(), GetHeight()); } - + private: size_t m_current; size_t m_numRects; diff --git a/include/wx/msw/region.h b/include/wx/msw/region.h index 4a340015f6..01f160ba84 100644 --- a/include/wx/msw/region.h +++ b/include/wx/msw/region.h @@ -48,6 +48,12 @@ public: wxRegion(const wxRect& rect); wxRegion(WXHRGN hRegion); // Hangs on to this region wxRegion(size_t n, const wxPoint *points, int fillStyle = wxODDEVEN_RULE ); + wxRegion( const wxBitmap& bmp, + const wxColour& transColour = wxNullColour, + int tolerance = 0) + { + Union(bmp, transColour, tolerance); + } virtual ~wxRegion(); @@ -108,6 +114,18 @@ public: // Does the region contain the rectangle rect? wxRegionContain Contains(const wxRect& rect) const; + // Convert the region to a B&W bitmap with the black pixels being inside + // the region. + wxBitmap ConvertToBitmap() const; + + // Use the non-transparent pixels of a wxBitmap for the region to combine + // with this region. If the bitmap has a mask then it will be used, + // otherwise the colour to be treated as transparent may be specified, + // along with an optional tolerance value. + bool Union(const wxBitmap& bmp, + const wxColour& transColour = wxNullColour, + int tolerance = 0); + // Internal bool Combine(wxCoord x, wxCoord y, wxCoord width, wxCoord height, wxRegionOp op); bool Combine(const wxRegion& region, wxRegionOp op); diff --git a/include/wx/msw/toplevel.h b/include/wx/msw/toplevel.h index b4e77b09da..9b7871c4a6 100644 --- a/include/wx/msw/toplevel.h +++ b/include/wx/msw/toplevel.h @@ -58,6 +58,8 @@ public: virtual void SetIcons(const wxIconBundle& icons ); virtual void Restore(); + virtual bool SetShape(const wxRegion& region); + virtual bool Show(bool show = TRUE); virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL); diff --git a/include/wx/toplevel.h b/include/wx/toplevel.h index 1beeb7ac80..10231a6c00 100644 --- a/include/wx/toplevel.h +++ b/include/wx/toplevel.h @@ -108,6 +108,11 @@ public: virtual wxString GetTitle() const = 0; */ + // Set the shape of the window to the given region. + // Returns TRUE if the platform supports this feature (and the + // operation is successful.) + virtual bool SetShape(const wxRegion& region) { return FALSE; } + // old functions, use the new ones instead! #if WXWIN_COMPATIBILITY_2 bool Iconized() const { return IsIconized(); } diff --git a/include/wx/x11/region.h b/include/wx/x11/region.h index 8d1d276462..dc04259a34 100644 --- a/include/wx/x11/region.h +++ b/include/wx/x11/region.h @@ -73,6 +73,14 @@ public: } wxRegion( size_t n, const wxPoint *points, int fillStyle = wxODDEVEN_RULE ); + + wxRegion( const wxBitmap& bmp, + const wxColour& transColour = wxNullColour, + int tolerance = 0) + { + Union(bmp, transColour, tolerance); + } + ~wxRegion(); wxRegion( const wxRegion& region ) { Ref(region); } @@ -114,6 +122,19 @@ public: wxRegionContain Contains(const wxPoint& pt) const; wxRegionContain Contains(const wxRect& rect) const; + // Convert the region to a B&W bitmap with the black pixels being inside + // the region. + wxBitmap ConvertToBitmap() const; + + // Use the non-transparent pixels of a wxBitmap for the region to combine + // with this region. If the bitmap has a mask then it will be used, + // otherwise the colour to be treated as transparent may be specified, + // along with an optional tolerance value. + bool Union(const wxBitmap& bmp, + const wxColour& transColour = wxNullColour, + int tolerance = 0); + + public: WXRegion *GetX11Region() const; @@ -121,7 +142,7 @@ protected: // ref counting code virtual wxObjectRefData *CreateRefData() const; virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const; - + // common part of ctors for a rectangle region void InitRect(wxCoord x, wxCoord y, wxCoord w, wxCoord h); diff --git a/samples/configure b/samples/configure index fc63a1c569..b4469a6454 100755 --- a/samples/configure +++ b/samples/configure @@ -693,15 +693,20 @@ trap 'rm -fr `echo " mobile/Makefile mobile/wxedit/Makefile mobile/styles/Makefile - newgrid/Makefile + multimon/Makefile + nativedlg/Makefile notebook/Makefile + oleauto/Makefile + ownerdrw/Makefile png/Makefile printing/Makefile proplist/Makefile propsize/Makefile + regtest/Makefile resource/Makefile rotate/Makefile sashtest/Makefile + shaped/Makefile scroll/Makefile scrollsub/Makefile sockets/Makefile @@ -847,15 +852,20 @@ CONFIG_FILES=\${CONFIG_FILES-"Makefile mobile/Makefile mobile/wxedit/Makefile mobile/styles/Makefile - newgrid/Makefile + multimon/Makefile + nativedlg/Makefile notebook/Makefile + oleauto/Makefile + ownerdrw/Makefile png/Makefile printing/Makefile proplist/Makefile propsize/Makefile + regtest/Makefile resource/Makefile rotate/Makefile sashtest/Makefile + shaped/Makefile scroll/Makefile scrollsub/Makefile sockets/Makefile diff --git a/samples/configure.in b/samples/configure.in index ad87c0d798..bef7930e0c 100644 --- a/samples/configure.in +++ b/samples/configure.in @@ -76,6 +76,7 @@ AC_OUTPUT([ resource/Makefile rotate/Makefile sashtest/Makefile + shaped/Makefile scroll/Makefile scrollsub/Makefile sockets/Makefile diff --git a/samples/shaped/.cvsignore b/samples/shaped/.cvsignore new file mode 100644 index 0000000000..63c449904b --- /dev/null +++ b/samples/shaped/.cvsignore @@ -0,0 +1,7 @@ +shapedM5.mcp +shapedM*Data +*Classic?Debug* +*Classic?Release* +*Carbon?Debug* +*Carbon?Release* +shaped diff --git a/samples/shaped/Makefile.in b/samples/shaped/Makefile.in new file mode 100644 index 0000000000..04d4095fbd --- /dev/null +++ b/samples/shaped/Makefile.in @@ -0,0 +1,16 @@ +# Purpose: makefile for shaped example (UNIX). +# Created: 2000-01-03 + +top_srcdir = @top_srcdir@/.. +top_builddir = ../.. +program_dir = samples/shaped + +DATAFILES=star.png +PROGRAM=shaped + +OBJECTS =$(PROGRAM).o +DEPFILES=$(PROGRAM).d + +include ../../src/makeprog.env + +@IF_GNU_MAKE@-include $(DEPFILES) diff --git a/samples/shaped/descrip.mms b/samples/shaped/descrip.mms new file mode 100644 index 0000000000..de05c4acdd --- /dev/null +++ b/samples/shaped/descrip.mms @@ -0,0 +1,47 @@ +#***************************************************************************** +# * +# Make file for VMS * +# Author : J.Jansen (joukj@hrem.stm.tudelft.nl) * +# Date : 4 October 2000 * +# * +#***************************************************************************** +.first + define wx [--.include.wx] + +.ifdef __WXMOTIF__ +CXX_DEFINE = /define=(__WXMOTIF__=1)/name=(as_is,short)\ + /assume=(nostdnew,noglobal_array_new) +.else +.ifdef __WXGTK__ +CXX_DEFINE = /define=(__WXGTK__=1)/float=ieee/name=(as_is,short)/ieee=denorm\ + /assume=(nostdnew,noglobal_array_new) +.else +CXX_DEFINE = +.endif +.endif + +.suffixes : .cpp + +.cpp.obj : + cxx $(CXXFLAGS)$(CXX_DEFINE) $(MMS$TARGET_NAME).cpp + +all : +.ifdef __WXMOTIF__ + $(MMS)$(MMSQUALIFIERS) shaped.exe +.else +.ifdef __WXGTK__ + $(MMS)$(MMSQUALIFIERS) shaped_gtk.exe +.endif +.endif + +.ifdef __WXMOTIF__ +shaped.exe : shaped.obj + cxxlink shaped,[--.lib]vms/opt +.else +.ifdef __WXGTK__ +shaped_gtk.exe : shaped.obj + cxxlink/exec=shaped_gtk.exe shaped,[--.lib]vms_gtk/opt +.endif +.endif + +shaped.obj : shaped.cpp diff --git a/samples/shaped/makefile.b32 b/samples/shaped/makefile.b32 new file mode 100644 index 0000000000..b7dad56f18 --- /dev/null +++ b/samples/shaped/makefile.b32 @@ -0,0 +1,10 @@ +# Purpose: makefile for shaped example (BC++ 32bit) +# Created: 2000-01-03 + +WXDIR = $(WXWIN) + +TARGET=shaped +OBJECTS = $(TARGET).obj + +!include $(WXDIR)\src\makeprog.b32 + diff --git a/samples/shaped/makefile.bcc b/samples/shaped/makefile.bcc new file mode 100644 index 0000000000..e88502f474 --- /dev/null +++ b/samples/shaped/makefile.bcc @@ -0,0 +1,14 @@ +# Purpose: makefile for shaped example (BC++ 16bit) +# Created: 2000-01-03 + +!if "$(WXWIN)" == "" +!error You must define the WXWIN variable in autoexec.bat, e.g. WXWIN=c:\wx +!endif + +WXDIR = $(WXWIN) + +TARGET=shaped +OBJECTS=$(TARGET).obj + +!include $(WXDIR)\src\makeprog.bcc + diff --git a/samples/shaped/makefile.dos b/samples/shaped/makefile.dos new file mode 100644 index 0000000000..d86abb61f1 --- /dev/null +++ b/samples/shaped/makefile.dos @@ -0,0 +1,10 @@ +# Purpose: makefile for shaped example (VC++ 1.5x) +# Created: 2000-01-03 + +WXDIR = $(WXWIN) + +TARGET=shaped +OBJECTS=$(TARGET).obj + +!include $(WXDIR)\src\makeprog.msc + diff --git a/samples/shaped/makefile.g95 b/samples/shaped/makefile.g95 new file mode 100644 index 0000000000..d9d5f1b9ce --- /dev/null +++ b/samples/shaped/makefile.g95 @@ -0,0 +1,10 @@ +# Purpose: makefile for shaped example (Cygwin/Mingw32) +# Created: #03.01.00 + +WXDIR = ../.. + +TARGET=shaped +OBJECTS = $(TARGET).o + +include $(WXDIR)/src/makeprog.g95 + diff --git a/samples/shaped/makefile.sc b/samples/shaped/makefile.sc new file mode 100644 index 0000000000..c37d85391b --- /dev/null +++ b/samples/shaped/makefile.sc @@ -0,0 +1,37 @@ +# Purpose: makefile for shaped example (Symantec C++) +# Created: 2000-01-03 + +WXDIR = $(WXWIN) +WXLIB = $(WXDIR)\lib\wx.lib +INCDIR = $(WXDIR)\include +INCLUDE=$(INCDIR) +TARGET=shaped + +include $(WXDIR)\src\makesc.env + +shaped.exe: shaped.obj $(DEFFILE) shaped.res + *$(CC) $(LDFLAGS) -o$@ $** $(LIBS) + *$(RC) -k shaped.res + +sc32.def: + echo EXETYPE NT > sc32.def + echo SUBSYSTEM WINDOWS >> sc32.def + +sc16.def: + echo NAME $(TARGET) > sc16.def + echo EXETYPE WINDOWS >> sc16.def + echo STUB 'WINSTUB.EXE' >> sc16.def + echo CODE PRELOAD MOVEABLE DISCARDABLE >> sc16.def + echo DATA PRELOAD MOVEABLE MULTIPLE >> sc16.def + echo HEAPSIZE 1024 >> sc16.def + echo STACKSIZE 8192 >> sc16.def + +clean: + -del *.obj + -del *.exe + -del *.res + -del *.map + -del *.rws + -del sc32.def + -del sc16.def + diff --git a/samples/shaped/makefile.sl b/samples/shaped/makefile.sl new file mode 100644 index 0000000000..90b1e0ae38 --- /dev/null +++ b/samples/shaped/makefile.sl @@ -0,0 +1,14 @@ +# Purpose: makefile for shaped example (Salford C++) +# Created: 2000-01-03 + +PROGRAM = shaped +OBJECTS = $(PROGRAM).obj + +include ..\..\src\makeprog.sl + +all: wx $(TARGET) + +wx: + cd $(WXDIR)\src\msw ^ mk32 -f makefile.sl all + cd $(WXDIR)\samples\shaped + diff --git a/samples/shaped/makefile.twn b/samples/shaped/makefile.twn new file mode 100644 index 0000000000..85b79d8a83 --- /dev/null +++ b/samples/shaped/makefile.twn @@ -0,0 +1,35 @@ +# Purpose: makefile for shaped example (TWIN) +# Created: 2000-01-03 + +WXDIR = ../.. + +# All common UNIX compiler flags and options are now in +# this central makefile. +include $(WXDIR)/src/maketwin.env + +OBJECTS = $(OBJDIR)/shaped.$(OBJSUFF) $(OBJDIR)/shaped.$(OBJSUFF) + +all: $(OBJDIR) shaped$(GUISUFFIX)$(EXESUFF) + +wx: + +$(OBJDIR): + mkdir $(OBJDIR) + +shaped$(GUISUFFIX)$(EXESUFF): $(OBJECTS) $(WXLIB) + $(CC) $(LDFLAGS) -o shaped$(GUISUFFIX)$(EXESUFF) $(OBJECTS) $(LDLIBS) + +$(OBJDIR)/shaped.$(OBJSUFF): shaped.$(SRCSUFF) + $(CC) -c $(CPPFLAGS) -o $@ shaped.$(SRCSUFF) + +shaped.c: shaped.rc + $(RESCOMP) $(RCINPUTSWITCH) shaped.rc $(RCOUTPUTSWITCH) shaped.c $(RESFLAGS) + +$(OBJDIR)/shaped.$(OBJSUFF): shaped.c + $(CC) -c $(CPPFLAGS) -o $@ shaped.c + +#$(OBJDIR)/shaped.o: shaped.rc +# $(RESCOMP) $(RCINPUTSWITCH) shaped.rc $(RCOUTPUTSWITCH) $(OBJDIR)/shaped.o $(RESFLAGS) + +clean: + rm -f $(OBJECTS) shaped$(GUISUFFIX).exe core *.rsc *.res diff --git a/samples/shaped/makefile.unx b/samples/shaped/makefile.unx new file mode 100644 index 0000000000..7be31b9306 --- /dev/null +++ b/samples/shaped/makefile.unx @@ -0,0 +1,23 @@ +# Purpose: makefile for shaped example (Unix) +# Created: 2000-01-03 + +CXX = $(shell wx-config --cxx) + +PROGRAM = shaped + +OBJECTS = $(PROGRAM).o + +# implementation + +.SUFFIXES: .o .cpp + +.cpp.o : + $(CXX) -c `wx-config --cxxflags` -o $@ $< + +all: $(PROGRAM) + +$(PROGRAM): $(OBJECTS) + $(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs` + +clean: + rm -f *.o $(PROGRAM) diff --git a/samples/shaped/makefile.vc b/samples/shaped/makefile.vc new file mode 100644 index 0000000000..eef999eff4 --- /dev/null +++ b/samples/shaped/makefile.vc @@ -0,0 +1,11 @@ +# Purpose: makefile for shaped example (VC++ 32bit) +# Created: 2000-01-03 + +# Set WXDIR for your system +WXDIR = $(WXWIN) + +PROGRAM=shaped +OBJECTS = $(PROGRAM).obj + +!include $(WXDIR)\src\makeprog.vc + diff --git a/samples/shaped/makefile.wat b/samples/shaped/makefile.wat new file mode 100644 index 0000000000..99c32ced97 --- /dev/null +++ b/samples/shaped/makefile.wat @@ -0,0 +1,11 @@ +# Purpose: makefile for shaped example (Watcom) +# Created: 2000-01-03 + +WXDIR = $(%WXWIN) + +PROGRAM = shaped +OBJECTS = $(PROGRAM).obj + +!include $(WXDIR)\src\makeprog.wat + + diff --git a/samples/shaped/shaped.cpp b/samples/shaped/shaped.cpp new file mode 100644 index 0000000000..c43c71ff45 --- /dev/null +++ b/samples/shaped/shaped.cpp @@ -0,0 +1,223 @@ +///////////////////////////////////////////////////////////////////////////// +// Name: shaped.cpp +// Purpose: Shaped Window sample +// Author: Robin Dunn +// Modified by: +// Created: 28-Mar-2003 +// RCS-ID: $Id$ +// Copyright: (c) Robin Dunn +// Licence: wxWindows licence +///////////////////////////////////////////////////////////////////////////// + +// ============================================================================ +// declarations +// ============================================================================ + +// ---------------------------------------------------------------------------- +// headers +// ---------------------------------------------------------------------------- + +#if defined(__GNUG__) && !defined(__APPLE__) + #pragma implementation "shaped.cpp" + #pragma interface "shaped.cpp" +#endif + +// For compilers that support precompilation, includes "wx/wx.h". +#include "wx/wxprec.h" + +#ifdef __BORLANDC__ + #pragma hdrstop +#endif + +// for all others, include the necessary headers +#ifndef WX_PRECOMP + #include "wx/app.h" + #include "wx/log.h" + #include "wx/frame.h" + #include "wx/panel.h" + #include "wx/stattext.h" + #include "wx/menu.h" + #include "wx/layout.h" + #include "wx/msgdlg.h" +#endif + +#include "wx/dcclient.h" + +// ---------------------------------------------------------------------------- +// private classes +// ---------------------------------------------------------------------------- + +// Define a new application type, each program should derive a class from wxApp +class MyApp : public wxApp +{ +public: + // override base class virtuals + // ---------------------------- + + // this one is called on application startup and is a good place for the app + // initialization (doing it here and not in the ctor allows to have an error + // return: if OnInit() returns false, the application terminates) + virtual bool OnInit(); +}; + + +// Define a new frame type: this is going to be our main frame +class ShapedFrame : public wxFrame +{ +public: + // ctor(s) + ShapedFrame(); + void SetWindowShape(); + + // event handlers (these functions should _not_ be virtual) + void OnDoubleClick(wxMouseEvent& evt); + void OnLeftDown(wxMouseEvent& evt); + void OnLeftUp(wxMouseEvent& evt); + void OnMouseMove(wxMouseEvent& evt); + void OnExit(wxMouseEvent& evt); + void OnPaint(wxPaintEvent& evt); + void OnWindowCreate(wxWindowCreateEvent& evt); + +private: + bool m_hasShape; + wxBitmap m_bmp; + wxPoint m_delta; + + // any class wishing to process wxWindows events must use this macro + DECLARE_EVENT_TABLE() +}; + + +// ---------------------------------------------------------------------------- +// event tables and other macros for wxWindows +// ---------------------------------------------------------------------------- + +// the event tables connect the wxWindows events with the functions (event +// handlers) which process them. It can be also done at run-time, but for the +// simple menu events like this the static method is much simpler. +BEGIN_EVENT_TABLE(ShapedFrame, wxFrame) + EVT_LEFT_DCLICK(ShapedFrame::OnDoubleClick) + EVT_LEFT_DOWN(ShapedFrame::OnLeftDown) + EVT_LEFT_UP(ShapedFrame::OnLeftUp) + EVT_MOTION(ShapedFrame::OnMouseMove) + EVT_RIGHT_UP(ShapedFrame::OnExit) + + EVT_PAINT(ShapedFrame::OnPaint) + +#ifdef __WXGTK__ + EVT_WINDOW_CREATE(ShapedFrame::OnWindowCreate) +#endif +END_EVENT_TABLE() + + +// Create a new application object: this macro will allow wxWindows to create +// the application object during program execution (it's better than using a +// static object for many reasons) and also declares the accessor function +// wxGetApp() which will return the reference of the right type (i.e. MyApp and +// not wxApp) +IMPLEMENT_APP(MyApp) + +// ============================================================================ +// implementation +// ============================================================================ + +// ---------------------------------------------------------------------------- +// the application class +// ---------------------------------------------------------------------------- + +// `Main program' equivalent: the program execution "starts" here +bool MyApp::OnInit() +{ + wxInitAllImageHandlers(); + + // Create the main application window + ShapedFrame *frame = new ShapedFrame(); + frame->Show(TRUE); + + // success: wxApp::OnRun() will be called which will enter the main message + // loop and the application will run. If we returned FALSE here, the + // application would exit immediately. + return TRUE; +} + +// ---------------------------------------------------------------------------- +// main frame +// ---------------------------------------------------------------------------- + +// frame constructor +ShapedFrame::ShapedFrame() + : wxFrame((wxFrame *)NULL, -1, wxEmptyString, + wxDefaultPosition, wxDefaultSize, + wxSIMPLE_BORDER | wxFRAME_NO_TASKBAR) +{ + m_hasShape = FALSE; + m_bmp = wxBitmap("star.png", wxBITMAP_TYPE_PNG); + SetSize(wxSize(m_bmp.GetWidth(), m_bmp.GetHeight())); + SetToolTip(wxT("Right-click to exit")); +#ifdef __wxMSW__ + // On wxGTK we can't do this yet because the window hasn't been created + // yet so we wait until the EVT_WINDOW_CREATE event happens. On wxMSW it + // has been created so we set the shape now. + SetWindowShape(); +#endif +} + +void ShapedFrame::SetWindowShape() +{ + wxRegion region(m_bmp, *wxWHITE); + m_hasShape = SetShape(region); +} + +void ShapedFrame::OnDoubleClick(wxMouseEvent& evt) +{ + if (m_hasShape) + { + wxRegion region; + SetShape(region); + m_hasShape = FALSE; + } + else + SetWindowShape(); +} + +void ShapedFrame::OnLeftDown(wxMouseEvent& evt) +{ + CaptureMouse(); + wxPoint pos = ClientToScreen(evt.GetPosition()); + wxPoint origin = GetPosition(); + int dx = pos.x - origin.x; + int dy = pos.y - origin.y; + m_delta = wxPoint(dx, dy); +} + +void ShapedFrame::OnLeftUp(wxMouseEvent& evt) +{ + if (HasCapture()) + ReleaseMouse(); +} + +void ShapedFrame::OnMouseMove(wxMouseEvent& evt) +{ + if (evt.Dragging() && evt.LeftIsDown()) + { + wxPoint pos = ClientToScreen(evt.GetPosition()); + Move(wxPoint(pos.x - m_delta.x, pos.y - m_delta.y)); + } +} + +void ShapedFrame::OnExit(wxMouseEvent& evt) +{ + Close(); +} + +void ShapedFrame::OnPaint(wxPaintEvent& evt) +{ + wxPaintDC dc(this); + dc.DrawBitmap(m_bmp, 0, 0, TRUE); +} + +void ShapedFrame::OnWindowCreate(wxWindowCreateEvent& evt) +{ + SetWindowShape(); +} + diff --git a/samples/shaped/shaped.dsp b/samples/shaped/shaped.dsp new file mode 100644 index 0000000000..869979145b --- /dev/null +++ b/samples/shaped/shaped.dsp @@ -0,0 +1,154 @@ +# Microsoft Developer Studio Project File - Name="shaped" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Application" 0x0101 + +CFG=shaped - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "shaped.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "shaped.mak" CFG="shaped - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "shaped - Win32 Release DLL" (based on "Win32 (x86) Application") +!MESSAGE "shaped - Win32 Debug DLL" (based on "Win32 (x86) Application") +!MESSAGE "shaped - Win32 Release" (based on "Win32 (x86) Application") +!MESSAGE "shaped - Win32 Debug" (based on "Win32 (x86) Application") +!MESSAGE + +# Begin Project +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +MTL=midl.exe +RSC=rc.exe + +!ELSEIF "$(CFG)" == "shaped - Win32 Release DLL" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "ReleaseDll" +# PROP BASE Intermediate_Dir "ReleaseDll" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "ReleaseDll" +# PROP Intermediate_Dir "ReleaseDll" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W4 /O2 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D WINVER=0x400 /YX /FD /c +# ADD CPP /nologo /W4 /O2 /I "../../include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D WINVER=0x400 /D WIN32 /D WINVER=0x400 /D _MT /D wxUSE_GUI=1 /YX /FD /c /MD /D WXUSINGDLL /I..\..\lib\mswdll +# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32 +# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32 +# ADD BASE RSC /l 0x409 /d "NDEBUG" /I "../../include" +# ADD RSC /l 0x409 /d "NDEBUG" /I "../../include" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /machine:I386 +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw250.lib + +!ELSEIF "$(CFG)" == "shaped - Win32 Debug DLL" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "DebugDll" +# PROP BASE Intermediate_Dir "DebugDll" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "DebugDll" +# PROP Intermediate_Dir "DebugDll" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W4 /Zi /Od /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D WINVER=0x400 /YX /FD /c +# ADD CPP /nologo /W4 /Zi /Od /I "../../include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D WINVER=0x400 /D WIN32 /D WINVER=0x400 /D _MT /D wxUSE_GUI=1 /YX /FD /c /MDd /D "__WXDEBUG__" /D "WXDEBUG=1" /D WXUSINGDLL /I..\..\lib\mswdlld +# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32 +# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32 +# ADD BASE RSC /l 0x409 /d "_DEBUG" /I "../../include" +# ADD RSC /l 0x409 /d "_DEBUG" /I "../../include" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw250d.lib + +!ELSEIF "$(CFG)" == "shaped - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Release" +# PROP Intermediate_Dir "Release" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W4 /O2 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D WINVER=0x400 /YX /FD /c +# ADD CPP /nologo /W4 /O2 /I "../../include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D WINVER=0x400 /D WIN32 /D WINVER=0x400 /D _MT /D wxUSE_GUI=1 /YX /FD /c /MD /I..\..\lib\msw +# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32 +# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32 +# ADD BASE RSC /l 0x409 /d "NDEBUG" /I "../../include" +# ADD RSC /l 0x409 /d "NDEBUG" /I "../../include" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /machine:I386 +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /machine:I386 ..\..\lib\zlib.lib ..\..\lib\regex.lib ..\..\lib\png.lib ..\..\lib\jpeg.lib ..\..\lib\tiff.lib ..\..\lib\wxmsw.lib + +!ELSEIF "$(CFG)" == "shaped - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Debug" +# PROP Intermediate_Dir "Debug" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W4 /Zi /Od /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D WINVER=0x400 /YX /FD /c +# ADD CPP /nologo /W4 /Zi /Od /I "../../include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D WINVER=0x400 /D WIN32 /D WINVER=0x400 /D _MT /D wxUSE_GUI=1 /YX /FD /c /MDd /D "__WXDEBUG__" /D "WXDEBUG=1" /I..\..\lib\mswd +# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32 +# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32 +# ADD BASE RSC /l 0x409 /d "_DEBUG" /I "../../include" +# ADD RSC /l 0x409 /d "_DEBUG" /I "../../include" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\zlibd.lib ..\..\lib\regexd.lib ..\..\lib\pngd.lib ..\..\lib\jpegd.lib ..\..\lib\tiffd.lib ..\..\lib\wxmswd.lib + +!ENDIF + +# Begin Target + +# Name "shaped - Win32 Release DLL" +# Name "shaped - Win32 Debug DLL" +# Name "shaped - Win32 Release" +# Name "shaped - Win32 Debug" +# Begin Source File + +SOURCE=.\shaped.cpp +# End Source File +# Begin Source File + +SOURCE=.\shaped.rc +# End Source File +# End Target +# End Project diff --git a/samples/shaped/shaped.rc b/samples/shaped/shaped.rc new file mode 100644 index 0000000000..82bdf07561 --- /dev/null +++ b/samples/shaped/shaped.rc @@ -0,0 +1,2 @@ +#include "wx/msw/wx.rc" + diff --git a/samples/shaped/shapedM5.xml b/samples/shaped/shapedM5.xml new file mode 100644 index 0000000000..0daf4e3ec9 --- /dev/null +++ b/samples/shaped/shapedM5.xml @@ -0,0 +1,3685 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +]> + + + + Classic Release + + + + UserSourceTrees + + + CustomColor1 + Red0 + Green32767 + Blue0 + + CustomColor2 + Red0 + Green32767 + Blue0 + + CustomColor3 + Red0 + Green32767 + Blue0 + + CustomColor4 + Red0 + Green32767 + Blue0 + + + + AlwaysSearchUserPathstrue + InterpretDOSAndUnixPathstrue + UserSearchPaths + + SearchPath + Path: + PathFormatMacOS + PathRootProject + + Recursivetrue + HostFlagsAll + + + SearchPath + Path:::include: + PathFormatMacOS + PathRootProject + + Recursivefalse + HostFlagsAll + + + SearchPath + Path:::lib: + PathFormatMacOS + PathRootProject + + Recursivetrue + HostFlagsAll + + + SystemSearchPaths + + SearchPath + PathMSL + PathFormatWindows + PathRootCodeWarrior + + Recursivetrue + HostFlagsAll + + + SearchPath + Path:MacOS Support: + PathFormatMacOS + PathRootCodeWarrior + + Recursivetrue + HostFlagsAll + + + + + LinkerMacOS PPC Linker + PreLinker + PostLinker + TargetnameClassic Release + OutputDirectory + Path: + PathFormatMacOS + PathRootProject + + SaveEntriesUsingRelativePathsfalse + + + FileMappings + + FileTypeAPPL + FileExtension + Compiler + Precompilefalse + Launchabletrue + ResourceFiletrue + IgnoredByMakefalse + + + FileTypeAppl + FileExtension + Compiler + Precompilefalse + Launchabletrue + ResourceFiletrue + IgnoredByMakefalse + + + FileTypeMMLB + FileExtension + CompilerLib Import PPC + Precompilefalse + Launchablefalse + ResourceFilefalse + IgnoredByMakefalse + + + FileTypeMPLF + FileExtension + CompilerLib Import PPC + Precompilefalse + Launchablefalse + ResourceFilefalse + IgnoredByMakefalse + + + FileTypeMWCD + FileExtension + Compiler + Precompilefalse + Launchabletrue + ResourceFiletrue + IgnoredByMakefalse + + + FileTypeRSRC + FileExtension + Compiler + Precompilefalse + Launchabletrue + ResourceFiletrue + IgnoredByMakefalse + + + FileTypeTEXT + FileExtension.c + CompilerMW C/C++ PPC + Precompilefalse + Launchablefalse + ResourceFilefalse + IgnoredByMakefalse + + + FileTypeTEXT + FileExtension.c++ + CompilerMW C/C++ PPC + Precompilefalse + Launchablefalse + ResourceFilefalse + IgnoredByMakefalse + + + FileTypeTEXT + FileExtension.cc + CompilerMW C/C++ PPC + Precompilefalse + Launchablefalse + ResourceFilefalse + IgnoredByMakefalse + + + FileTypeTEXT + FileExtension.cp + CompilerMW C/C++ PPC + Precompilefalse + Launchablefalse + ResourceFilefalse + IgnoredByMakefalse + + + FileTypeTEXT + FileExtension.cpp + CompilerMW C/C++ PPC + Precompilefalse + Launchablefalse + ResourceFilefalse + IgnoredByMakefalse + + + FileTypeTEXT + FileExtension.exp + Compiler + Precompilefalse + Launchablefalse + ResourceFilefalse + IgnoredByMakefalse + + + FileTypeTEXT + FileExtension.h + CompilerMW C/C++ PPC + Precompilefalse + Launchablefalse + ResourceFilefalse + IgnoredByMaketrue + + + FileTypeTEXT + FileExtension.pch + CompilerMW C/C++ PPC + Precompiletrue + Launchablefalse + ResourceFilefalse + IgnoredByMakefalse + + + FileTypeTEXT + FileExtension.pch++ + CompilerMW C/C++ PPC + Precompiletrue + Launchablefalse + ResourceFilefalse + IgnoredByMakefalse + + + FileTypeTEXT + FileExtension.r + CompilerRez + Precompilefalse + Launchablefalse + ResourceFilefalse + IgnoredByMakefalse + + + FileTypeXCOF + FileExtension + CompilerXCOFF Import PPC + Precompilefalse + Launchablefalse + ResourceFilefalse + IgnoredByMakefalse + + + FileTypedocu + FileExtension + Compiler + Precompilefalse + Launchabletrue + ResourceFiletrue + IgnoredByMakefalse + + + FileTypersrc + FileExtension + Compiler + Precompilefalse + Launchabletrue + ResourceFiletrue + IgnoredByMakefalse + + + FileTypeshlb + FileExtension + CompilerPEF Import PPC + Precompilefalse + Launchablefalse + ResourceFilefalse + IgnoredByMakefalse + + + FileTypestub + FileExtension + CompilerPEF Import PPC + Precompilefalse + Launchablefalse + ResourceFilefalse + IgnoredByMakefalse + + + FileExtension.doc + Compiler + Precompilefalse + Launchabletrue + ResourceFilefalse + IgnoredByMaketrue + + + FileExtension.o + CompilerXCOFF Import PPC + Precompilefalse + Launchablefalse + ResourceFilefalse + IgnoredByMakefalse + + + FileExtension.ppob + Compiler + Precompilefalse + Launchabletrue + ResourceFiletrue + IgnoredByMakefalse + + + FileExtension.rsrc + Compiler + Precompilefalse + Launchabletrue + ResourceFiletrue + IgnoredByMakefalse + + + + + CacheModDatestrue + ActivateBrowsertrue + DumpBrowserInfofalse + CacheSubprojectstrue + UseThirdPartyDebuggerfalse + DebuggerCommandLine + Debugger Runtime + 0002000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 00000000000000000000000000000000 + + + + LogSystemMessagestrue + AutoTargetDLLsfalse + StopAtWatchpointstrue + PauseWhileRunningfalse + PauseInterval5 + PauseUIFlags0 + AltExePath + Path + PathFormatGeneric + PathRootAbsolute + + StopAtTempBPOnLaunchtrue + CacheSymbolicstrue + TempBPFunctionNamemain + TempBPTypefalse + + + MWFrontEnd_C_cplusplus0 + MWFrontEnd_C_checkprotos0 + MWFrontEnd_C_arm0 + MWFrontEnd_C_trigraphs0 + MWFrontEnd_C_onlystdkeywords0 + MWFrontEnd_C_enumsalwaysint0 + MWFrontEnd_C_mpwpointerstyle1 + MWFrontEnd_C_prefixname/wx/wx_cw.h + MWFrontEnd_C_ansistrict0 + MWFrontEnd_C_mpwcnewline1 + MWFrontEnd_C_wchar_type1 + MWFrontEnd_C_enableexceptions1 + MWFrontEnd_C_dontreusestrings0 + MWFrontEnd_C_poolstrings0 + MWFrontEnd_C_dontinline0 + MWFrontEnd_C_useRTTI1 + MWFrontEnd_C_multibyteaware0 + MWFrontEnd_C_unsignedchars1 + MWFrontEnd_C_autoinline0 + MWFrontEnd_C_booltruefalse1 + MWFrontEnd_C_direct_to_som0 + MWFrontEnd_C_som_env_check0 + MWFrontEnd_C_alwaysinline0 + MWFrontEnd_C_inlinelevel0 + MWFrontEnd_C_ecplusplus0 + MWFrontEnd_C_objective_c0 + MWFrontEnd_C_defer_codegen0 + + + MWWarning_C_warn_illpragma0 + MWWarning_C_warn_emptydecl0 + MWWarning_C_warn_possunwant0 + MWWarning_C_warn_unusedvar0 + MWWarning_C_warn_unusedarg0 + MWWarning_C_warn_extracomma0 + MWWarning_C_pedantic0 + MWWarning_C_warningerrors0 + MWWarning_C_warn_hidevirtual0 + MWWarning_C_warn_implicitconv0 + MWWarning_C_warn_notinlined0 + MWWarning_C_warn_structclass0 + + + MWMerge_MacOS_projectTypeApplication + MWMerge_MacOS_outputNameMerge Out + MWMerge_MacOS_outputCreator1061109567 + MWMerge_MacOS_outputType1095782476 + MWMerge_MacOS_suppressWarning0 + MWMerge_MacOS_copyFragments1 + MWMerge_MacOS_copyResources1 + MWMerge_MacOS_skipResources + + ”tÀ + =ÃH + =Ø: + + + + MWCodeGen_PPC_structalignmentPPC + MWCodeGen_PPC_tracebacktablesNone + MWCodeGen_PPC_processorGeneric + MWCodeGen_PPC_readonlystrings0 + MWCodeGen_PPC_tocdata1 + MWCodeGen_PPC_profiler0 + MWCodeGen_PPC_fpcontract1 + MWCodeGen_PPC_schedule0 + MWCodeGen_PPC_peephole1 + MWCodeGen_PPC_processorspecific0 + MWCodeGen_PPC_altivec0 + MWCodeGen_PPC_vectortocdata0 + MWCodeGen_PPC_vrsave0 + + + MWDisassembler_PPC_showcode1 + MWDisassembler_PPC_extended1 + MWDisassembler_PPC_mix0 + MWDisassembler_PPC_nohex0 + MWDisassembler_PPC_showdata1 + MWDisassembler_PPC_showexceptions1 + MWDisassembler_PPC_showsym0 + MWDisassembler_PPC_shownames1 + + + GlobalOptimizer_PPC_optimizationlevelLevel0 + GlobalOptimizer_PPC_optforSpeed + + + MWLinker_PPC_linksym1 + MWLinker_PPC_symfullpath1 + MWLinker_PPC_linkmap0 + MWLinker_PPC_nolinkwarnings0 + MWLinker_PPC_dontdeadstripinitcode0 + MWLinker_PPC_permitmultdefs0 + MWLinker_PPC_linkmodeFast + MWLinker_PPC_initname + MWLinker_PPC_mainname__start + MWLinker_PPC_termname + PPC Mach-O CodeGen + 0001000001010000010000000001010101000000 + + PPC Mach-O Linker + 0001000000000100000100000000000000000000000000000000000000007374 + 6172740000000000000000000000000000000000000000000000000000000000 + 000000000000000000000000000000000000000000000000000000000000 + + PPC Mach-O Target + 0001000005612E6F757400000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 000000003F3F3F3F4D41504C0000004000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 00000000 + + + + MWPEF_exportsNone + MWPEF_libfolder0 + MWPEF_sortcodeNone + MWPEF_expandbss0 + MWPEF_sharedata0 + MWPEF_olddefversion0 + MWPEF_oldimpversion0 + MWPEF_currentversion0 + MWPEF_fragmentname + MWPEF_collapsereloads0 + + + MWProject_PPC_typeApplication + MWProject_PPC_outfileshaped Classic Release + MWProject_PPC_filecreator1061109567 + MWProject_PPC_filetype1095782476 + MWProject_PPC_size3840 + MWProject_PPC_minsize3840 + MWProject_PPC_stacksize64 + MWProject_PPC_flags22720 + MWProject_PPC_symfilename + MWProject_PPC_rsrcname + MWProject_PPC_rsrcheaderNative + MWProject_PPC_rsrctype1061109567 + MWProject_PPC_rsrcid0 + MWProject_PPC_rsrcflags0 + MWProject_PPC_rsrcstore0 + MWProject_PPC_rsrcmerge0 + + + MWAssembler_PPC_auxheader0 + MWAssembler_PPC_symmodeMac + MWAssembler_PPC_dialectPPC + MWAssembler_PPC_prefixfile + MWAssembler_PPC_typecheck0 + MWAssembler_PPC_warnings0 + MWAssembler_PPC_casesensitive0 + + + MWRez_Language_maxwidth80 + MWRez_Language_scriptRoman + MWRez_Language_alignmentAlign1 + MWRez_Language_filtermodeFilterSkip + MWRez_Language_suppresswarnings0 + MWRez_Language_escapecontrolchars1 + MWRez_Language_prefixname + MWRez_Language_filteredtypes'CODE' 'DATA' 'PICT' + + + + Name + wx_PPC.lib + MacOS + Library + Debug + + + Name + MSL C++.PPC.Lib + MacOS + Library + Debug + + + Name + MSL C.PPC.Lib + MacOS + Library + Debug + + + Name + console.stubs.c + MacOS + Text + + + + Name + MSL RuntimePPC.Lib + MacOS + Library + Debug + + + Name + wx_PPC.rsrc + MacOS + Resource + + + + Name + tiff.lib + MacOS + Library + + + + Name + jpeg.lib + MacOS + Library + + + + Name + png.lib + MacOS + Library + + + + Name + zlib.lib + MacOS + Library + + + + Name + shaped.cpp + MacOS + Text + + + + Name + AppearanceLib + MacOS + Library + + + + Name + ATSUnicodeLib + MacOS + Library + + + + Name + CarbonAccessors.o + MacOS + Library + + + + Name + ControlsLib + MacOS + Library + + + + Name + CursorDevicesGlue.o + MacOS + Library + + + + Name + DialogsLib + MacOS + Library + + + + Name + DragLib + MacOS + Library + + + + Name + InterfaceLib + MacOS + Library + + + + Name + InternetConfigLib + MacOS + Library + + + + Name + WindowsLib + MacOS + Library + + + + Name + MathLib + MacOS + Library + + + + Name + MenusLib + MacOS + Library + + + + Name + NavigationLib + MacOS + Library + + + + Name + OpenTptAppleTalkLib + MacOS + Library + + + + Name + OpenTptATalkPPC.o + MacOS + Library + + + + Name + OpenTptInetPPC.o + MacOS + Library + + + + Name + OpenTptInternetLib + MacOS + Library + + + + Name + OpenTransportLib + MacOS + Library + + + + Name + OpenTransportAppPPC.o + MacOS + Library + + + + Name + PLStringFuncsPPC.lib + MacOS + Library + + + + Name + TextEncodingConverter + MacOS + Library + + + + Name + Textension + MacOS + Library + + + + Name + ThreadsLib + MacOS + Library + + + + Name + UnicodeConverter + MacOS + Library + + + + + + Name + wx_PPC.lib + MacOS + + + Name + MSL C++.PPC.Lib + MacOS + + + Name + MSL C.PPC.Lib + MacOS + + + Name + console.stubs.c + MacOS + + + Name + MSL RuntimePPC.Lib + MacOS + + + Name + wx_PPC.rsrc + MacOS + + + Name + tiff.lib + MacOS + + + Name + jpeg.lib + MacOS + + + Name + png.lib + MacOS + + + Name + zlib.lib + MacOS + + + Name + shaped.cpp + MacOS + + + Name + AppearanceLib + MacOS + + + Name + ATSUnicodeLib + MacOS + + + Name + CarbonAccessors.o + MacOS + + + Name + ControlsLib + MacOS + + + Name + CursorDevicesGlue.o + MacOS + + + Name + DialogsLib + MacOS + + + Name + DragLib + MacOS + + + Name + InterfaceLib + MacOS + + + Name + InternetConfigLib + MacOS + + + Name + WindowsLib + MacOS + + + Name + MathLib + MacOS + + + Name + MenusLib + MacOS + + + Name + NavigationLib + MacOS + + + Name + OpenTptAppleTalkLib + MacOS + + + Name + OpenTptATalkPPC.o + MacOS + + + Name + OpenTptInetPPC.o + MacOS + + + Name + OpenTptInternetLib + MacOS + + + Name + OpenTransportLib + MacOS + + + Name + OpenTransportAppPPC.o + MacOS + + + Name + PLStringFuncsPPC.lib + MacOS + + + Name + TextEncodingConverter + MacOS + + + Name + Textension + MacOS + + + Name + ThreadsLib + MacOS + + + Name + UnicodeConverter + MacOS + + + + + Classic Debug + + + + UserSourceTrees + + + CustomColor1 + Red0 + Green32767 + Blue0 + + CustomColor2 + Red0 + Green32767 + Blue0 + + CustomColor3 + Red0 + Green32767 + Blue0 + + CustomColor4 + Red0 + Green32767 + Blue0 + + + + AlwaysSearchUserPathstrue + InterpretDOSAndUnixPathstrue + UserSearchPaths + + SearchPath + Path: + PathFormatMacOS + PathRootProject + + Recursivetrue + HostFlagsAll + + + SearchPath + Path:::include: + PathFormatMacOS + PathRootProject + + Recursivefalse + HostFlagsAll + + + SearchPath + Path:::lib: + PathFormatMacOS + PathRootProject + + Recursivetrue + HostFlagsAll + + + SystemSearchPaths + + SearchPath + PathMSL + PathFormatWindows + PathRootCodeWarrior + + Recursivetrue + HostFlagsAll + + + SearchPath + Path:MacOS Support: + PathFormatMacOS + PathRootCodeWarrior + + Recursivetrue + HostFlagsAll + + + + + LinkerMacOS PPC Linker + PreLinker + PostLinker + TargetnameClassic Debug + OutputDirectory + Path: + PathFormatMacOS + PathRootProject + + SaveEntriesUsingRelativePathsfalse + + + FileMappings + + FileTypeAPPL + FileExtension + Compiler + Precompilefalse + Launchabletrue + ResourceFiletrue + IgnoredByMakefalse + + + FileTypeAppl + FileExtension + Compiler + Precompilefalse + Launchabletrue + ResourceFiletrue + IgnoredByMakefalse + + + FileTypeMMLB + FileExtension + CompilerLib Import PPC + Precompilefalse + Launchablefalse + ResourceFilefalse + IgnoredByMakefalse + + + FileTypeMPLF + FileExtension + CompilerLib Import PPC + Precompilefalse + Launchablefalse + ResourceFilefalse + IgnoredByMakefalse + + + FileTypeMWCD + FileExtension + Compiler + Precompilefalse + Launchabletrue + ResourceFiletrue + IgnoredByMakefalse + + + FileTypeRSRC + FileExtension + Compiler + Precompilefalse + Launchabletrue + ResourceFiletrue + IgnoredByMakefalse + + + FileTypeTEXT + FileExtension.c + CompilerMW C/C++ PPC + Precompilefalse + Launchablefalse + ResourceFilefalse + IgnoredByMakefalse + + + FileTypeTEXT + FileExtension.c++ + CompilerMW C/C++ PPC + Precompilefalse + Launchablefalse + ResourceFilefalse + IgnoredByMakefalse + + + FileTypeTEXT + FileExtension.cc + CompilerMW C/C++ PPC + Precompilefalse + Launchablefalse + ResourceFilefalse + IgnoredByMakefalse + + + FileTypeTEXT + FileExtension.cp + CompilerMW C/C++ PPC + Precompilefalse + Launchablefalse + ResourceFilefalse + IgnoredByMakefalse + + + FileTypeTEXT + FileExtension.cpp + CompilerMW C/C++ PPC + Precompilefalse + Launchablefalse + ResourceFilefalse + IgnoredByMakefalse + + + FileTypeTEXT + FileExtension.exp + Compiler + Precompilefalse + Launchablefalse + ResourceFilefalse + IgnoredByMakefalse + + + FileTypeTEXT + FileExtension.h + CompilerMW C/C++ PPC + Precompilefalse + Launchablefalse + ResourceFilefalse + IgnoredByMaketrue + + + FileTypeTEXT + FileExtension.pch + CompilerMW C/C++ PPC + Precompiletrue + Launchablefalse + ResourceFilefalse + IgnoredByMakefalse + + + FileTypeTEXT + FileExtension.pch++ + CompilerMW C/C++ PPC + Precompiletrue + Launchablefalse + ResourceFilefalse + IgnoredByMakefalse + + + FileTypeTEXT + FileExtension.r + CompilerRez + Precompilefalse + Launchablefalse + ResourceFilefalse + IgnoredByMakefalse + + + FileTypeXCOF + FileExtension + CompilerXCOFF Import PPC + Precompilefalse + Launchablefalse + ResourceFilefalse + IgnoredByMakefalse + + + FileTypedocu + FileExtension + Compiler + Precompilefalse + Launchabletrue + ResourceFiletrue + IgnoredByMakefalse + + + FileTypersrc + FileExtension + Compiler + Precompilefalse + Launchabletrue + ResourceFiletrue + IgnoredByMakefalse + + + FileTypeshlb + FileExtension + CompilerPEF Import PPC + Precompilefalse + Launchablefalse + ResourceFilefalse + IgnoredByMakefalse + + + FileTypestub + FileExtension + CompilerPEF Import PPC + Precompilefalse + Launchablefalse + ResourceFilefalse + IgnoredByMakefalse + + + FileExtension.doc + Compiler + Precompilefalse + Launchabletrue + ResourceFilefalse + IgnoredByMaketrue + + + FileExtension.o + CompilerXCOFF Import PPC + Precompilefalse + Launchablefalse + ResourceFilefalse + IgnoredByMakefalse + + + FileExtension.ppob + Compiler + Precompilefalse + Launchabletrue + ResourceFiletrue + IgnoredByMakefalse + + + FileExtension.rsrc + Compiler + Precompilefalse + Launchabletrue + ResourceFiletrue + IgnoredByMakefalse + + + + + CacheModDatestrue + ActivateBrowsertrue + DumpBrowserInfofalse + CacheSubprojectstrue + UseThirdPartyDebuggerfalse + DebuggerCommandLine + Debugger Runtime + 0002000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 000000000000000000000000000000000E2D755010000000000001000E2D7E60 + 0002000000000000000000000E2D2DD000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 00000000000000000000000000000000 + + + + LogSystemMessagestrue + AutoTargetDLLsfalse + StopAtWatchpointstrue + PauseWhileRunningfalse + PauseInterval5 + PauseUIFlags0 + AltExePath + Path + PathFormatGeneric + PathRootAbsolute + + StopAtTempBPOnLaunchtrue + CacheSymbolicstrue + TempBPFunctionNamemain + TempBPTypefalse + + + MWFrontEnd_C_cplusplus0 + MWFrontEnd_C_checkprotos0 + MWFrontEnd_C_arm0 + MWFrontEnd_C_trigraphs0 + MWFrontEnd_C_onlystdkeywords0 + MWFrontEnd_C_enumsalwaysint0 + MWFrontEnd_C_mpwpointerstyle0 + MWFrontEnd_C_prefixname/wx/wx_cw_d.h + MWFrontEnd_C_ansistrict0 + MWFrontEnd_C_mpwcnewline1 + MWFrontEnd_C_wchar_type1 + MWFrontEnd_C_enableexceptions1 + MWFrontEnd_C_dontreusestrings0 + MWFrontEnd_C_poolstrings0 + MWFrontEnd_C_dontinline0 + MWFrontEnd_C_useRTTI1 + MWFrontEnd_C_multibyteaware0 + MWFrontEnd_C_unsignedchars1 + MWFrontEnd_C_autoinline0 + MWFrontEnd_C_booltruefalse1 + MWFrontEnd_C_direct_to_som0 + MWFrontEnd_C_som_env_check0 + MWFrontEnd_C_alwaysinline0 + MWFrontEnd_C_inlinelevel0 + MWFrontEnd_C_ecplusplus0 + MWFrontEnd_C_objective_c0 + MWFrontEnd_C_defer_codegen0 + + + MWWarning_C_warn_illpragma1 + MWWarning_C_warn_emptydecl1 + MWWarning_C_warn_possunwant1 + MWWarning_C_warn_unusedvar0 + MWWarning_C_warn_unusedarg0 + MWWarning_C_warn_extracomma0 + MWWarning_C_pedantic1 + MWWarning_C_warningerrors0 + MWWarning_C_warn_hidevirtual1 + MWWarning_C_warn_implicitconv1 + MWWarning_C_warn_notinlined1 + MWWarning_C_warn_structclass1 + + + MWMerge_MacOS_projectTypeApplication + MWMerge_MacOS_outputNameMerge Out + MWMerge_MacOS_outputCreator1061109567 + MWMerge_MacOS_outputType1095782476 + MWMerge_MacOS_suppressWarning0 + MWMerge_MacOS_copyFragments1 + MWMerge_MacOS_copyResources1 + MWMerge_MacOS_skipResources + + ”tÀ + =ÃH + =Ø: + + + + MWCodeGen_PPC_structalignmentPPC + MWCodeGen_PPC_tracebacktablesInline + MWCodeGen_PPC_processorGeneric + MWCodeGen_PPC_readonlystrings0 + MWCodeGen_PPC_tocdata1 + MWCodeGen_PPC_profiler0 + MWCodeGen_PPC_fpcontract1 + MWCodeGen_PPC_schedule0 + MWCodeGen_PPC_peephole1 + MWCodeGen_PPC_processorspecific0 + MWCodeGen_PPC_altivec0 + MWCodeGen_PPC_vectortocdata0 + MWCodeGen_PPC_vrsave0 + + + MWDisassembler_PPC_showcode1 + MWDisassembler_PPC_extended1 + MWDisassembler_PPC_mix0 + MWDisassembler_PPC_nohex0 + MWDisassembler_PPC_showdata1 + MWDisassembler_PPC_showexceptions1 + MWDisassembler_PPC_showsym0 + MWDisassembler_PPC_shownames1 + + + GlobalOptimizer_PPC_optimizationlevelLevel0 + GlobalOptimizer_PPC_optforSpeed + + + MWLinker_PPC_linksym1 + MWLinker_PPC_symfullpath1 + MWLinker_PPC_linkmap0 + MWLinker_PPC_nolinkwarnings0 + MWLinker_PPC_dontdeadstripinitcode0 + MWLinker_PPC_permitmultdefs0 + MWLinker_PPC_linkmodeFast + MWLinker_PPC_initname + MWLinker_PPC_mainname__start + MWLinker_PPC_termname + PPC Mach-O CodeGen + 0001000001010000010000000001010101000000 + + PPC Mach-O Linker + 0001000000000100000100000000000000000000000000000000000000007374 + 6172740000000000000000000000000000000000000000000000000000000000 + 000000000000000000000000000000000000000000000000000000000000 + + PPC Mach-O Target + 0001000005612E6F757400000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 000000003F3F3F3F4D41504C0000004000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 00000000 + + + + MWPEF_exportsNone + MWPEF_libfolder0 + MWPEF_sortcodeNone + MWPEF_expandbss0 + MWPEF_sharedata0 + MWPEF_olddefversion0 + MWPEF_oldimpversion0 + MWPEF_currentversion0 + MWPEF_fragmentname + MWPEF_collapsereloads0 + + + MWProject_PPC_typeApplication + MWProject_PPC_outfileshaped Classic Debug + MWProject_PPC_filecreator1061109567 + MWProject_PPC_filetype1095782476 + MWProject_PPC_size3840 + MWProject_PPC_minsize3840 + MWProject_PPC_stacksize64 + MWProject_PPC_flags22720 + MWProject_PPC_symfilename + MWProject_PPC_rsrcname + MWProject_PPC_rsrcheaderNative + MWProject_PPC_rsrctype1061109567 + MWProject_PPC_rsrcid0 + MWProject_PPC_rsrcflags0 + MWProject_PPC_rsrcstore0 + MWProject_PPC_rsrcmerge0 + + + MWAssembler_PPC_auxheader0 + MWAssembler_PPC_symmodeMac + MWAssembler_PPC_dialectPPC + MWAssembler_PPC_prefixfile + MWAssembler_PPC_typecheck0 + MWAssembler_PPC_warnings0 + MWAssembler_PPC_casesensitive0 + + + MWRez_Language_maxwidth80 + MWRez_Language_scriptRoman + MWRez_Language_alignmentAlign1 + MWRez_Language_filtermodeFilterSkip + MWRez_Language_suppresswarnings0 + MWRez_Language_escapecontrolchars1 + MWRez_Language_prefixname + MWRez_Language_filteredtypes'CODE' 'DATA' 'PICT' + + + + Name + MSL C++.PPC.Lib + MacOS + Library + Debug + + + Name + MSL C.PPC.Lib + MacOS + Library + Debug + + + Name + console.stubs.c + MacOS + Text + Debug + + + Name + MSL RuntimePPC.Lib + MacOS + Library + Debug + + + Name + wx_PPC_d.lib + MacOS + Library + Debug + + + Name + wx_PPC.rsrc + MacOS + Resource + Debug + + + Name + zlib.lib + MacOS + Library + Debug + + + Name + png.lib + MacOS + Library + Debug + + + Name + tiffd.lib + MacOS + Library + Debug + + + Name + jpeg.lib + MacOS + Library + Debug + + + Name + shaped.cpp + MacOS + Text + Debug + + + Name + AppearanceLib + MacOS + Library + Debug + + + Name + ATSUnicodeLib + MacOS + Library + Debug + + + Name + CarbonAccessors.o + MacOS + Library + Debug + + + Name + ControlsLib + MacOS + Library + Debug + + + Name + CursorDevicesGlue.o + MacOS + Library + Debug + + + Name + DialogsLib + MacOS + Library + Debug + + + Name + DragLib + MacOS + Library + Debug + + + Name + InterfaceLib + MacOS + Library + Debug + + + Name + InternetConfigLib + MacOS + Library + Debug + + + Name + WindowsLib + MacOS + Library + Debug + + + Name + MathLib + MacOS + Library + Debug + + + Name + MenusLib + MacOS + Library + Debug + + + Name + NavigationLib + MacOS + Library + Debug + + + Name + OpenTptAppleTalkLib + MacOS + Library + Debug + + + Name + OpenTptATalkPPC.o + MacOS + Library + Debug + + + Name + OpenTptInetPPC.o + MacOS + Library + Debug + + + Name + OpenTptInternetLib + MacOS + Library + Debug + + + Name + OpenTransportLib + MacOS + Library + Debug + + + Name + OpenTransportAppPPC.o + MacOS + Library + Debug + + + Name + PLStringFuncsPPC.lib + MacOS + Library + Debug + + + Name + TextEncodingConverter + MacOS + Library + Debug + + + Name + Textension + MacOS + Library + Debug + + + Name + ThreadsLib + MacOS + Library + Debug + + + Name + UnicodeConverter + MacOS + Library + Debug + + + + + Name + MSL C++.PPC.Lib + MacOS + + + Name + MSL C.PPC.Lib + MacOS + + + Name + console.stubs.c + MacOS + + + Name + MSL RuntimePPC.Lib + MacOS + + + Name + wx_PPC_d.lib + MacOS + + + Name + wx_PPC.rsrc + MacOS + + + Name + zlib.lib + MacOS + + + Name + png.lib + MacOS + + + Name + tiffd.lib + MacOS + + + Name + jpeg.lib + MacOS + + + Name + shaped.cpp + MacOS + + + Name + AppearanceLib + MacOS + + + Name + ATSUnicodeLib + MacOS + + + Name + CarbonAccessors.o + MacOS + + + Name + ControlsLib + MacOS + + + Name + CursorDevicesGlue.o + MacOS + + + Name + DialogsLib + MacOS + + + Name + DragLib + MacOS + + + Name + InterfaceLib + MacOS + + + Name + InternetConfigLib + MacOS + + + Name + WindowsLib + MacOS + + + Name + MathLib + MacOS + + + Name + MenusLib + MacOS + + + Name + NavigationLib + MacOS + + + Name + OpenTptAppleTalkLib + MacOS + + + Name + OpenTptATalkPPC.o + MacOS + + + Name + OpenTptInetPPC.o + MacOS + + + Name + OpenTptInternetLib + MacOS + + + Name + OpenTransportLib + MacOS + + + Name + OpenTransportAppPPC.o + MacOS + + + Name + PLStringFuncsPPC.lib + MacOS + + + Name + TextEncodingConverter + MacOS + + + Name + Textension + MacOS + + + Name + ThreadsLib + MacOS + + + Name + UnicodeConverter + MacOS + + + + + Carbon Debug + + + + UserSourceTrees + + + CustomColor1 + Red0 + Green32767 + Blue0 + + CustomColor2 + Red0 + Green32767 + Blue0 + + CustomColor3 + Red0 + Green32767 + Blue0 + + CustomColor4 + Red0 + Green32767 + Blue0 + + + + AlwaysSearchUserPathstrue + InterpretDOSAndUnixPathstrue + UserSearchPaths + + SearchPath + Path: + PathFormatMacOS + PathRootProject + + Recursivetrue + HostFlagsAll + + + SearchPath + Path:::include: + PathFormatMacOS + PathRootProject + + Recursivefalse + HostFlagsAll + + + SearchPath + Path:::lib: + PathFormatMacOS + PathRootProject + + Recursivetrue + HostFlagsAll + + + SystemSearchPaths + + SearchPath + PathMSL + PathFormatWindows + PathRootCodeWarrior + + Recursivetrue + HostFlagsAll + + + SearchPath + Path:MacOS Support: + PathFormatMacOS + PathRootCodeWarrior + + Recursivetrue + HostFlagsAll + + + + + LinkerMacOS PPC Linker + PreLinker + PostLinker + TargetnameCarbon Debug + OutputDirectory + Path: + PathFormatMacOS + PathRootProject + + SaveEntriesUsingRelativePathsfalse + + + FileMappings + + FileTypeAPPL + FileExtension + Compiler + Precompilefalse + Launchabletrue + ResourceFiletrue + IgnoredByMakefalse + + + FileTypeAppl + FileExtension + Compiler + Precompilefalse + Launchabletrue + ResourceFiletrue + IgnoredByMakefalse + + + FileTypeMMLB + FileExtension + CompilerLib Import PPC + Precompilefalse + Launchablefalse + ResourceFilefalse + IgnoredByMakefalse + + + FileTypeMPLF + FileExtension + CompilerLib Import PPC + Precompilefalse + Launchablefalse + ResourceFilefalse + IgnoredByMakefalse + + + FileTypeMWCD + FileExtension + Compiler + Precompilefalse + Launchabletrue + ResourceFiletrue + IgnoredByMakefalse + + + FileTypeRSRC + FileExtension + Compiler + Precompilefalse + Launchabletrue + ResourceFiletrue + IgnoredByMakefalse + + + FileTypeTEXT + FileExtension.c + CompilerMW C/C++ PPC + Precompilefalse + Launchablefalse + ResourceFilefalse + IgnoredByMakefalse + + + FileTypeTEXT + FileExtension.c++ + CompilerMW C/C++ PPC + Precompilefalse + Launchablefalse + ResourceFilefalse + IgnoredByMakefalse + + + FileTypeTEXT + FileExtension.cc + CompilerMW C/C++ PPC + Precompilefalse + Launchablefalse + ResourceFilefalse + IgnoredByMakefalse + + + FileTypeTEXT + FileExtension.cp + CompilerMW C/C++ PPC + Precompilefalse + Launchablefalse + ResourceFilefalse + IgnoredByMakefalse + + + FileTypeTEXT + FileExtension.cpp + CompilerMW C/C++ PPC + Precompilefalse + Launchablefalse + ResourceFilefalse + IgnoredByMakefalse + + + FileTypeTEXT + FileExtension.exp + Compiler + Precompilefalse + Launchablefalse + ResourceFilefalse + IgnoredByMakefalse + + + FileTypeTEXT + FileExtension.h + CompilerMW C/C++ PPC + Precompilefalse + Launchablefalse + ResourceFilefalse + IgnoredByMaketrue + + + FileTypeTEXT + FileExtension.pch + CompilerMW C/C++ PPC + Precompiletrue + Launchablefalse + ResourceFilefalse + IgnoredByMakefalse + + + FileTypeTEXT + FileExtension.pch++ + CompilerMW C/C++ PPC + Precompiletrue + Launchablefalse + ResourceFilefalse + IgnoredByMakefalse + + + FileTypeTEXT + FileExtension.r + CompilerRez + Precompilefalse + Launchablefalse + ResourceFilefalse + IgnoredByMakefalse + + + FileTypeXCOF + FileExtension + CompilerXCOFF Import PPC + Precompilefalse + Launchablefalse + ResourceFilefalse + IgnoredByMakefalse + + + FileTypedocu + FileExtension + Compiler + Precompilefalse + Launchabletrue + ResourceFiletrue + IgnoredByMakefalse + + + FileTypersrc + FileExtension + Compiler + Precompilefalse + Launchabletrue + ResourceFiletrue + IgnoredByMakefalse + + + FileTypeshlb + FileExtension + CompilerPEF Import PPC + Precompilefalse + Launchablefalse + ResourceFilefalse + IgnoredByMakefalse + + + FileTypestub + FileExtension + CompilerPEF Import PPC + Precompilefalse + Launchablefalse + ResourceFilefalse + IgnoredByMakefalse + + + FileExtension.doc + Compiler + Precompilefalse + Launchabletrue + ResourceFilefalse + IgnoredByMaketrue + + + FileExtension.o + CompilerXCOFF Import PPC + Precompilefalse + Launchablefalse + ResourceFilefalse + IgnoredByMakefalse + + + FileExtension.ppob + Compiler + Precompilefalse + Launchabletrue + ResourceFiletrue + IgnoredByMakefalse + + + FileExtension.rsrc + Compiler + Precompilefalse + Launchabletrue + ResourceFiletrue + IgnoredByMakefalse + + + + + CacheModDatestrue + ActivateBrowsertrue + DumpBrowserInfofalse + CacheSubprojectstrue + UseThirdPartyDebuggerfalse + DebuggerCommandLine + Debugger Runtime + 0002000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 00000000000000000000000000000000 + + + + LogSystemMessagestrue + AutoTargetDLLsfalse + StopAtWatchpointstrue + PauseWhileRunningfalse + PauseInterval5 + PauseUIFlags0 + AltExePath + Path + PathFormatGeneric + PathRootAbsolute + + StopAtTempBPOnLaunchtrue + CacheSymbolicstrue + TempBPFunctionNamemain + TempBPTypefalse + + + MWFrontEnd_C_cplusplus0 + MWFrontEnd_C_checkprotos0 + MWFrontEnd_C_arm0 + MWFrontEnd_C_trigraphs0 + MWFrontEnd_C_onlystdkeywords0 + MWFrontEnd_C_enumsalwaysint0 + MWFrontEnd_C_mpwpointerstyle0 + MWFrontEnd_C_prefixname/wx/wx_cwc_d.h + MWFrontEnd_C_ansistrict0 + MWFrontEnd_C_mpwcnewline1 + MWFrontEnd_C_wchar_type1 + MWFrontEnd_C_enableexceptions1 + MWFrontEnd_C_dontreusestrings0 + MWFrontEnd_C_poolstrings0 + MWFrontEnd_C_dontinline0 + MWFrontEnd_C_useRTTI1 + MWFrontEnd_C_multibyteaware0 + MWFrontEnd_C_unsignedchars1 + MWFrontEnd_C_autoinline0 + MWFrontEnd_C_booltruefalse1 + MWFrontEnd_C_direct_to_som0 + MWFrontEnd_C_som_env_check0 + MWFrontEnd_C_alwaysinline0 + MWFrontEnd_C_inlinelevel0 + MWFrontEnd_C_ecplusplus0 + MWFrontEnd_C_objective_c0 + MWFrontEnd_C_defer_codegen0 + + + MWWarning_C_warn_illpragma1 + MWWarning_C_warn_emptydecl1 + MWWarning_C_warn_possunwant1 + MWWarning_C_warn_unusedvar0 + MWWarning_C_warn_unusedarg0 + MWWarning_C_warn_extracomma0 + MWWarning_C_pedantic1 + MWWarning_C_warningerrors0 + MWWarning_C_warn_hidevirtual1 + MWWarning_C_warn_implicitconv1 + MWWarning_C_warn_notinlined1 + MWWarning_C_warn_structclass1 + + + MWMerge_MacOS_projectTypeApplication + MWMerge_MacOS_outputNameMerge Out + MWMerge_MacOS_outputCreator1061109567 + MWMerge_MacOS_outputType1095782476 + MWMerge_MacOS_suppressWarning0 + MWMerge_MacOS_copyFragments1 + MWMerge_MacOS_copyResources1 + MWMerge_MacOS_skipResources + + ”tÀ + =ÃH + =Ø: + + + + MWCodeGen_PPC_structalignmentPPC + MWCodeGen_PPC_tracebacktablesInline + MWCodeGen_PPC_processorGeneric + MWCodeGen_PPC_readonlystrings0 + MWCodeGen_PPC_tocdata1 + MWCodeGen_PPC_profiler0 + MWCodeGen_PPC_fpcontract1 + MWCodeGen_PPC_schedule0 + MWCodeGen_PPC_peephole1 + MWCodeGen_PPC_processorspecific0 + MWCodeGen_PPC_altivec0 + MWCodeGen_PPC_vectortocdata0 + MWCodeGen_PPC_vrsave0 + + + MWDisassembler_PPC_showcode1 + MWDisassembler_PPC_extended1 + MWDisassembler_PPC_mix0 + MWDisassembler_PPC_nohex0 + MWDisassembler_PPC_showdata1 + MWDisassembler_PPC_showexceptions1 + MWDisassembler_PPC_showsym0 + MWDisassembler_PPC_shownames1 + + + GlobalOptimizer_PPC_optimizationlevelLevel0 + GlobalOptimizer_PPC_optforSpeed + + + MWLinker_PPC_linksym1 + MWLinker_PPC_symfullpath1 + MWLinker_PPC_linkmap0 + MWLinker_PPC_nolinkwarnings0 + MWLinker_PPC_dontdeadstripinitcode0 + MWLinker_PPC_permitmultdefs0 + MWLinker_PPC_linkmodeFast + MWLinker_PPC_initname + MWLinker_PPC_mainname__start + MWLinker_PPC_termname + PPC Mach-O CodeGen + 0001000001010000010000000001010101000000 + + PPC Mach-O Linker + 0001000000000100000100000000000000000000000000000000000000007374 + 6172740000000000000000000000000000000000000000000000000000000000 + 000000000000000000000000000000000000000000000000000000000000 + + PPC Mach-O Target + 0001000005612E6F757400000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 000000003F3F3F3F4D41504C0000004000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 00000000 + + + + MWPEF_exportsNone + MWPEF_libfolder0 + MWPEF_sortcodeNone + MWPEF_expandbss0 + MWPEF_sharedata0 + MWPEF_olddefversion0 + MWPEF_oldimpversion0 + MWPEF_currentversion0 + MWPEF_fragmentname + MWPEF_collapsereloads0 + + + MWProject_PPC_typeApplication + MWProject_PPC_outfileshaped Carbon Debug + MWProject_PPC_filecreator1061109567 + MWProject_PPC_filetype1095782476 + MWProject_PPC_size3840 + MWProject_PPC_minsize3840 + MWProject_PPC_stacksize64 + MWProject_PPC_flags22720 + MWProject_PPC_symfilename + MWProject_PPC_rsrcname + MWProject_PPC_rsrcheaderNative + MWProject_PPC_rsrctype1061109567 + MWProject_PPC_rsrcid0 + MWProject_PPC_rsrcflags0 + MWProject_PPC_rsrcstore0 + MWProject_PPC_rsrcmerge0 + + + MWAssembler_PPC_auxheader0 + MWAssembler_PPC_symmodeMac + MWAssembler_PPC_dialectPPC + MWAssembler_PPC_prefixfile + MWAssembler_PPC_typecheck0 + MWAssembler_PPC_warnings0 + MWAssembler_PPC_casesensitive0 + + + MWRez_Language_maxwidth80 + MWRez_Language_scriptRoman + MWRez_Language_alignmentAlign1 + MWRez_Language_filtermodeFilterSkip + MWRez_Language_suppresswarnings0 + MWRez_Language_escapecontrolchars1 + MWRez_Language_prefixname + MWRez_Language_filteredtypes'CODE' 'DATA' 'PICT' + + + + Name + MSL C++.PPC.Lib + MacOS + Library + Debug + + + Name + console.stubs.c + MacOS + Text + Debug + + + Name + MSL RuntimePPC.Lib + MacOS + Library + Debug + + + Name + wx_CARBON_d.lib + MacOS + Library + Debug + + + Name + MSL C.CARBON.Lib + MacOS + Library + Debug + + + Name + wx_CARBON.rsrc + MacOS + Resource + Debug + + + Name + tiffd.lib + MacOS + Library + Debug + + + Name + jpeg.lib + MacOS + Library + Debug + + + Name + png.lib + MacOS + Library + Debug + + + Name + zlib.lib + MacOS + Library + Debug + + + Name + shaped.cpp + MacOS + Text + Debug + + + Name + CarbonLib + MacOS + Library + Debug + + + Name + CarbonFrameworkLib + MacOS + Library + Debug + + + + + Name + MSL C++.PPC.Lib + MacOS + + + Name + console.stubs.c + MacOS + + + Name + MSL RuntimePPC.Lib + MacOS + + + Name + wx_CARBON_d.lib + MacOS + + + Name + MSL C.CARBON.Lib + MacOS + + + Name + wx_CARBON.rsrc + MacOS + + + Name + tiffd.lib + MacOS + + + Name + jpeg.lib + MacOS + + + Name + png.lib + MacOS + + + Name + zlib.lib + MacOS + + + Name + shaped.cpp + MacOS + + + Name + CarbonLib + MacOS + + + Name + CarbonFrameworkLib + MacOS + + + + + Carbon Release + + + + UserSourceTrees + + + CustomColor1 + Red0 + Green32767 + Blue0 + + CustomColor2 + Red0 + Green32767 + Blue0 + + CustomColor3 + Red0 + Green32767 + Blue0 + + CustomColor4 + Red0 + Green32767 + Blue0 + + + + AlwaysSearchUserPathstrue + InterpretDOSAndUnixPathstrue + UserSearchPaths + + SearchPath + Path: + PathFormatMacOS + PathRootProject + + Recursivetrue + HostFlagsAll + + + SearchPath + Path:::include: + PathFormatMacOS + PathRootProject + + Recursivefalse + HostFlagsAll + + + SearchPath + Path:::lib: + PathFormatMacOS + PathRootProject + + Recursivetrue + HostFlagsAll + + + SystemSearchPaths + + SearchPath + PathMSL + PathFormatWindows + PathRootCodeWarrior + + Recursivetrue + HostFlagsAll + + + SearchPath + Path:MacOS Support: + PathFormatMacOS + PathRootCodeWarrior + + Recursivetrue + HostFlagsAll + + + + + LinkerMacOS PPC Linker + PreLinker + PostLinker + TargetnameCarbon Release + OutputDirectory + Path: + PathFormatMacOS + PathRootProject + + SaveEntriesUsingRelativePathsfalse + + + FileMappings + + FileTypeAPPL + FileExtension + Compiler + Precompilefalse + Launchabletrue + ResourceFiletrue + IgnoredByMakefalse + + + FileTypeAppl + FileExtension + Compiler + Precompilefalse + Launchabletrue + ResourceFiletrue + IgnoredByMakefalse + + + FileTypeMMLB + FileExtension + CompilerLib Import PPC + Precompilefalse + Launchablefalse + ResourceFilefalse + IgnoredByMakefalse + + + FileTypeMPLF + FileExtension + CompilerLib Import PPC + Precompilefalse + Launchablefalse + ResourceFilefalse + IgnoredByMakefalse + + + FileTypeMWCD + FileExtension + Compiler + Precompilefalse + Launchabletrue + ResourceFiletrue + IgnoredByMakefalse + + + FileTypeRSRC + FileExtension + Compiler + Precompilefalse + Launchabletrue + ResourceFiletrue + IgnoredByMakefalse + + + FileTypeTEXT + FileExtension.c + CompilerMW C/C++ PPC + Precompilefalse + Launchablefalse + ResourceFilefalse + IgnoredByMakefalse + + + FileTypeTEXT + FileExtension.c++ + CompilerMW C/C++ PPC + Precompilefalse + Launchablefalse + ResourceFilefalse + IgnoredByMakefalse + + + FileTypeTEXT + FileExtension.cc + CompilerMW C/C++ PPC + Precompilefalse + Launchablefalse + ResourceFilefalse + IgnoredByMakefalse + + + FileTypeTEXT + FileExtension.cp + CompilerMW C/C++ PPC + Precompilefalse + Launchablefalse + ResourceFilefalse + IgnoredByMakefalse + + + FileTypeTEXT + FileExtension.cpp + CompilerMW C/C++ PPC + Precompilefalse + Launchablefalse + ResourceFilefalse + IgnoredByMakefalse + + + FileTypeTEXT + FileExtension.exp + Compiler + Precompilefalse + Launchablefalse + ResourceFilefalse + IgnoredByMakefalse + + + FileTypeTEXT + FileExtension.h + CompilerMW C/C++ PPC + Precompilefalse + Launchablefalse + ResourceFilefalse + IgnoredByMaketrue + + + FileTypeTEXT + FileExtension.pch + CompilerMW C/C++ PPC + Precompiletrue + Launchablefalse + ResourceFilefalse + IgnoredByMakefalse + + + FileTypeTEXT + FileExtension.pch++ + CompilerMW C/C++ PPC + Precompiletrue + Launchablefalse + ResourceFilefalse + IgnoredByMakefalse + + + FileTypeTEXT + FileExtension.r + CompilerRez + Precompilefalse + Launchablefalse + ResourceFilefalse + IgnoredByMakefalse + + + FileTypeXCOF + FileExtension + CompilerXCOFF Import PPC + Precompilefalse + Launchablefalse + ResourceFilefalse + IgnoredByMakefalse + + + FileTypedocu + FileExtension + Compiler + Precompilefalse + Launchabletrue + ResourceFiletrue + IgnoredByMakefalse + + + FileTypersrc + FileExtension + Compiler + Precompilefalse + Launchabletrue + ResourceFiletrue + IgnoredByMakefalse + + + FileTypeshlb + FileExtension + CompilerPEF Import PPC + Precompilefalse + Launchablefalse + ResourceFilefalse + IgnoredByMakefalse + + + FileTypestub + FileExtension + CompilerPEF Import PPC + Precompilefalse + Launchablefalse + ResourceFilefalse + IgnoredByMakefalse + + + FileExtension.doc + Compiler + Precompilefalse + Launchabletrue + ResourceFilefalse + IgnoredByMaketrue + + + FileExtension.o + CompilerXCOFF Import PPC + Precompilefalse + Launchablefalse + ResourceFilefalse + IgnoredByMakefalse + + + FileExtension.ppob + Compiler + Precompilefalse + Launchabletrue + ResourceFiletrue + IgnoredByMakefalse + + + FileExtension.rsrc + Compiler + Precompilefalse + Launchabletrue + ResourceFiletrue + IgnoredByMakefalse + + + + + CacheModDatestrue + ActivateBrowsertrue + DumpBrowserInfofalse + CacheSubprojectstrue + UseThirdPartyDebuggerfalse + DebuggerCommandLine + Debugger Runtime + 0002000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 00000000000000000000000000000000 + + + + LogSystemMessagestrue + AutoTargetDLLsfalse + StopAtWatchpointstrue + PauseWhileRunningfalse + PauseInterval5 + PauseUIFlags0 + AltExePath + Path + PathFormatGeneric + PathRootAbsolute + + StopAtTempBPOnLaunchtrue + CacheSymbolicstrue + TempBPFunctionNamemain + TempBPTypefalse + + + MWFrontEnd_C_cplusplus0 + MWFrontEnd_C_checkprotos0 + MWFrontEnd_C_arm0 + MWFrontEnd_C_trigraphs0 + MWFrontEnd_C_onlystdkeywords0 + MWFrontEnd_C_enumsalwaysint0 + MWFrontEnd_C_mpwpointerstyle1 + MWFrontEnd_C_prefixname/wx/wx_cwc.h + MWFrontEnd_C_ansistrict0 + MWFrontEnd_C_mpwcnewline1 + MWFrontEnd_C_wchar_type1 + MWFrontEnd_C_enableexceptions1 + MWFrontEnd_C_dontreusestrings0 + MWFrontEnd_C_poolstrings0 + MWFrontEnd_C_dontinline0 + MWFrontEnd_C_useRTTI1 + MWFrontEnd_C_multibyteaware0 + MWFrontEnd_C_unsignedchars1 + MWFrontEnd_C_autoinline0 + MWFrontEnd_C_booltruefalse1 + MWFrontEnd_C_direct_to_som0 + MWFrontEnd_C_som_env_check0 + MWFrontEnd_C_alwaysinline0 + MWFrontEnd_C_inlinelevel0 + MWFrontEnd_C_ecplusplus0 + MWFrontEnd_C_objective_c0 + MWFrontEnd_C_defer_codegen0 + + + MWWarning_C_warn_illpragma0 + MWWarning_C_warn_emptydecl0 + MWWarning_C_warn_possunwant0 + MWWarning_C_warn_unusedvar0 + MWWarning_C_warn_unusedarg0 + MWWarning_C_warn_extracomma0 + MWWarning_C_pedantic0 + MWWarning_C_warningerrors0 + MWWarning_C_warn_hidevirtual0 + MWWarning_C_warn_implicitconv0 + MWWarning_C_warn_notinlined0 + MWWarning_C_warn_structclass0 + + + MWMerge_MacOS_projectTypeApplication + MWMerge_MacOS_outputNameMerge Out + MWMerge_MacOS_outputCreator1061109567 + MWMerge_MacOS_outputType1095782476 + MWMerge_MacOS_suppressWarning0 + MWMerge_MacOS_copyFragments1 + MWMerge_MacOS_copyResources1 + MWMerge_MacOS_skipResources + + ”tÀ + =ÃH + =Ø: + + + + MWCodeGen_PPC_structalignmentPPC + MWCodeGen_PPC_tracebacktablesNone + MWCodeGen_PPC_processorGeneric + MWCodeGen_PPC_readonlystrings0 + MWCodeGen_PPC_tocdata1 + MWCodeGen_PPC_profiler0 + MWCodeGen_PPC_fpcontract1 + MWCodeGen_PPC_schedule0 + MWCodeGen_PPC_peephole1 + MWCodeGen_PPC_processorspecific0 + MWCodeGen_PPC_altivec0 + MWCodeGen_PPC_vectortocdata0 + MWCodeGen_PPC_vrsave0 + + + MWDisassembler_PPC_showcode1 + MWDisassembler_PPC_extended1 + MWDisassembler_PPC_mix0 + MWDisassembler_PPC_nohex0 + MWDisassembler_PPC_showdata1 + MWDisassembler_PPC_showexceptions1 + MWDisassembler_PPC_showsym0 + MWDisassembler_PPC_shownames1 + + + GlobalOptimizer_PPC_optimizationlevelLevel0 + GlobalOptimizer_PPC_optforSpeed + + + MWLinker_PPC_linksym1 + MWLinker_PPC_symfullpath1 + MWLinker_PPC_linkmap0 + MWLinker_PPC_nolinkwarnings0 + MWLinker_PPC_dontdeadstripinitcode0 + MWLinker_PPC_permitmultdefs0 + MWLinker_PPC_linkmodeFast + MWLinker_PPC_initname + MWLinker_PPC_mainname__start + MWLinker_PPC_termname + PPC Mach-O CodeGen + 0001000001010000010000000001010101000000 + + PPC Mach-O Linker + 0001000000000100000100000000000000000000000000000000000000007374 + 6172740000000000000000000000000000000000000000000000000000000000 + 000000000000000000000000000000000000000000000000000000000000 + + PPC Mach-O Target + 0001000005612E6F757400000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 000000003F3F3F3F4D41504C0000004000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 00000000 + + + + MWPEF_exportsNone + MWPEF_libfolder0 + MWPEF_sortcodeNone + MWPEF_expandbss0 + MWPEF_sharedata0 + MWPEF_olddefversion0 + MWPEF_oldimpversion0 + MWPEF_currentversion0 + MWPEF_fragmentname + MWPEF_collapsereloads0 + + + MWProject_PPC_typeApplication + MWProject_PPC_outfileshaped Carbon Release + MWProject_PPC_filecreator1061109567 + MWProject_PPC_filetype1095782476 + MWProject_PPC_size3840 + MWProject_PPC_minsize3840 + MWProject_PPC_stacksize64 + MWProject_PPC_flags22720 + MWProject_PPC_symfilename + MWProject_PPC_rsrcname + MWProject_PPC_rsrcheaderNative + MWProject_PPC_rsrctype1061109567 + MWProject_PPC_rsrcid0 + MWProject_PPC_rsrcflags0 + MWProject_PPC_rsrcstore0 + MWProject_PPC_rsrcmerge0 + + + MWAssembler_PPC_auxheader0 + MWAssembler_PPC_symmodeMac + MWAssembler_PPC_dialectPPC + MWAssembler_PPC_prefixfile + MWAssembler_PPC_typecheck0 + MWAssembler_PPC_warnings0 + MWAssembler_PPC_casesensitive0 + + + MWRez_Language_maxwidth80 + MWRez_Language_scriptRoman + MWRez_Language_alignmentAlign1 + MWRez_Language_filtermodeFilterSkip + MWRez_Language_suppresswarnings0 + MWRez_Language_escapecontrolchars1 + MWRez_Language_prefixname + MWRez_Language_filteredtypes'CODE' 'DATA' 'PICT' + + + + Name + MSL C++.PPC.Lib + MacOS + Library + Debug + + + Name + console.stubs.c + MacOS + Text + + + + Name + MSL RuntimePPC.Lib + MacOS + Library + Debug + + + Name + MSL C.CARBON.Lib + MacOS + Library + + + + Name + wx_CARBON.lib + MacOS + Library + + + + Name + wx_CARBON.rsrc + MacOS + Resource + + + + Name + tiff.lib + MacOS + Library + + + + Name + jpeg.lib + MacOS + Library + + + + Name + shaped.cpp + MacOS + Text + + + + Name + png.lib + MacOS + Library + + + + Name + zlib.lib + MacOS + Library + + + + Name + CarbonLib + MacOS + Library + + + + Name + CarbonFrameworkLib + MacOS + Library + + + + + + Name + MSL C++.PPC.Lib + MacOS + + + Name + console.stubs.c + MacOS + + + Name + MSL RuntimePPC.Lib + MacOS + + + Name + MSL C.CARBON.Lib + MacOS + + + Name + wx_CARBON.lib + MacOS + + + Name + wx_CARBON.rsrc + MacOS + + + Name + tiff.lib + MacOS + + + Name + jpeg.lib + MacOS + + + Name + shaped.cpp + MacOS + + + Name + png.lib + MacOS + + + Name + zlib.lib + MacOS + + + Name + CarbonLib + MacOS + + + Name + CarbonFrameworkLib + MacOS + + + + + + + Classic Release + Classic Debug + Carbon Debug + Carbon Release + + + + + Classic Release + Name + shaped.cpp + MacOS + + wx + + Carbon Release + Name + wx_CARBON.lib + MacOS + + + Carbon Debug + Name + wx_CARBON_d.lib + MacOS + + + Carbon Debug + Name + wx_CARBON.rsrc + MacOS + + + Classic Release + Name + wx_PPC.lib + MacOS + + + Classic Debug + Name + wx_PPC_d.lib + MacOS + + + Classic Release + Name + wx_PPC.rsrc + MacOS + + + Classic Release + Name + tiff.lib + MacOS + + + Classic Release + Name + zlib.lib + MacOS + + + Classic Release + Name + png.lib + MacOS + + + Classic Debug + Name + tiffd.lib + MacOS + + + Classic Release + Name + jpeg.lib + MacOS + + + MSL ANSI Libraries + + Classic Release + Name + console.stubs.c + MacOS + + + Classic Release + Name + MSL RuntimePPC.Lib + MacOS + + + Classic Release + Name + MSL C++.PPC.Lib + MacOS + + + Classic Release + Name + MSL C.PPC.Lib + MacOS + + + Carbon Debug + Name + MSL C.CARBON.Lib + MacOS + + + Win32 SDK + + MacOS + Carbon + + Carbon Debug + Name + CarbonLib + MacOS + + + Carbon Debug + Name + CarbonFrameworkLib + MacOS + + + Classic + + Classic Release + Name + AppearanceLib + MacOS + + + Classic Release + Name + ATSUnicodeLib + MacOS + + + Classic Release + Name + CarbonAccessors.o + MacOS + + + Classic Release + Name + ControlsLib + MacOS + + + Classic Release + Name + CursorDevicesGlue.o + MacOS + + + Classic Release + Name + DialogsLib + MacOS + + + Classic Release + Name + DragLib + MacOS + + + Classic Release + Name + InterfaceLib + MacOS + + + Classic Release + Name + InternetConfigLib + MacOS + + + Classic Release + Name + WindowsLib + MacOS + + + Classic Release + Name + MathLib + MacOS + + + Classic Release + Name + MenusLib + MacOS + + + Classic Release + Name + NavigationLib + MacOS + + + Classic Release + Name + OpenTptAppleTalkLib + MacOS + + + Classic Release + Name + OpenTptATalkPPC.o + MacOS + + + Classic Release + Name + OpenTptInetPPC.o + MacOS + + + Classic Release + Name + OpenTptInternetLib + MacOS + + + Classic Release + Name + OpenTransportLib + MacOS + + + Classic Release + Name + OpenTransportAppPPC.o + MacOS + + + Classic Release + Name + PLStringFuncsPPC.lib + MacOS + + + Classic Release + Name + TextEncodingConverter + MacOS + + + Classic Release + Name + Textension + MacOS + + + Classic Release + Name + ThreadsLib + MacOS + + + Classic Release + Name + UnicodeConverter + MacOS + + + + + + diff --git a/samples/shaped/star.png b/samples/shaped/star.png new file mode 100644 index 0000000000..0d746b5be4 Binary files /dev/null and b/samples/shaped/star.png differ diff --git a/src/common/rgncmn.cpp b/src/common/rgncmn.cpp new file mode 100644 index 0000000000..c794b59ab9 --- /dev/null +++ b/src/common/rgncmn.cpp @@ -0,0 +1,118 @@ +///////////////////////////////////////////////////////////////////////////// +// Name: rgncmn.cpp +// Purpose: Methods of wxRegion that have a generic implementation +// Author: Robin Dunn +// Modified by: +// Created: 27-Mar-2003 +// RCS-ID: $Id$ +// Copyright: (c) Robin Dunn +// Licence: wxWindows licence +///////////////////////////////////////////////////////////////////////////// + +#ifdef __GNUG__ +#pragma implementation "rgncmn.h" +#endif + + +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + +#ifdef __BORLANDC__ +#pragma hdrstop +#endif + +#include "wx/region.h" +#include "wx/bitmap.h" +#include "wx/dcmemory.h" + + +//--------------------------------------------------------------------------- + + + +wxBitmap wxRegion::ConvertToBitmap() const +{ + wxRect box = GetBox(); + wxBitmap bmp(box.GetRight(), box.GetBottom()); + wxMemoryDC dc; + dc.SelectObject(bmp); + dc.SetBackground(*wxWHITE_BRUSH); + dc.Clear(); + dc.SetClippingRegion(*this); + dc.SetBackground(*wxBLACK_BRUSH); + dc.Clear(); + dc.SelectObject(wxNullBitmap); + return bmp; +} + +//--------------------------------------------------------------------------- + +bool wxRegion::Union(const wxBitmap& bmp, + const wxColour& transColour, + int tolerance) +{ + unsigned char loR, loG, loB; + unsigned char hiR, hiG, hiB; + + wxCHECK_MSG((bmp.GetMask() != NULL) || transColour.Ok(), + FALSE, + wxT("Either the bitmap should have a mask or a colour should be given.")); + + wxImage image = bmp.ConvertToImage(); + + if (image.HasMask()) + { + loR = image.GetMaskRed(); + loG = image.GetMaskGreen(); + loB = image.GetMaskBlue(); + } + else + { + loR = transColour.Red(); + loG = transColour.Green(); + loB = transColour.Blue(); + } + + hiR = wxMin(0xFF, loR + tolerance); + hiG = wxMin(0xFF, loG + tolerance); + hiB = wxMin(0xFF, loB + tolerance); + + // Loop through the image row by row, pixel by pixel, building up + // rectangles to add to the region. + int width = image.GetWidth(); + int height = image.GetHeight(); + for (int y=0; y < height; y++) + { + wxRect rect; + rect.y = y; + rect.height = 1; + + for (int x=0; x < width; x++) + { + // search for a continuous range of non-transparent pixels + int x0 = x; + while ( x < width) + { + unsigned char R = image.GetRed(x,y); + unsigned char G = image.GetGreen(x,y); + unsigned char B = image.GetBlue(x,y); + if (( R >= loR && R <= hiR) && + ( G >= loG && G <= hiG) && + ( B >= loB && B <= hiB)) // It's transparent + break; + x++; + } + + // Add the run of non-transparent pixels (if any) to the region + if (x > x0) { + rect.x = x0; + rect.width = x - x0; + Union(rect); + } + } + } + + return TRUE; +} + +//--------------------------------------------------------------------------- diff --git a/src/files.lst b/src/files.lst index d96380915b..ed695b888b 100644 --- a/src/files.lst +++ b/src/files.lst @@ -97,7 +97,6 @@ ALL_HEADERS = \ cmdline.h \ confbase.h \ config.h \ - date.h \ datetime.h \ datetime.inl \ datstrm.h \ @@ -139,6 +138,7 @@ ALL_HEADERS = \ listimpl.cpp \ log.h \ longlong.h \ + math.h \ memconf.h \ memory.h \ memtext.h \ @@ -163,7 +163,6 @@ ALL_HEADERS = \ textfile.h \ thread.h \ thrimpl.cpp \ - time.h \ timer.h \ tokenzr.h \ txtstrm.h \ diff --git a/src/gtk/files.lst b/src/gtk/files.lst index 379fb44d50..38db3d4492 100644 --- a/src/gtk/files.lst +++ b/src/gtk/files.lst @@ -144,6 +144,7 @@ ALL_SOURCES = \ common/radiocmn.cpp \ common/regex.cpp \ common/resource.cpp \ + common/rgncmn.cpp \ common/sckaddr.cpp \ common/sckfile.cpp \ common/sckipc.cpp \ @@ -309,7 +310,6 @@ ALL_HEADERS = \ ctrlsub.h \ cursor.h \ dataobj.h \ - date.h \ datetime.h \ datetime.inl \ datstrm.h \ @@ -483,7 +483,6 @@ ALL_HEADERS = \ tglbtn.h \ thread.h \ thrimpl.cpp \ - time.h \ timer.h \ tipdlg.h \ tipwin.h \ @@ -740,6 +739,7 @@ COMMONOBJS = \ radiocmn.o \ regex.o \ resource.o \ + rgncmn.o \ sckaddr.o \ sckfile.o \ sckipc.o \ diff --git a/src/gtk/toplevel.cpp b/src/gtk/toplevel.cpp index b5a88382bf..52c47e327f 100644 --- a/src/gtk/toplevel.cpp +++ b/src/gtk/toplevel.cpp @@ -513,10 +513,10 @@ bool wxTopLevelWindowGTK::ShowFullScreen(bool show, long style ) m_fsIsShowing = show; GdkWindow *window = m_widget->window; - wxX11FullScreenMethod method = + wxX11FullScreenMethod method = wxGetFullScreenMethodX11((WXDisplay*)GDK_DISPLAY(), (WXWindow)GDK_ROOT_WINDOW()); - + if (show) { m_fsSaveFlag = style; @@ -538,7 +538,7 @@ bool wxTopLevelWindowGTK::ShowFullScreen(bool show, long style ) gdk_window_set_decorations(window, (GdkWMDecoration)0); gdk_window_set_functions(window, (GdkWMFunction)0); } - + gdk_window_get_origin (m_widget->window, &root_x, &root_y); gdk_window_get_geometry (m_widget->window, &client_x, &client_y, &width, &height, NULL); @@ -561,12 +561,12 @@ bool wxTopLevelWindowGTK::ShowFullScreen(bool show, long style ) gdk_window_set_decorations(window, (GdkWMDecoration)m_gdkDecor); gdk_window_set_functions(window, (GdkWMFunction)m_gdkFunc); } - + wxSetFullScreenStateX11((WXDisplay*)GDK_DISPLAY(), (WXWindow)GDK_ROOT_WINDOW(), (WXWindow)GDK_WINDOW_XWINDOW(window), show, &m_fsSaveFrame, method); - + SetSize(m_fsSaveFrame.x, m_fsSaveFrame.y, m_fsSaveFrame.width, m_fsSaveFrame.height); } @@ -973,4 +973,43 @@ void wxTopLevelWindowGTK::RemoveGrab() } } + +// helper +static bool do_shape_combine_region(GdkWindow* window, const wxRegion& region) +{ + if (window) + { + if (region.IsEmpty()) + { + gdk_window_shape_combine_mask(window, NULL, 0, 0); + } + else + { +#ifdef __WXGTK20__ + gdk_window_shape_combine_region(window, region.GetRegion(), 0, 0); +#else + wxBitmap bmp = region.ConvertToBitmap(); + bmp.SetMask(new wxMask(bmp, *wxWHITE)); + GdkBitmap* mask = bmp.GetMask()->GetBitmap(); + gdk_window_shape_combine_mask(window, mask, 0, 0); +#endif + return TRUE; + } + } + return FALSE; +} + + +bool wxTopLevelWindowGTK::SetShape(const wxRegion& region) +{ + GdkWindow *window = NULL; + if (m_wxwindow) + { + window = GTK_PIZZA(m_wxwindow)->bin_window; + do_shape_combine_region(window, region); + } + window = m_widget->window; + return do_shape_combine_region(window, region); +} + // vi:sts=4:sw=4:et diff --git a/src/gtk1/files.lst b/src/gtk1/files.lst index 379fb44d50..38db3d4492 100644 --- a/src/gtk1/files.lst +++ b/src/gtk1/files.lst @@ -144,6 +144,7 @@ ALL_SOURCES = \ common/radiocmn.cpp \ common/regex.cpp \ common/resource.cpp \ + common/rgncmn.cpp \ common/sckaddr.cpp \ common/sckfile.cpp \ common/sckipc.cpp \ @@ -309,7 +310,6 @@ ALL_HEADERS = \ ctrlsub.h \ cursor.h \ dataobj.h \ - date.h \ datetime.h \ datetime.inl \ datstrm.h \ @@ -483,7 +483,6 @@ ALL_HEADERS = \ tglbtn.h \ thread.h \ thrimpl.cpp \ - time.h \ timer.h \ tipdlg.h \ tipwin.h \ @@ -740,6 +739,7 @@ COMMONOBJS = \ radiocmn.o \ regex.o \ resource.o \ + rgncmn.o \ sckaddr.o \ sckfile.o \ sckipc.o \ diff --git a/src/gtk1/toplevel.cpp b/src/gtk1/toplevel.cpp index b5a88382bf..52c47e327f 100644 --- a/src/gtk1/toplevel.cpp +++ b/src/gtk1/toplevel.cpp @@ -513,10 +513,10 @@ bool wxTopLevelWindowGTK::ShowFullScreen(bool show, long style ) m_fsIsShowing = show; GdkWindow *window = m_widget->window; - wxX11FullScreenMethod method = + wxX11FullScreenMethod method = wxGetFullScreenMethodX11((WXDisplay*)GDK_DISPLAY(), (WXWindow)GDK_ROOT_WINDOW()); - + if (show) { m_fsSaveFlag = style; @@ -538,7 +538,7 @@ bool wxTopLevelWindowGTK::ShowFullScreen(bool show, long style ) gdk_window_set_decorations(window, (GdkWMDecoration)0); gdk_window_set_functions(window, (GdkWMFunction)0); } - + gdk_window_get_origin (m_widget->window, &root_x, &root_y); gdk_window_get_geometry (m_widget->window, &client_x, &client_y, &width, &height, NULL); @@ -561,12 +561,12 @@ bool wxTopLevelWindowGTK::ShowFullScreen(bool show, long style ) gdk_window_set_decorations(window, (GdkWMDecoration)m_gdkDecor); gdk_window_set_functions(window, (GdkWMFunction)m_gdkFunc); } - + wxSetFullScreenStateX11((WXDisplay*)GDK_DISPLAY(), (WXWindow)GDK_ROOT_WINDOW(), (WXWindow)GDK_WINDOW_XWINDOW(window), show, &m_fsSaveFrame, method); - + SetSize(m_fsSaveFrame.x, m_fsSaveFrame.y, m_fsSaveFrame.width, m_fsSaveFrame.height); } @@ -973,4 +973,43 @@ void wxTopLevelWindowGTK::RemoveGrab() } } + +// helper +static bool do_shape_combine_region(GdkWindow* window, const wxRegion& region) +{ + if (window) + { + if (region.IsEmpty()) + { + gdk_window_shape_combine_mask(window, NULL, 0, 0); + } + else + { +#ifdef __WXGTK20__ + gdk_window_shape_combine_region(window, region.GetRegion(), 0, 0); +#else + wxBitmap bmp = region.ConvertToBitmap(); + bmp.SetMask(new wxMask(bmp, *wxWHITE)); + GdkBitmap* mask = bmp.GetMask()->GetBitmap(); + gdk_window_shape_combine_mask(window, mask, 0, 0); +#endif + return TRUE; + } + } + return FALSE; +} + + +bool wxTopLevelWindowGTK::SetShape(const wxRegion& region) +{ + GdkWindow *window = NULL; + if (m_wxwindow) + { + window = GTK_PIZZA(m_wxwindow)->bin_window; + do_shape_combine_region(window, region); + } + window = m_widget->window; + return do_shape_combine_region(window, region); +} + // vi:sts=4:sw=4:et diff --git a/src/mac/carbon/files.lst b/src/mac/carbon/files.lst index 3342b709d6..49859d525c 100644 --- a/src/mac/carbon/files.lst +++ b/src/mac/carbon/files.lst @@ -141,6 +141,7 @@ ALL_SOURCES = \ common/radiocmn.cpp \ common/regex.cpp \ common/resource.cpp \ + common/rgncmn.cpp \ common/sckaddr.cpp \ common/sckfile.cpp \ common/sckipc.cpp \ @@ -765,6 +766,7 @@ COMMONOBJS = \ radiocmn.o \ regex.o \ resource.o \ + rgncmn.o \ sckaddr.o \ sckfile.o \ sckipc.o \ diff --git a/src/mac/carbon/toplevel.cpp b/src/mac/carbon/toplevel.cpp index 2f4de7a5eb..2da89cd414 100644 --- a/src/mac/carbon/toplevel.cpp +++ b/src/mac/carbon/toplevel.cpp @@ -71,7 +71,7 @@ static long gs_lastWhen = 0; extern long wxMacTranslateKey(unsigned char key, unsigned char code) ; -static const EventTypeSpec eventList[] = +static const EventTypeSpec eventList[] = { { kEventClassTextInput, kEventTextInputUnicodeForKeyEvent } , @@ -100,15 +100,15 @@ static pascal OSStatus TextInputEventHandler( EventHandlerCallRef handler , Even wxWindow* focus = wxWindow::FindFocus() ; char charCode ; - UInt32 keyCode ; + UInt32 keyCode ; UInt32 modifiers ; Point point ; UInt32 when = EventTimeToTicks( GetEventTime( event ) ) ; EventRef rawEvent ; - + GetEventParameter( event , kEventParamTextInputSendKeyboardEvent ,typeEventRef,NULL,sizeof(rawEvent),NULL,&rawEvent ) ; - + GetEventParameter( rawEvent, kEventParamKeyMacCharCodes, typeChar, NULL,sizeof(char), NULL,&charCode ); GetEventParameter( rawEvent, kEventParamKeyCode, typeUInt32, NULL, sizeof(UInt32), NULL, &keyCode ); GetEventParameter( rawEvent, kEventParamKeyModifiers, typeUInt32, NULL, sizeof(UInt32), NULL, &modifiers); @@ -120,7 +120,7 @@ static pascal OSStatus TextInputEventHandler( EventHandlerCallRef handler , Even switch ( GetEventKind( event ) ) { case kEventTextInputUnicodeForKeyEvent : - if ( (focus != NULL) && wxTheApp->MacSendKeyDownEvent( + if ( (focus != NULL) && wxTheApp->MacSendKeyDownEvent( focus , message , modifiers , when , point.h , point.v ) ) { result = noErr ; @@ -137,7 +137,7 @@ static pascal OSStatus KeyboardEventHandler( EventHandlerCallRef handler , Event wxWindow* focus = wxWindow::FindFocus() ; char charCode ; - UInt32 keyCode ; + UInt32 keyCode ; UInt32 modifiers ; Point point ; UInt32 when = EventTimeToTicks( GetEventTime( event ) ) ; @@ -153,14 +153,14 @@ static pascal OSStatus KeyboardEventHandler( EventHandlerCallRef handler , Event { case kEventRawKeyRepeat : case kEventRawKeyDown : - if ( (focus != NULL) && wxTheApp->MacSendKeyDownEvent( + if ( (focus != NULL) && wxTheApp->MacSendKeyDownEvent( focus , message , modifiers , when , point.h , point.v ) ) { result = noErr ; } break ; case kEventRawKeyUp : - if ( (focus != NULL) && wxTheApp->MacSendKeyUpEvent( + if ( (focus != NULL) && wxTheApp->MacSendKeyUpEvent( focus , message , modifiers , when , point.h , point.v ) ) { result = noErr ; @@ -216,7 +216,7 @@ static pascal OSStatus MouseEventHandler( EventHandlerCallRef handler , EventRef UInt32 modifiers = 0; EventMouseButton button = 0 ; UInt32 click = 0 ; - + GetEventParameter( event, kEventParamMouseLocation, typeQDPoint, NULL, sizeof( Point ), NULL, &point ); GetEventParameter( event, kEventParamKeyModifiers, typeUInt32, NULL, @@ -225,10 +225,10 @@ static pascal OSStatus MouseEventHandler( EventHandlerCallRef handler , EventRef sizeof( EventMouseButton ), NULL, &button ); GetEventParameter( event, kEventParamClickCount, typeUInt32, NULL, sizeof( UInt32 ), NULL, &click ); - + if ( button == 0 || GetEventKind( event ) == kEventMouseUp ) modifiers += btnState ; - + WindowRef window ; short windowPart = ::FindWindow(point, &window); @@ -256,9 +256,9 @@ static pascal OSStatus MouseEventHandler( EventHandlerCallRef handler , EventRef break ; } } - + return result ; - + } static pascal OSStatus WindowEventHandler( EventHandlerCallRef handler , EventRef event , void *data ) @@ -269,10 +269,10 @@ static pascal OSStatus WindowEventHandler( EventHandlerCallRef handler , EventRe UInt32 attributes; WindowRef windowRef ; wxTopLevelWindowMac* toplevelWindow = (wxTopLevelWindowMac*) data ; - + GetEventParameter( event, kEventParamDirectObject, typeWindowRef, NULL, sizeof( WindowRef ), NULL, &windowRef ); - + switch( GetEventKind( event ) ) { case kEventWindowUpdate : @@ -301,9 +301,9 @@ static pascal OSStatus WindowEventHandler( EventHandlerCallRef handler , EventRe GetEventParameter( event, kEventParamCurrentBounds, typeQDRectangle, NULL, sizeof( newContentRect ), NULL, &newContentRect ); - - toplevelWindow->SetSize( newContentRect.left , newContentRect.top , - newContentRect.right - newContentRect.left , + + toplevelWindow->SetSize( newContentRect.left , newContentRect.top , + newContentRect.right - newContentRect.left , newContentRect.bottom - newContentRect.top, wxSIZE_USE_EXISTING); result = noErr; @@ -395,13 +395,13 @@ void wxTopLevelWindowMac::Init() class wxMacDeferredWindowDeleter : public wxObject { public : - wxMacDeferredWindowDeleter( WindowRef windowRef ) - { - m_macWindow = windowRef ; + wxMacDeferredWindowDeleter( WindowRef windowRef ) + { + m_macWindow = windowRef ; } - virtual ~wxMacDeferredWindowDeleter() - { - UMADisposeWindow( (WindowRef) m_macWindow ) ; + virtual ~wxMacDeferredWindowDeleter() + { + UMADisposeWindow( (WindowRef) m_macWindow ) ; } protected : WindowRef m_macWindow ; @@ -439,14 +439,14 @@ wxTopLevelWindowMac::~wxTopLevelWindowMac() wxToolTip::NotifyWindowDelete(m_macWindow) ; wxPendingDelete.Append( new wxMacDeferredWindowDeleter( (WindowRef) m_macWindow ) ) ; } - + #if TARGET_CARBON if ( m_macEventHandler ) { ::RemoveEventHandler((EventHandlerRef) m_macEventHandler); m_macEventHandler = NULL ; } -#endif +#endif wxRemoveMacWindowAssociation( this ) ; @@ -468,7 +468,7 @@ void wxTopLevelWindowMac::Maximize(bool maximize) bool wxTopLevelWindowMac::IsMaximized() const { - return false ; + return false ; } void wxTopLevelWindowMac::Iconize(bool iconize) @@ -501,40 +501,40 @@ void wxTopLevelWindowMac::MacCreateRealWindow( const wxString& title, const wxPoint& pos, const wxSize& size, long style, - const wxString& name ) + const wxString& name ) { SetName(name); m_windowStyle = style; m_isShown = FALSE; - + // create frame. - + Rect theBoundsRect; - + m_x = (int)pos.x; m_y = (int)pos.y; if ( m_y < 50 ) m_y = 50 ; if ( m_x < 20 ) m_x = 20 ; - + m_width = size.x; - if (m_width == -1) + if (m_width == -1) m_width = 20; m_height = size.y; - if (m_height == -1) + if (m_height == -1) m_height = 20; - + ::SetRect(&theBoundsRect, m_x, m_y , m_x + m_width, m_y + m_height); - + // translate the window attributes in the appropriate window class and attributes - + WindowClass wclass = 0; WindowAttributes attr = kWindowNoAttributes ; - + if ( HasFlag( wxFRAME_TOOL_WINDOW) ) { - if ( + if ( HasFlag( wxMINIMIZE_BOX ) || HasFlag( wxMAXIMIZE_BOX ) || HasFlag( wxSYSTEM_MENU ) || HasFlag( wxCAPTION ) || HasFlag(wxTINY_CAPTION_HORIZ) || HasFlag(wxTINY_CAPTION_VERT) @@ -557,7 +557,7 @@ void wxTopLevelWindowMac::MacCreateRealWindow( const wxString& title, } else if ( HasFlag( wxCAPTION ) ) { - wclass = kDocumentWindowClass ; + wclass = kDocumentWindowClass ; } else { @@ -575,7 +575,7 @@ void wxTopLevelWindowMac::MacCreateRealWindow( const wxString& title, #endif } } - + if ( HasFlag( wxMINIMIZE_BOX ) || HasFlag( wxMAXIMIZE_BOX ) ) { attr |= kWindowFullZoomAttribute ; @@ -589,20 +589,20 @@ void wxTopLevelWindowMac::MacCreateRealWindow( const wxString& title, { attr |= kWindowCloseBoxAttribute ; } - + ::CreateNewWindow( wclass , attr , &theBoundsRect , (WindowRef*)&m_macWindow ) ; wxAssociateWinWithMacWindow( m_macWindow , this ) ; UMASetWTitle( (WindowRef)m_macWindow , title ) ; ::CreateRootControl( (WindowRef)m_macWindow , (ControlHandle*)&m_macRootControl ) ; #if TARGET_CARBON InstallStandardEventHandler( GetWindowEventTarget(MAC_WXHWND(m_macWindow)) ) ; - InstallWindowEventHandler(MAC_WXHWND(m_macWindow), GetwxMacWindowEventHandlerUPP(), - GetEventTypeCount(eventList), eventList, this, &((EventHandlerRef)m_macEventHandler)); + InstallWindowEventHandler(MAC_WXHWND(m_macWindow), GetwxMacWindowEventHandlerUPP(), + GetEventTypeCount(eventList), eventList, this, &((EventHandlerRef)m_macEventHandler)); #endif m_macFocus = NULL ; } -void wxTopLevelWindowMac::MacGetPortParams(WXPOINTPTR localOrigin, WXRECTPTR clipRect, WXHWND *window , wxWindowMac** rootwin) +void wxTopLevelWindowMac::MacGetPortParams(WXPOINTPTR localOrigin, WXRECTPTR clipRect, WXHWND *window , wxWindowMac** rootwin) { ((Point*)localOrigin)->h = 0; ((Point*)localOrigin)->v = 0; @@ -619,7 +619,7 @@ void wxTopLevelWindowMac::Clear() wxWindow::Clear() ; } -WXWidget wxTopLevelWindowMac::MacGetContainerForEmbedding() +WXWidget wxTopLevelWindowMac::MacGetContainerForEmbedding() { return m_macRootControl ; } @@ -631,7 +631,7 @@ void wxTopLevelWindowMac::MacUpdate( long timestamp) BeginUpdate( (WindowRef)m_macWindow ) ; - RgnHandle updateRgn = NewRgn(); + RgnHandle updateRgn = NewRgn(); RgnHandle diffRgn = NewRgn() ; if ( updateRgn && diffRgn ) { @@ -664,15 +664,15 @@ void wxTopLevelWindowMac::Lower() ::SendBehind( (WindowRef)m_macWindow , NULL ) ; } -void wxTopLevelWindowMac::MacFireMouseEvent( +void wxTopLevelWindowMac::MacFireMouseEvent( wxUint16 kind , wxInt32 x , wxInt32 y ,wxUint32 modifiers , long timestamp ) { wxMouseEvent event(wxEVT_LEFT_DOWN); bool isDown = !(modifiers & btnState) ; // 1 is for up bool controlDown = modifiers & controlKey ; // for simulating right mouse - + event.m_leftDown = isDown && !controlDown; - + event.m_middleDown = FALSE; event.m_rightDown = isDown && controlDown; @@ -703,8 +703,8 @@ void wxTopLevelWindowMac::MacFireMouseEvent( Point localwhere ; localwhere.h = x ; localwhere.v = y ; - - GrafPtr port ; + + GrafPtr port ; ::GetPort( &port ) ; ::SetPort( UMAGetWindowPort( (WindowRef)m_macWindow ) ) ; ::GlobalToLocal( &localwhere ) ; @@ -749,7 +749,7 @@ void wxTopLevelWindowMac::MacFireMouseEvent( event.m_y = y ; event.SetEventObject( wxTheApp->s_captureWindow ) ; wxTheApp->s_captureWindow->GetEventHandler()->ProcessEvent( event ) ; - + if ( kind == mouseUp ) { wxTheApp->s_captureWindow = NULL ; @@ -769,7 +769,7 @@ void wxTopLevelWindowMac::MacFireMouseEvent( void wxTopLevelWindowMac::MacMouseDown( WXEVENTREF ev , short part) { - MacFireMouseEvent( mouseDown , ((EventRecord*)ev)->where.h , ((EventRecord*)ev)->where.v , + MacFireMouseEvent( mouseDown , ((EventRecord*)ev)->where.h , ((EventRecord*)ev)->where.v , ((EventRecord*)ev)->modifiers , ((EventRecord*)ev)->when ) ; } @@ -777,9 +777,9 @@ void wxTopLevelWindowMac::MacMouseUp( WXEVENTREF ev , short part) { switch (part) { - case inContent: + case inContent: { - MacFireMouseEvent( mouseUp , ((EventRecord*)ev)->where.h , ((EventRecord*)ev)->where.v , + MacFireMouseEvent( mouseUp , ((EventRecord*)ev)->where.h , ((EventRecord*)ev)->where.v , ((EventRecord*)ev)->modifiers , ((EventRecord*)ev)->when ) ; } break ; @@ -790,9 +790,9 @@ void wxTopLevelWindowMac::MacMouseMoved( WXEVENTREF ev , short part) { switch (part) { - case inContent: + case inContent: { - MacFireMouseEvent( nullEvent /*moved*/ , ((EventRecord*)ev)->where.h , ((EventRecord*)ev)->where.v , + MacFireMouseEvent( nullEvent /*moved*/ , ((EventRecord*)ev)->where.h , ((EventRecord*)ev)->where.v , ((EventRecord*)ev)->modifiers , ((EventRecord*)ev)->when ) ; } break ; @@ -806,11 +806,11 @@ void wxTopLevelWindowMac::MacActivate( long timestamp , bool inIsActivating ) wxActivateEvent event(wxEVT_ACTIVATE, inIsActivating , m_windowId); event.m_timeStamp = timestamp ; event.SetEventObject(this); - + GetEventHandler()->ProcessEvent(event); - + UMAHighlightAndActivateWindow( (WindowRef)m_macWindow , inIsActivating ) ; - + // Early versions of MacOS X don't refresh backgrounds properly, // so refresh the whole window on activation and deactivation. long osVersion = UMAGetSystemVersion(); @@ -822,7 +822,7 @@ void wxTopLevelWindowMac::MacActivate( long timestamp , bool inIsActivating ) #if !TARGET_CARBON -void wxTopLevelWindowMac::MacKeyDown( WXEVENTREF ev ) +void wxTopLevelWindowMac::MacKeyDown( WXEVENTREF ev ) { } @@ -840,7 +840,7 @@ bool wxTopLevelWindowMac::Show(bool show) return FALSE; if (show) - { + { ::TransitionWindow((WindowRef)m_macWindow,kWindowZoomTransitionEffect,kWindowShowTransitionAction,nil); ::SelectWindow( (WindowRef)m_macWindow ) ; // no need to generate events here, they will get them triggered by macos @@ -860,7 +860,7 @@ bool wxTopLevelWindowMac::Show(bool show) } else { - Refresh() ; + Refresh() ; } return TRUE; @@ -872,24 +872,24 @@ void wxTopLevelWindowMac::DoMoveWindow(int x, int y, int width, int height) int former_y = m_y ; int former_w = m_width ; int former_h = m_height ; - + int actualWidth = width; int actualHeight = height; int actualX = x; int actualY = y; - - if ((m_minWidth != -1) && (actualWidth < m_minWidth)) + + if ((m_minWidth != -1) && (actualWidth < m_minWidth)) actualWidth = m_minWidth; - if ((m_minHeight != -1) && (actualHeight < m_minHeight)) + if ((m_minHeight != -1) && (actualHeight < m_minHeight)) actualHeight = m_minHeight; - if ((m_maxWidth != -1) && (actualWidth > m_maxWidth)) + if ((m_maxWidth != -1) && (actualWidth > m_maxWidth)) actualWidth = m_maxWidth; - if ((m_maxHeight != -1) && (actualHeight > m_maxHeight)) + if ((m_maxHeight != -1) && (actualHeight > m_maxHeight)) actualHeight = m_maxHeight; bool doMove = false ; bool doResize = false ; - + if ( actualX != former_x || actualY != former_y ) { doMove = true ; @@ -908,17 +908,17 @@ void wxTopLevelWindowMac::DoMoveWindow(int x, int y, int width, int height) if ( doMove ) ::MoveWindow((WindowRef)m_macWindow, m_x, m_y , false); // don't make frontmost - + if ( doResize ) - ::SizeWindow((WindowRef)m_macWindow, m_width, m_height , true); - + ::SizeWindow((WindowRef)m_macWindow, m_width, m_height , true); + // the OS takes care of invalidating and erasing the new area so we only have to // take care of refreshing for full repaints if ( doResize && !HasFlag(wxNO_FULL_REPAINT_ON_RESIZE) ) Refresh() ; - - + + if ( IsKindOf( CLASSINFO( wxFrame ) ) ) { wxFrame* frame = (wxFrame*) this ; @@ -945,7 +945,7 @@ void wxTopLevelWindowMac::DoMoveWindow(int x, int y, int width, int height) GetEventHandler()->ProcessEvent(event); } } - + } /* @@ -956,28 +956,28 @@ void wxTopLevelWindowMac::DoMoveWindow(int x, int y, int width, int height) * has been true for any part of the update rgn the background is erased in the entire region * not just in the specified rect. * - * In order to achive this, we also have an internal m_macNoEraseUpdateRgn, all rects that have + * In order to achive this, we also have an internal m_macNoEraseUpdateRgn, all rects that have * the eraseBackground flag set to false are also added to this rgn. upon receiving an update event * the update rgn is compared to the m_macNoEraseUpdateRgn and in case they differ, every window * will get the eraseBackground event first */ - -void wxTopLevelWindowMac::MacInvalidate( const WXRECTPTR rect, bool eraseBackground ) + +void wxTopLevelWindowMac::MacInvalidate( const WXRECTPTR rect, bool eraseBackground ) { GrafPtr formerPort ; GetPort( &formerPort ) ; SetPortWindowPort( (WindowRef)m_macWindow ) ; - + m_macNeedsErasing |= eraseBackground ; - + // if we already know that we will have to erase, there's no need to track the rest if ( !m_macNeedsErasing) { // we end only here if eraseBackground is false // if we already have a difference between m_macNoEraseUpdateRgn and UpdateRgn // we will have to erase anyway - - RgnHandle updateRgn = NewRgn(); + + RgnHandle updateRgn = NewRgn(); RgnHandle diffRgn = NewRgn() ; if ( updateRgn && diffRgn ) { @@ -995,7 +995,7 @@ void wxTopLevelWindowMac::MacInvalidate( const WXRECTPTR rect, bool eraseBackgro DisposeRgn( updateRgn ); if ( diffRgn ) DisposeRgn( diffRgn ); - + if ( !m_macNeedsErasing ) { RgnHandle rectRgn = NewRgn() ; @@ -1012,3 +1012,7 @@ void wxTopLevelWindowMac::MacInvalidate( const WXRECTPTR rect, bool eraseBackgro SetPort( formerPort ) ; } +bool wxTopLevelWindowMac::SetShape(const wxRegion& region) +{ + return FALSE; +} diff --git a/src/mac/files.lst b/src/mac/files.lst index 3342b709d6..49859d525c 100644 --- a/src/mac/files.lst +++ b/src/mac/files.lst @@ -141,6 +141,7 @@ ALL_SOURCES = \ common/radiocmn.cpp \ common/regex.cpp \ common/resource.cpp \ + common/rgncmn.cpp \ common/sckaddr.cpp \ common/sckfile.cpp \ common/sckipc.cpp \ @@ -765,6 +766,7 @@ COMMONOBJS = \ radiocmn.o \ regex.o \ resource.o \ + rgncmn.o \ sckaddr.o \ sckfile.o \ sckipc.o \ diff --git a/src/mac/toplevel.cpp b/src/mac/toplevel.cpp index 2f4de7a5eb..2da89cd414 100644 --- a/src/mac/toplevel.cpp +++ b/src/mac/toplevel.cpp @@ -71,7 +71,7 @@ static long gs_lastWhen = 0; extern long wxMacTranslateKey(unsigned char key, unsigned char code) ; -static const EventTypeSpec eventList[] = +static const EventTypeSpec eventList[] = { { kEventClassTextInput, kEventTextInputUnicodeForKeyEvent } , @@ -100,15 +100,15 @@ static pascal OSStatus TextInputEventHandler( EventHandlerCallRef handler , Even wxWindow* focus = wxWindow::FindFocus() ; char charCode ; - UInt32 keyCode ; + UInt32 keyCode ; UInt32 modifiers ; Point point ; UInt32 when = EventTimeToTicks( GetEventTime( event ) ) ; EventRef rawEvent ; - + GetEventParameter( event , kEventParamTextInputSendKeyboardEvent ,typeEventRef,NULL,sizeof(rawEvent),NULL,&rawEvent ) ; - + GetEventParameter( rawEvent, kEventParamKeyMacCharCodes, typeChar, NULL,sizeof(char), NULL,&charCode ); GetEventParameter( rawEvent, kEventParamKeyCode, typeUInt32, NULL, sizeof(UInt32), NULL, &keyCode ); GetEventParameter( rawEvent, kEventParamKeyModifiers, typeUInt32, NULL, sizeof(UInt32), NULL, &modifiers); @@ -120,7 +120,7 @@ static pascal OSStatus TextInputEventHandler( EventHandlerCallRef handler , Even switch ( GetEventKind( event ) ) { case kEventTextInputUnicodeForKeyEvent : - if ( (focus != NULL) && wxTheApp->MacSendKeyDownEvent( + if ( (focus != NULL) && wxTheApp->MacSendKeyDownEvent( focus , message , modifiers , when , point.h , point.v ) ) { result = noErr ; @@ -137,7 +137,7 @@ static pascal OSStatus KeyboardEventHandler( EventHandlerCallRef handler , Event wxWindow* focus = wxWindow::FindFocus() ; char charCode ; - UInt32 keyCode ; + UInt32 keyCode ; UInt32 modifiers ; Point point ; UInt32 when = EventTimeToTicks( GetEventTime( event ) ) ; @@ -153,14 +153,14 @@ static pascal OSStatus KeyboardEventHandler( EventHandlerCallRef handler , Event { case kEventRawKeyRepeat : case kEventRawKeyDown : - if ( (focus != NULL) && wxTheApp->MacSendKeyDownEvent( + if ( (focus != NULL) && wxTheApp->MacSendKeyDownEvent( focus , message , modifiers , when , point.h , point.v ) ) { result = noErr ; } break ; case kEventRawKeyUp : - if ( (focus != NULL) && wxTheApp->MacSendKeyUpEvent( + if ( (focus != NULL) && wxTheApp->MacSendKeyUpEvent( focus , message , modifiers , when , point.h , point.v ) ) { result = noErr ; @@ -216,7 +216,7 @@ static pascal OSStatus MouseEventHandler( EventHandlerCallRef handler , EventRef UInt32 modifiers = 0; EventMouseButton button = 0 ; UInt32 click = 0 ; - + GetEventParameter( event, kEventParamMouseLocation, typeQDPoint, NULL, sizeof( Point ), NULL, &point ); GetEventParameter( event, kEventParamKeyModifiers, typeUInt32, NULL, @@ -225,10 +225,10 @@ static pascal OSStatus MouseEventHandler( EventHandlerCallRef handler , EventRef sizeof( EventMouseButton ), NULL, &button ); GetEventParameter( event, kEventParamClickCount, typeUInt32, NULL, sizeof( UInt32 ), NULL, &click ); - + if ( button == 0 || GetEventKind( event ) == kEventMouseUp ) modifiers += btnState ; - + WindowRef window ; short windowPart = ::FindWindow(point, &window); @@ -256,9 +256,9 @@ static pascal OSStatus MouseEventHandler( EventHandlerCallRef handler , EventRef break ; } } - + return result ; - + } static pascal OSStatus WindowEventHandler( EventHandlerCallRef handler , EventRef event , void *data ) @@ -269,10 +269,10 @@ static pascal OSStatus WindowEventHandler( EventHandlerCallRef handler , EventRe UInt32 attributes; WindowRef windowRef ; wxTopLevelWindowMac* toplevelWindow = (wxTopLevelWindowMac*) data ; - + GetEventParameter( event, kEventParamDirectObject, typeWindowRef, NULL, sizeof( WindowRef ), NULL, &windowRef ); - + switch( GetEventKind( event ) ) { case kEventWindowUpdate : @@ -301,9 +301,9 @@ static pascal OSStatus WindowEventHandler( EventHandlerCallRef handler , EventRe GetEventParameter( event, kEventParamCurrentBounds, typeQDRectangle, NULL, sizeof( newContentRect ), NULL, &newContentRect ); - - toplevelWindow->SetSize( newContentRect.left , newContentRect.top , - newContentRect.right - newContentRect.left , + + toplevelWindow->SetSize( newContentRect.left , newContentRect.top , + newContentRect.right - newContentRect.left , newContentRect.bottom - newContentRect.top, wxSIZE_USE_EXISTING); result = noErr; @@ -395,13 +395,13 @@ void wxTopLevelWindowMac::Init() class wxMacDeferredWindowDeleter : public wxObject { public : - wxMacDeferredWindowDeleter( WindowRef windowRef ) - { - m_macWindow = windowRef ; + wxMacDeferredWindowDeleter( WindowRef windowRef ) + { + m_macWindow = windowRef ; } - virtual ~wxMacDeferredWindowDeleter() - { - UMADisposeWindow( (WindowRef) m_macWindow ) ; + virtual ~wxMacDeferredWindowDeleter() + { + UMADisposeWindow( (WindowRef) m_macWindow ) ; } protected : WindowRef m_macWindow ; @@ -439,14 +439,14 @@ wxTopLevelWindowMac::~wxTopLevelWindowMac() wxToolTip::NotifyWindowDelete(m_macWindow) ; wxPendingDelete.Append( new wxMacDeferredWindowDeleter( (WindowRef) m_macWindow ) ) ; } - + #if TARGET_CARBON if ( m_macEventHandler ) { ::RemoveEventHandler((EventHandlerRef) m_macEventHandler); m_macEventHandler = NULL ; } -#endif +#endif wxRemoveMacWindowAssociation( this ) ; @@ -468,7 +468,7 @@ void wxTopLevelWindowMac::Maximize(bool maximize) bool wxTopLevelWindowMac::IsMaximized() const { - return false ; + return false ; } void wxTopLevelWindowMac::Iconize(bool iconize) @@ -501,40 +501,40 @@ void wxTopLevelWindowMac::MacCreateRealWindow( const wxString& title, const wxPoint& pos, const wxSize& size, long style, - const wxString& name ) + const wxString& name ) { SetName(name); m_windowStyle = style; m_isShown = FALSE; - + // create frame. - + Rect theBoundsRect; - + m_x = (int)pos.x; m_y = (int)pos.y; if ( m_y < 50 ) m_y = 50 ; if ( m_x < 20 ) m_x = 20 ; - + m_width = size.x; - if (m_width == -1) + if (m_width == -1) m_width = 20; m_height = size.y; - if (m_height == -1) + if (m_height == -1) m_height = 20; - + ::SetRect(&theBoundsRect, m_x, m_y , m_x + m_width, m_y + m_height); - + // translate the window attributes in the appropriate window class and attributes - + WindowClass wclass = 0; WindowAttributes attr = kWindowNoAttributes ; - + if ( HasFlag( wxFRAME_TOOL_WINDOW) ) { - if ( + if ( HasFlag( wxMINIMIZE_BOX ) || HasFlag( wxMAXIMIZE_BOX ) || HasFlag( wxSYSTEM_MENU ) || HasFlag( wxCAPTION ) || HasFlag(wxTINY_CAPTION_HORIZ) || HasFlag(wxTINY_CAPTION_VERT) @@ -557,7 +557,7 @@ void wxTopLevelWindowMac::MacCreateRealWindow( const wxString& title, } else if ( HasFlag( wxCAPTION ) ) { - wclass = kDocumentWindowClass ; + wclass = kDocumentWindowClass ; } else { @@ -575,7 +575,7 @@ void wxTopLevelWindowMac::MacCreateRealWindow( const wxString& title, #endif } } - + if ( HasFlag( wxMINIMIZE_BOX ) || HasFlag( wxMAXIMIZE_BOX ) ) { attr |= kWindowFullZoomAttribute ; @@ -589,20 +589,20 @@ void wxTopLevelWindowMac::MacCreateRealWindow( const wxString& title, { attr |= kWindowCloseBoxAttribute ; } - + ::CreateNewWindow( wclass , attr , &theBoundsRect , (WindowRef*)&m_macWindow ) ; wxAssociateWinWithMacWindow( m_macWindow , this ) ; UMASetWTitle( (WindowRef)m_macWindow , title ) ; ::CreateRootControl( (WindowRef)m_macWindow , (ControlHandle*)&m_macRootControl ) ; #if TARGET_CARBON InstallStandardEventHandler( GetWindowEventTarget(MAC_WXHWND(m_macWindow)) ) ; - InstallWindowEventHandler(MAC_WXHWND(m_macWindow), GetwxMacWindowEventHandlerUPP(), - GetEventTypeCount(eventList), eventList, this, &((EventHandlerRef)m_macEventHandler)); + InstallWindowEventHandler(MAC_WXHWND(m_macWindow), GetwxMacWindowEventHandlerUPP(), + GetEventTypeCount(eventList), eventList, this, &((EventHandlerRef)m_macEventHandler)); #endif m_macFocus = NULL ; } -void wxTopLevelWindowMac::MacGetPortParams(WXPOINTPTR localOrigin, WXRECTPTR clipRect, WXHWND *window , wxWindowMac** rootwin) +void wxTopLevelWindowMac::MacGetPortParams(WXPOINTPTR localOrigin, WXRECTPTR clipRect, WXHWND *window , wxWindowMac** rootwin) { ((Point*)localOrigin)->h = 0; ((Point*)localOrigin)->v = 0; @@ -619,7 +619,7 @@ void wxTopLevelWindowMac::Clear() wxWindow::Clear() ; } -WXWidget wxTopLevelWindowMac::MacGetContainerForEmbedding() +WXWidget wxTopLevelWindowMac::MacGetContainerForEmbedding() { return m_macRootControl ; } @@ -631,7 +631,7 @@ void wxTopLevelWindowMac::MacUpdate( long timestamp) BeginUpdate( (WindowRef)m_macWindow ) ; - RgnHandle updateRgn = NewRgn(); + RgnHandle updateRgn = NewRgn(); RgnHandle diffRgn = NewRgn() ; if ( updateRgn && diffRgn ) { @@ -664,15 +664,15 @@ void wxTopLevelWindowMac::Lower() ::SendBehind( (WindowRef)m_macWindow , NULL ) ; } -void wxTopLevelWindowMac::MacFireMouseEvent( +void wxTopLevelWindowMac::MacFireMouseEvent( wxUint16 kind , wxInt32 x , wxInt32 y ,wxUint32 modifiers , long timestamp ) { wxMouseEvent event(wxEVT_LEFT_DOWN); bool isDown = !(modifiers & btnState) ; // 1 is for up bool controlDown = modifiers & controlKey ; // for simulating right mouse - + event.m_leftDown = isDown && !controlDown; - + event.m_middleDown = FALSE; event.m_rightDown = isDown && controlDown; @@ -703,8 +703,8 @@ void wxTopLevelWindowMac::MacFireMouseEvent( Point localwhere ; localwhere.h = x ; localwhere.v = y ; - - GrafPtr port ; + + GrafPtr port ; ::GetPort( &port ) ; ::SetPort( UMAGetWindowPort( (WindowRef)m_macWindow ) ) ; ::GlobalToLocal( &localwhere ) ; @@ -749,7 +749,7 @@ void wxTopLevelWindowMac::MacFireMouseEvent( event.m_y = y ; event.SetEventObject( wxTheApp->s_captureWindow ) ; wxTheApp->s_captureWindow->GetEventHandler()->ProcessEvent( event ) ; - + if ( kind == mouseUp ) { wxTheApp->s_captureWindow = NULL ; @@ -769,7 +769,7 @@ void wxTopLevelWindowMac::MacFireMouseEvent( void wxTopLevelWindowMac::MacMouseDown( WXEVENTREF ev , short part) { - MacFireMouseEvent( mouseDown , ((EventRecord*)ev)->where.h , ((EventRecord*)ev)->where.v , + MacFireMouseEvent( mouseDown , ((EventRecord*)ev)->where.h , ((EventRecord*)ev)->where.v , ((EventRecord*)ev)->modifiers , ((EventRecord*)ev)->when ) ; } @@ -777,9 +777,9 @@ void wxTopLevelWindowMac::MacMouseUp( WXEVENTREF ev , short part) { switch (part) { - case inContent: + case inContent: { - MacFireMouseEvent( mouseUp , ((EventRecord*)ev)->where.h , ((EventRecord*)ev)->where.v , + MacFireMouseEvent( mouseUp , ((EventRecord*)ev)->where.h , ((EventRecord*)ev)->where.v , ((EventRecord*)ev)->modifiers , ((EventRecord*)ev)->when ) ; } break ; @@ -790,9 +790,9 @@ void wxTopLevelWindowMac::MacMouseMoved( WXEVENTREF ev , short part) { switch (part) { - case inContent: + case inContent: { - MacFireMouseEvent( nullEvent /*moved*/ , ((EventRecord*)ev)->where.h , ((EventRecord*)ev)->where.v , + MacFireMouseEvent( nullEvent /*moved*/ , ((EventRecord*)ev)->where.h , ((EventRecord*)ev)->where.v , ((EventRecord*)ev)->modifiers , ((EventRecord*)ev)->when ) ; } break ; @@ -806,11 +806,11 @@ void wxTopLevelWindowMac::MacActivate( long timestamp , bool inIsActivating ) wxActivateEvent event(wxEVT_ACTIVATE, inIsActivating , m_windowId); event.m_timeStamp = timestamp ; event.SetEventObject(this); - + GetEventHandler()->ProcessEvent(event); - + UMAHighlightAndActivateWindow( (WindowRef)m_macWindow , inIsActivating ) ; - + // Early versions of MacOS X don't refresh backgrounds properly, // so refresh the whole window on activation and deactivation. long osVersion = UMAGetSystemVersion(); @@ -822,7 +822,7 @@ void wxTopLevelWindowMac::MacActivate( long timestamp , bool inIsActivating ) #if !TARGET_CARBON -void wxTopLevelWindowMac::MacKeyDown( WXEVENTREF ev ) +void wxTopLevelWindowMac::MacKeyDown( WXEVENTREF ev ) { } @@ -840,7 +840,7 @@ bool wxTopLevelWindowMac::Show(bool show) return FALSE; if (show) - { + { ::TransitionWindow((WindowRef)m_macWindow,kWindowZoomTransitionEffect,kWindowShowTransitionAction,nil); ::SelectWindow( (WindowRef)m_macWindow ) ; // no need to generate events here, they will get them triggered by macos @@ -860,7 +860,7 @@ bool wxTopLevelWindowMac::Show(bool show) } else { - Refresh() ; + Refresh() ; } return TRUE; @@ -872,24 +872,24 @@ void wxTopLevelWindowMac::DoMoveWindow(int x, int y, int width, int height) int former_y = m_y ; int former_w = m_width ; int former_h = m_height ; - + int actualWidth = width; int actualHeight = height; int actualX = x; int actualY = y; - - if ((m_minWidth != -1) && (actualWidth < m_minWidth)) + + if ((m_minWidth != -1) && (actualWidth < m_minWidth)) actualWidth = m_minWidth; - if ((m_minHeight != -1) && (actualHeight < m_minHeight)) + if ((m_minHeight != -1) && (actualHeight < m_minHeight)) actualHeight = m_minHeight; - if ((m_maxWidth != -1) && (actualWidth > m_maxWidth)) + if ((m_maxWidth != -1) && (actualWidth > m_maxWidth)) actualWidth = m_maxWidth; - if ((m_maxHeight != -1) && (actualHeight > m_maxHeight)) + if ((m_maxHeight != -1) && (actualHeight > m_maxHeight)) actualHeight = m_maxHeight; bool doMove = false ; bool doResize = false ; - + if ( actualX != former_x || actualY != former_y ) { doMove = true ; @@ -908,17 +908,17 @@ void wxTopLevelWindowMac::DoMoveWindow(int x, int y, int width, int height) if ( doMove ) ::MoveWindow((WindowRef)m_macWindow, m_x, m_y , false); // don't make frontmost - + if ( doResize ) - ::SizeWindow((WindowRef)m_macWindow, m_width, m_height , true); - + ::SizeWindow((WindowRef)m_macWindow, m_width, m_height , true); + // the OS takes care of invalidating and erasing the new area so we only have to // take care of refreshing for full repaints if ( doResize && !HasFlag(wxNO_FULL_REPAINT_ON_RESIZE) ) Refresh() ; - - + + if ( IsKindOf( CLASSINFO( wxFrame ) ) ) { wxFrame* frame = (wxFrame*) this ; @@ -945,7 +945,7 @@ void wxTopLevelWindowMac::DoMoveWindow(int x, int y, int width, int height) GetEventHandler()->ProcessEvent(event); } } - + } /* @@ -956,28 +956,28 @@ void wxTopLevelWindowMac::DoMoveWindow(int x, int y, int width, int height) * has been true for any part of the update rgn the background is erased in the entire region * not just in the specified rect. * - * In order to achive this, we also have an internal m_macNoEraseUpdateRgn, all rects that have + * In order to achive this, we also have an internal m_macNoEraseUpdateRgn, all rects that have * the eraseBackground flag set to false are also added to this rgn. upon receiving an update event * the update rgn is compared to the m_macNoEraseUpdateRgn and in case they differ, every window * will get the eraseBackground event first */ - -void wxTopLevelWindowMac::MacInvalidate( const WXRECTPTR rect, bool eraseBackground ) + +void wxTopLevelWindowMac::MacInvalidate( const WXRECTPTR rect, bool eraseBackground ) { GrafPtr formerPort ; GetPort( &formerPort ) ; SetPortWindowPort( (WindowRef)m_macWindow ) ; - + m_macNeedsErasing |= eraseBackground ; - + // if we already know that we will have to erase, there's no need to track the rest if ( !m_macNeedsErasing) { // we end only here if eraseBackground is false // if we already have a difference between m_macNoEraseUpdateRgn and UpdateRgn // we will have to erase anyway - - RgnHandle updateRgn = NewRgn(); + + RgnHandle updateRgn = NewRgn(); RgnHandle diffRgn = NewRgn() ; if ( updateRgn && diffRgn ) { @@ -995,7 +995,7 @@ void wxTopLevelWindowMac::MacInvalidate( const WXRECTPTR rect, bool eraseBackgro DisposeRgn( updateRgn ); if ( diffRgn ) DisposeRgn( diffRgn ); - + if ( !m_macNeedsErasing ) { RgnHandle rectRgn = NewRgn() ; @@ -1012,3 +1012,7 @@ void wxTopLevelWindowMac::MacInvalidate( const WXRECTPTR rect, bool eraseBackgro SetPort( formerPort ) ; } +bool wxTopLevelWindowMac::SetShape(const wxRegion& region) +{ + return FALSE; +} diff --git a/src/mgl/files.lst b/src/mgl/files.lst index 9bdce6a5a9..0c0082ac01 100644 --- a/src/mgl/files.lst +++ b/src/mgl/files.lst @@ -48,6 +48,7 @@ ALL_SOURCES = \ generic/treectlg.cpp \ generic/treelay.cpp \ generic/wizard.cpp \ + common/accesscmn.cpp \ common/appcmn.cpp \ common/artprov.cpp \ common/artstd.cpp \ @@ -75,6 +76,7 @@ ALL_SOURCES = \ common/dobjcmn.cpp \ common/docmdi.cpp \ common/docview.cpp \ + common/dpycmn.cpp \ common/dseldlg.cpp \ common/dynarray.cpp \ common/dynlib.cpp \ @@ -134,7 +136,6 @@ ALL_SOURCES = \ common/mstream.cpp \ common/nbkbase.cpp \ common/object.cpp \ - common/odbc.cpp \ common/paper.cpp \ common/popupcmn.cpp \ common/prntbase.cpp \ @@ -144,6 +145,7 @@ ALL_SOURCES = \ common/radiocmn.cpp \ common/regex.cpp \ common/resource.cpp \ + common/rgncmn.cpp \ common/sckaddr.cpp \ common/sckfile.cpp \ common/sckipc.cpp \ @@ -234,6 +236,7 @@ ALL_SOURCES = \ ALL_HEADERS = \ accel.h \ + access.h \ app.h \ arrimpl.cpp \ artprov.h \ @@ -267,7 +270,6 @@ ALL_HEADERS = \ ctrlsub.h \ cursor.h \ dataobj.h \ - date.h \ datetime.h \ datetime.inl \ datstrm.h \ @@ -290,6 +292,7 @@ ALL_HEADERS = \ dir.h \ dirctrl.h \ dirdlg.h \ + display.h \ dnd.h \ docmdi.h \ docview.h \ @@ -364,6 +367,7 @@ ALL_HEADERS = \ listimpl.cpp \ log.h \ longlong.h \ + math.h \ matrix.h \ mdi.h \ memconf.h \ @@ -380,7 +384,6 @@ ALL_HEADERS = \ mstream.h \ notebook.h \ object.h \ - odbc.h \ ownerdrw.h \ palette.h \ panel.h \ @@ -399,6 +402,7 @@ ALL_HEADERS = \ quantize.h \ radiobox.h \ radiobut.h \ + rawbmp.h \ regex.h \ region.h \ resource.h \ @@ -439,7 +443,6 @@ ALL_HEADERS = \ tglbtn.h \ thread.h \ thrimpl.cpp \ - time.h \ timer.h \ tipdlg.h \ tipwin.h \ @@ -560,6 +563,7 @@ ALL_HEADERS = \ protocol/protocol.h COMMONOBJS = \ + accesscmn.o \ appcmn.o \ artprov.o \ artstd.o \ @@ -587,6 +591,7 @@ COMMONOBJS = \ dobjcmn.o \ docmdi.o \ docview.o \ + dpycmn.o \ dseldlg.o \ dynarray.o \ dynlib.o \ @@ -646,7 +651,6 @@ COMMONOBJS = \ mstream.o \ nbkbase.o \ object.o \ - odbc.o \ paper.o \ popupcmn.o \ prntbase.o \ @@ -656,6 +660,7 @@ COMMONOBJS = \ radiocmn.o \ regex.o \ resource.o \ + rgncmn.o \ sckaddr.o \ sckfile.o \ sckipc.o \ diff --git a/src/mgl/makefile.wat b/src/mgl/makefile.wat index cbac28a96f..5e43912c09 100644 --- a/src/mgl/makefile.wat +++ b/src/mgl/makefile.wat @@ -90,6 +90,7 @@ GENERICOBJS= accel.obj & COMMONOBJS = & y_tab.obj & + accesscmn.obj & appcmn.obj & artprov.obj & artstd.obj & @@ -117,6 +118,7 @@ COMMONOBJS = & dobjcmn.obj & docmdi.obj & docview.obj & + dpycmn.obj & dseldlg.obj & dynarray.obj & dynlib.obj & @@ -176,7 +178,6 @@ COMMONOBJS = & mstream.obj & nbkbase.obj & object.obj & - odbc.obj & paper.obj & popupcmn.obj & prntbase.obj & @@ -186,6 +187,7 @@ COMMONOBJS = & radiocmn.obj & regex.obj & resource.obj & + rgncmn.obj & sckaddr.obj & sckfile.obj & sckipc.obj & @@ -534,6 +536,9 @@ win32.obj: $(UNIVTHEMEDIR)\win32.cpp ######################################################## # Common objects (always compiled) +accesscmn.obj: $(COMMDIR)\accesscmn.cpp + *$(CCC) $(CPPFLAGS) $(IFLAGS) $< + appcmn.obj: $(COMMDIR)\appcmn.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< @@ -615,6 +620,9 @@ docmdi.obj: $(COMMDIR)\docmdi.cpp docview.obj: $(COMMDIR)\docview.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +dpycmn.obj: $(COMMDIR)\dpycmn.cpp + *$(CCC) $(CPPFLAGS) $(IFLAGS) $< + dseldlg.obj: $(COMMDIR)\dseldlg.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< @@ -792,9 +800,6 @@ nbkbase.obj: $(COMMDIR)\nbkbase.cpp object.obj: $(COMMDIR)\object.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< -odbc.obj: $(COMMDIR)\odbc.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< - paper.obj: $(COMMDIR)\paper.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< @@ -822,6 +827,9 @@ regex.obj: $(COMMDIR)\regex.cpp resource.obj: $(COMMDIR)\resource.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +rgncmn.obj: $(COMMDIR)\rgncmn.cpp + *$(CCC) $(CPPFLAGS) $(IFLAGS) $< + sckaddr.obj: $(COMMDIR)\sckaddr.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< diff --git a/src/microwin/files.lst b/src/microwin/files.lst index 6090216c72..5b79b08917 100644 --- a/src/microwin/files.lst +++ b/src/microwin/files.lst @@ -46,6 +46,7 @@ ALL_SOURCES = \ generic/treectlg.cpp \ generic/treelay.cpp \ generic/wizard.cpp \ + common/accesscmn.cpp \ common/appcmn.cpp \ common/artprov.cpp \ common/artstd.cpp \ @@ -72,6 +73,7 @@ ALL_SOURCES = \ common/dobjcmn.cpp \ common/docmdi.cpp \ common/docview.cpp \ + common/dpycmn.cpp \ common/dseldlg.cpp \ common/dynarray.cpp \ common/dynlib.cpp \ @@ -131,7 +133,6 @@ ALL_SOURCES = \ common/mstream.cpp \ common/nbkbase.cpp \ common/object.cpp \ - common/odbc.cpp \ common/paper.cpp \ common/popupcmn.cpp \ common/prntbase.cpp \ @@ -141,6 +142,7 @@ ALL_SOURCES = \ common/radiocmn.cpp \ common/regex.cpp \ common/resource.cpp \ + common/rgncmn.cpp \ common/sckaddr.cpp \ common/sckfile.cpp \ common/sckipc.cpp \ @@ -234,6 +236,7 @@ ALL_SOURCES = \ ALL_HEADERS = \ accel.h \ + access.h \ app.h \ arrimpl.cpp \ artprov.h \ @@ -267,7 +270,6 @@ ALL_HEADERS = \ ctrlsub.h \ cursor.h \ dataobj.h \ - date.h \ datetime.h \ datetime.inl \ datstrm.h \ @@ -290,6 +292,7 @@ ALL_HEADERS = \ dir.h \ dirctrl.h \ dirdlg.h \ + display.h \ dnd.h \ docmdi.h \ docview.h \ @@ -364,6 +367,7 @@ ALL_HEADERS = \ listimpl.cpp \ log.h \ longlong.h \ + math.h \ matrix.h \ mdi.h \ memconf.h \ @@ -380,7 +384,6 @@ ALL_HEADERS = \ mstream.h \ notebook.h \ object.h \ - odbc.h \ ownerdrw.h \ palette.h \ panel.h \ @@ -399,6 +402,7 @@ ALL_HEADERS = \ quantize.h \ radiobox.h \ radiobut.h \ + rawbmp.h \ regex.h \ region.h \ resource.h \ @@ -439,7 +443,6 @@ ALL_HEADERS = \ tglbtn.h \ thread.h \ thrimpl.cpp \ - time.h \ timer.h \ tipdlg.h \ tipwin.h \ @@ -476,6 +479,7 @@ ALL_HEADERS = \ zipstrm.h \ zstream.h \ msw/accel.h \ + msw/access.h \ msw/app.h \ msw/bitmap.h \ msw/bmpbuttn.h \ @@ -490,8 +494,6 @@ ALL_HEADERS = \ msw/colour.h \ msw/combobox.h \ msw/control.h \ - msw/curico.h \ - msw/curicop.h \ msw/cursor.h \ msw/dc.h \ msw/dcclient.h \ @@ -501,7 +503,6 @@ ALL_HEADERS = \ msw/dde.h \ msw/dialog.h \ msw/dib.h \ - msw/dibutils.h \ msw/dirdlg.h \ msw/dragimag.h \ msw/enhmeta.h \ @@ -511,7 +512,6 @@ ALL_HEADERS = \ msw/fontdlg.h \ msw/frame.h \ msw/gauge95.h \ - msw/gaugemsw.h \ msw/gccpriv.h \ msw/gdiimage.h \ msw/gdiobj.h \ @@ -635,6 +635,7 @@ ALL_HEADERS = \ COMMONOBJS = \ parser.o \ + accesscmn.o \ appcmn.o \ artprov.o \ artstd.o \ @@ -661,6 +662,7 @@ COMMONOBJS = \ dobjcmn.o \ docmdi.o \ docview.o \ + dpycmn.o \ dseldlg.o \ dynarray.o \ dynlib.o \ @@ -720,7 +722,6 @@ COMMONOBJS = \ mstream.o \ nbkbase.o \ object.o \ - odbc.o \ paper.o \ popupcmn.o \ prntbase.o \ @@ -730,6 +731,7 @@ COMMONOBJS = \ radiocmn.o \ regex.o \ resource.o \ + rgncmn.o \ sckaddr.o \ sckfile.o \ sckipc.o \ diff --git a/src/motif/files.lst b/src/motif/files.lst index 9610dcb1c4..e4c12e3074 100644 --- a/src/motif/files.lst +++ b/src/motif/files.lst @@ -145,6 +145,7 @@ ALL_SOURCES = \ common/radiocmn.cpp \ common/regex.cpp \ common/resource.cpp \ + common/rgncmn.cpp \ common/sckaddr.cpp \ common/sckfile.cpp \ common/sckipc.cpp \ @@ -737,6 +738,7 @@ COMMONOBJS = \ radiocmn.o \ regex.o \ resource.o \ + rgncmn.o \ sckaddr.o \ sckfile.o \ sckipc.o \ diff --git a/src/msw/files.lst b/src/msw/files.lst index 738077c71f..0ebd667270 100644 --- a/src/msw/files.lst +++ b/src/msw/files.lst @@ -128,6 +128,7 @@ ALL_SOURCES = \ common/radiocmn.cpp \ common/regex.cpp \ common/resource.cpp \ + common/rgncmn.cpp \ common/sckaddr.cpp \ common/sckfile.cpp \ common/sckipc.cpp \ @@ -330,7 +331,6 @@ ALL_HEADERS = \ ctrlsub.h \ cursor.h \ dataobj.h \ - date.h \ datetime.h \ datetime.inl \ datstrm.h \ @@ -504,7 +504,6 @@ ALL_HEADERS = \ tglbtn.h \ thread.h \ thrimpl.cpp \ - time.h \ timer.h \ tipdlg.h \ tipwin.h \ @@ -801,6 +800,7 @@ COMMONOBJS = \ radiocmn.o \ regex.o \ resource.o \ + rgncmn.o \ sckaddr.o \ sckfile.o \ sckipc.o \ diff --git a/src/msw/toplevel.cpp b/src/msw/toplevel.cpp index 82ed98594b..7d0164a3c0 100644 --- a/src/msw/toplevel.cpp +++ b/src/msw/toplevel.cpp @@ -758,6 +758,47 @@ bool wxTopLevelWindowMSW::EnableCloseButton(bool enable) return TRUE; } +bool wxTopLevelWindowMSW::SetShape(const wxRegion& region) +{ + // The empty region signifies that the shape should be removed from the + // window. + if ( region.IsEmpty() ) + { + if (::SetWindowRgn(GetHwnd(), NULL, TRUE) == 0) + { + wxLogLastError(_T("SetWindowRgn")); + return FALSE; + } + return TRUE; + } + + // Windows takes ownership of the region, so + // we'll have to make a copy of the region to give to it. + DWORD noBytes = ::GetRegionData(GetHrgnOf(region), 0, NULL); + RGNDATA *rgnData = (RGNDATA*) new char[noBytes]; + ::GetRegionData(GetHrgnOf(region), noBytes, rgnData); + HRGN hrgn = ::ExtCreateRegion(NULL, noBytes, rgnData); + delete[] (char*) rgnData; + + // SetWindowRgn expects the region to be in coordinants + // relative to the window, not the client area. Figure + // out the offset, if any. + RECT rect; + DWORD dwStyle = ::GetWindowLong(GetHwnd(), GWL_STYLE); + DWORD dwExStyle = ::GetWindowLong(GetHwnd(), GWL_EXSTYLE); + ::GetClientRect(GetHwnd(), &rect); + ::AdjustWindowRectEx(&rect, dwStyle, FALSE, dwExStyle); + ::OffsetRgn(hrgn, -rect.left, -rect.top); + + // Now call the shape API with the new region. + if (::SetWindowRgn(GetHwnd(), hrgn, TRUE) == 0) + { + wxLogLastError(_T("SetWindowRgn")); + return FALSE; + } + return TRUE; +} + // ---------------------------------------------------------------------------- // wxTopLevelWindow event handling // ---------------------------------------------------------------------------- @@ -912,3 +953,4 @@ HWND wxTLWHiddenParentModule::GetHWND() return ms_hwnd; } + diff --git a/src/x11/files.lst b/src/x11/files.lst index db3e874657..e92e63c1f3 100644 --- a/src/x11/files.lst +++ b/src/x11/files.lst @@ -176,6 +176,7 @@ ALL_SOURCES = \ common/radiocmn.cpp \ common/regex.cpp \ common/resource.cpp \ + common/rgncmn.cpp \ common/sckaddr.cpp \ common/sckfile.cpp \ common/sckipc.cpp \ @@ -278,7 +279,6 @@ ALL_HEADERS = \ ctrlsub.h \ cursor.h \ dataobj.h \ - date.h \ datetime.h \ datetime.inl \ datstrm.h \ @@ -452,7 +452,6 @@ ALL_HEADERS = \ tglbtn.h \ thread.h \ thrimpl.cpp \ - time.h \ timer.h \ tipdlg.h \ tipwin.h \ @@ -750,6 +749,7 @@ COMMONOBJS = \ radiocmn.o \ regex.o \ resource.o \ + rgncmn.o \ sckaddr.o \ sckfile.o \ sckipc.o \ diff --git a/wxPython/src/_extras.py b/wxPython/src/_extras.py index be34766f07..99f9f70dab 100644 --- a/wxPython/src/_extras.py +++ b/wxPython/src/_extras.py @@ -730,7 +730,7 @@ def wxCallAfter(callable, *args, **kw): global _wxCallAfterId if _wxCallAfterId is None: - _wxCallAfterId = wxNewId() + _wxCallAfterId = wxNewEventType() app.Connect(-1, -1, _wxCallAfterId, lambda event: apply(event.callable, event.args, event.kw) ) evt = wxPyEvent() diff --git a/wxPython/src/frames.i b/wxPython/src/frames.i index 619ae6ebe2..618b661f82 100644 --- a/wxPython/src/frames.i +++ b/wxPython/src/frames.i @@ -116,6 +116,12 @@ public: virtual void SetTitle(const wxString& title); virtual wxString GetTitle() const; + + // Set the shape of the window to the given region. + // Returns TRUE if the platform supports this feature (and the operation + // is successful.) + virtual bool SetShape(const wxRegion& region); + }; //---------------------------------------------------------------------- diff --git a/wxPython/src/gdi.i b/wxPython/src/gdi.i index 91810b0290..8b6768eb57 100644 --- a/wxPython/src/gdi.i +++ b/wxPython/src/gdi.i @@ -1047,8 +1047,12 @@ public: #ifndef __WXMAC__ %name(wxRegionFromPoints)wxRegion(int PCOUNT, wxPoint* points, int fillStyle = wxWINDING_RULE); #endif + %name(wxRegionFromBitmap)wxRegion(const wxBitmap& bmp, + const wxColour& transColour = wxNullColour, + int tolerance = 0); ~wxRegion(); + void Clear(); #ifndef __WXMAC__ bool Offset(wxCoord x, wxCoord y); @@ -1078,6 +1082,18 @@ public: bool Xor(wxCoord x, wxCoord y, wxCoord width, wxCoord height); %name(XorRect)bool Xor(const wxRect& rect); %name(XorRegion)bool Xor(const wxRegion& region); + + // Convert the region to a B&W bitmap with the black pixels being inside + // the region. + wxBitmap ConvertToBitmap(); + + // Use the non-transparent pixels of a wxBitmap for the region to combine + // with this region. If the bitmap has a mask then it will be used, + // otherwise the colour to be treated as transparent may be specified, + // along with an optional tolerance value. + %name(UnionBitmap)bool Union(const wxBitmap& bmp, + const wxColour& transColour = wxNullColour, + int tolerance = 0); }; @@ -1107,6 +1123,7 @@ public: //--------------------------------------------------------------------------- + %readonly %{ #if 0