diff --git a/configure b/configure index 0211941fc7..b9ab99eb21 100755 --- a/configure +++ b/configure @@ -56,6 +56,8 @@ ac_default_prefix=/usr/local # Any additions from configure.in: ac_help="$ac_help --enable-gui use GUI classes" +ac_help="$ac_help +--enable-universal use wxWindows GUI controls instead of native ones" ac_help="$ac_help --with-gtk use GTK+" ac_help="$ac_help @@ -123,11 +125,17 @@ ac_help="$ac_help ac_help="$ac_help --enable-ipc use interprocess communication (wxSocket etc.)" ac_help="$ac_help +--enable-cmdline use wxCmdLineParser class" +ac_help="$ac_help +--enable-datetime use wxDateTime class" +ac_help="$ac_help +--enable-stopwatch use wxStopWatch class" +ac_help="$ac_help --enable-dialupman use dialup network classes" ac_help="$ac_help --enable-apple_ieee use the Apple IEEE codec" ac_help="$ac_help ---enable-timedate use date/time classes" +--enable-timer use wxTimer class" ac_help="$ac_help --enable-wave use wxWave class" ac_help="$ac_help @@ -145,6 +153,8 @@ ac_help="$ac_help ac_help="$ac_help --enable-textfile use wxTextFile classes" ac_help="$ac_help +--enable-fontmap use font encodings conversion classes" +ac_help="$ac_help --enable-unicode compile wxString with Unicode support" ac_help="$ac_help --enable-wcsrtombs use wcsrtombs instead of buggy (GNU libc1/Linux libc5) wcstombs" @@ -177,6 +187,10 @@ ac_help="$ac_help ac_help="$ac_help --enable-mdi use multiple document interface architecture" ac_help="$ac_help +--enable-loggui use standard GUI logger" +ac_help="$ac_help +--enable-logwin use wxLogWindow" +ac_help="$ac_help --enable-postscript use wxPostscriptDC device context (default for gtk+)" ac_help="$ac_help --enable-prologio use Prolog IO library" @@ -195,10 +209,12 @@ ac_help="$ac_help ac_help="$ac_help --enable-accel use accelerators" ac_help="$ac_help ---enable-caret use wxCaret class" +--enable-button use wxButton class" ac_help="$ac_help --enable-bmpbutton use wxBitmapButton class" ac_help="$ac_help +--enable-caret use wxCaret class" +ac_help="$ac_help --enable-checkbox use wxCheckBox class" ac_help="$ac_help --enable-checklst use wxCheckListBox (listbox with checkboxes) class" @@ -247,6 +263,8 @@ ac_help="$ac_help ac_help="$ac_help --enable-tabdialog use wxTabControl class" ac_help="$ac_help +--enable-textctrl use wxTextCtrl class" +ac_help="$ac_help --enable-toolbar use wxToolBar class" ac_help="$ac_help --enable-tbarnative use native wxToolBar class" @@ -257,8 +275,20 @@ ac_help="$ac_help ac_help="$ac_help --enable-commondlg use common dialogs (wxDirDialog, wxProgressDialog, wxTextDialog, ...)" ac_help="$ac_help +--enable-choicedlg use wxChoiceDialog" +ac_help="$ac_help +--enable-coldlg use wxColourDialog" +ac_help="$ac_help +--enable-filedlg use wxFileDialog" +ac_help="$ac_help +--enable-fontdlg use wxFontDialog" +ac_help="$ac_help --enable-dirdlg use wxDirDialog" ac_help="$ac_help +--enable-msgdlg use wxMessageDialog" +ac_help="$ac_help +--enable-numberdlg use wxNumberEntryDialog" +ac_help="$ac_help --enable-textdlg use wxTextDialog" ac_help="$ac_help --enable-tipdlg use startup tips" @@ -852,7 +882,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:856: checking host system type" >&5 +echo "configure:886: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -873,7 +903,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:877: checking target system type" >&5 +echo "configure:907: checking target system type" >&5 target_alias=$target case "$target_alias" in @@ -891,7 +921,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:895: checking build system type" >&5 +echo "configure:925: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -916,7 +946,7 @@ test "$host_alias" != "$target_alias" && WX_MAJOR_VERSION_NUMBER=2 -WX_MINOR_VERSION_NUMBER=2 +WX_MINOR_VERSION_NUMBER=3 WX_RELEASE_NUMBER=0 WX_INTERFACE_AGE=0 @@ -1203,7 +1233,7 @@ fi if test "$USE_LINUX" = 1; then echo $ac_n "checking for gettext in -lc""... $ac_c" 1>&6 -echo "configure:1207: checking for gettext in -lc" >&5 +echo "configure:1237: checking for gettext in -lc" >&5 ac_lib_var=`echo c'_'gettext | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1211,7 +1241,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1256: \"$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 @@ -1257,13 +1287,14 @@ fi touch ${wx_arg_cache_file} -DEBUG_CONFIGURE=0 +DEBUG_CONFIGURE=1 if test $DEBUG_CONFIGURE = 1; then - DEFAULT_wxUSE_THREADS=yes + DEFAULT_wxUSE_UNIVERSAL=no + DEFAULT_wxUSE_THREADS=no DEFAULT_wxUSE_SHARED=yes DEFAULT_wxUSE_BURNT_NAME=no - DEFAULT_wxUSE_OPTIMISE=yes + DEFAULT_wxUSE_OPTIMISE=no DEFAULT_wxUSE_PROFILE=no DEFAULT_wxUSE_NO_DEPS=no DEFAULT_wxUSE_NO_RTTI=no @@ -1278,8 +1309,11 @@ if test $DEBUG_CONFIGURE = 1; then DEFAULT_wxUSE_APPLE_IEEE=no DEFAULT_wxUSE_LOG=yes + DEFAULT_wxUSE_LOGWINDOW=no + DEFAULT_wxUSE_LOGGUI=no DEFAULT_wxUSE_GUI=yes + DEFAULT_wxUSE_CONTROLS=no DEFAULT_wxUSE_ZLIB=no DEFAULT_wxUSE_LIBPNG=no @@ -1290,12 +1324,16 @@ if test $DEBUG_CONFIGURE = 1; then DEFAULT_wxUSE_ON_FATAL_EXCEPTION=no DEFAULT_wxUSE_STD_IOSTREAM=no + DEFAULT_wxUSE_CMDLINE_PARSER=no + DEFAULT_wxUSE_DATETIME=no + DEFAULT_wxUSE_STOPWATCH=no DEFAULT_wxUSE_FILE=no DEFAULT_wxUSE_TEXTFILE=no DEFAULT_wxUSE_TIMEDATE=no DEFAULT_wxUSE_WAVE=no DEFAULT_wxUSE_INTL=no DEFAULT_wxUSE_CONFIG=no + DEFAULT_wxUSE_FONTMAP=no DEFAULT_wxUSE_STREAMS=no DEFAULT_wxUSE_SOCKETS=no DEFAULT_wxUSE_DIALUP_MANAGER=no @@ -1327,7 +1365,13 @@ if test $DEBUG_CONFIGURE = 1; then DEFAULT_wxUSE_METAFILE=no DEFAULT_wxUSE_COMMONDLGS=no + DEFAULT_wxUSE_CHOICEDLG=no + DEFAULT_wxUSE_COLOURDLG=no DEFAULT_wxUSE_DIRDLG=no + DEFAULT_wxUSE_FILEDLG=no + DEFAULT_wxUSE_FONTDLG=no + DEFAULT_wxUSE_MSGDLG=no + DEFAULT_wxUSE_NUMBERDLG=no DEFAULT_wxUSE_TEXTDLG=no DEFAULT_wxUSE_STARTUP_TIPS=no DEFAULT_wxUSE_PROGRESSDLG=no @@ -1338,14 +1382,15 @@ if test $DEBUG_CONFIGURE = 1; then DEFAULT_wxUSE_FS_ZIP=no DEFAULT_wxUSE_BUSYINFO=no DEFAULT_wxUSE_ZIPSTREAM=no - DEFAULT_wxUSE_VALIDATORS=yes + DEFAULT_wxUSE_VALIDATORS=no DEFAULT_wxUSE_ACCEL=no + DEFAULT_wxUSE_BUTTON=no DEFAULT_wxUSE_CARET=no DEFAULT_wxUSE_BMPBUTTON=no DEFAULT_wxUSE_CHECKBOX=no DEFAULT_wxUSE_CHECKLST=no - DEFAULT_wxUSE_CHOICE=yes + DEFAULT_wxUSE_CHOICE=no DEFAULT_wxUSE_COMBOBOX=no DEFAULT_wxUSE_GAUGE=no DEFAULT_wxUSE_GRID=no @@ -1366,8 +1411,9 @@ if test $DEBUG_CONFIGURE = 1; then DEFAULT_wxUSE_STATBMP=no DEFAULT_wxUSE_STATBOX=no DEFAULT_wxUSE_STATLINE=no - DEFAULT_wxUSE_STATUSBAR=yes + DEFAULT_wxUSE_STATUSBAR=no DEFAULT_wxUSE_TABDIALOG=no + DEFAULT_wxUSE_TEXTCTRL=no DEFAULT_wxUSE_TOOLBAR=no DEFAULT_wxUSE_TOOLBAR_NATIVE=no DEFAULT_wxUSE_TOOLBAR_SIMPLE=no @@ -1380,6 +1426,7 @@ if test $DEBUG_CONFIGURE = 1; then DEFAULT_wxUSE_PCX=no DEFAULT_wxUSE_PNM=no else + DEFAULT_wxUSE_UNIVERSAL=no DEFAULT_wxUSE_THREADS=yes DEFAULT_wxUSE_SHARED=yes @@ -1399,8 +1446,11 @@ else DEFAULT_wxUSE_APPLE_IEEE=yes DEFAULT_wxUSE_LOG=yes + DEFAULT_wxUSE_LOGWINDOW=yes + DEFAULT_wxUSE_LOGGUI=yes DEFAULT_wxUSE_GUI=yes + DEFAULT_wxUSE_CONTROLS=yes DEFAULT_wxUSE_ZLIB=yes DEFAULT_wxUSE_LIBPNG=yes @@ -1411,12 +1461,16 @@ else DEFAULT_wxUSE_ON_FATAL_EXCEPTION=yes DEFAULT_wxUSE_STD_IOSTREAM=no + DEFAULT_wxUSE_CMDLINE_PARSER=yes + DEFAULT_wxUSE_DATETIME=yes + DEFAULT_wxUSE_STOPWATCH=yes DEFAULT_wxUSE_FILE=yes DEFAULT_wxUSE_TEXTFILE=yes DEFAULT_wxUSE_TIMEDATE=yes DEFAULT_wxUSE_WAVE=no DEFAULT_wxUSE_INTL=yes DEFAULT_wxUSE_CONFIG=yes + DEFAULT_wxUSE_FONTMAP=yes DEFAULT_wxUSE_STREAMS=yes DEFAULT_wxUSE_SOCKETS=yes DEFAULT_wxUSE_DIALUP_MANAGER=yes @@ -1448,7 +1502,13 @@ else DEFAULT_wxUSE_METAFILE=yes DEFAULT_wxUSE_COMMONDLGS=yes + DEFAULT_wxUSE_CHOICEDLG=yes + DEFAULT_wxUSE_COLOURDLG=yes DEFAULT_wxUSE_DIRDLG=yes + DEFAULT_wxUSE_FILEDLG=yes + DEFAULT_wxUSE_FONTDLG=yes + DEFAULT_wxUSE_MSGDLG=yes + DEFAULT_wxUSE_NUMBERDLG=yes DEFAULT_wxUSE_TEXTDLG=yes DEFAULT_wxUSE_STARTUP_TIPS=yes DEFAULT_wxUSE_PROGRESSDLG=yes @@ -1462,6 +1522,7 @@ else DEFAULT_wxUSE_VALIDATORS=yes DEFAULT_wxUSE_ACCEL=yes + DEFAULT_wxUSE_BUTTON=yes DEFAULT_wxUSE_CARET=yes DEFAULT_wxUSE_BMPBUTTON=yes DEFAULT_wxUSE_CHECKBOX=yes @@ -1489,6 +1550,7 @@ else DEFAULT_wxUSE_STATLINE=yes DEFAULT_wxUSE_STATUSBAR=yes DEFAULT_wxUSE_TABDIALOG=no + DEFAULT_wxUSE_TEXTCTRL=yes DEFAULT_wxUSE_TOOLBAR=yes DEFAULT_wxUSE_TOOLBAR_NATIVE=yes DEFAULT_wxUSE_TOOLBAR_SIMPLE=yes @@ -1516,7 +1578,7 @@ done echo $ac_n "checking "for --enable-gui"""... $ac_c" 1>&6 -echo "configure:1520: checking "for --enable-gui"" >&5 +echo "configure:1582: checking "for --enable-gui"" >&5 no_cache=0 # Check whether --enable-gui or --disable-gui was given. if test "${enable_gui+set}" = set; then @@ -1556,6 +1618,45 @@ fi if test "$wxUSE_GUI" = "yes"; then + + echo $ac_n "checking "for --enable-universal"""... $ac_c" 1>&6 +echo "configure:1624: checking "for --enable-universal"" >&5 + no_cache=0 + # Check whether --enable-universal or --disable-universal was given. +if test "${enable_universal+set}" = set; then + enableval="$enable_universal" + + if test "$enableval" = yes; then + ac_cv_use_universal='wxUSE_UNIVERSAL=yes' + else + ac_cv_use_universal='wxUSE_UNIVERSAL=no' + fi + +else + + LINE=`grep "wxUSE_UNIVERSAL" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_universal='wxUSE_UNIVERSAL='$DEFAULT_wxUSE_UNIVERSAL + +fi + + + eval "$ac_cv_use_universal" + if test "$no_cache" != 1; then + echo $ac_cv_use_universal >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_UNIVERSAL" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + # Check whether --with-gtk or --without-gtk was given. if test "${with_gtk+set}" = set; then withval="$with_gtk" @@ -1612,7 +1713,7 @@ fi echo $ac_n "checking "for --with-libpng"""... $ac_c" 1>&6 -echo "configure:1616: checking "for --with-libpng"" >&5 +echo "configure:1717: checking "for --with-libpng"" >&5 no_cache=0 # Check whether --with-libpng or --without-libpng was given. if test "${with_libpng+set}" = set; then @@ -1659,7 +1760,7 @@ fi echo $ac_n "checking "for --with-libjpeg"""... $ac_c" 1>&6 -echo "configure:1663: checking "for --with-libjpeg"" >&5 +echo "configure:1764: checking "for --with-libjpeg"" >&5 no_cache=0 # Check whether --with-libjpeg or --without-libjpeg was given. if test "${with_libjpeg+set}" = set; then @@ -1706,7 +1807,7 @@ fi echo $ac_n "checking "for --with-libtiff"""... $ac_c" 1>&6 -echo "configure:1710: checking "for --with-libtiff"" >&5 +echo "configure:1811: checking "for --with-libtiff"" >&5 no_cache=0 # Check whether --with-libtiff or --without-libtiff was given. if test "${with_libtiff+set}" = set; then @@ -1753,7 +1854,7 @@ fi echo $ac_n "checking "for --with-opengl"""... $ac_c" 1>&6 -echo "configure:1757: checking "for --with-opengl"" >&5 +echo "configure:1858: checking "for --with-opengl"" >&5 no_cache=0 # Check whether --with-opengl or --without-opengl was given. if test "${with_opengl+set}" = set; then @@ -1795,7 +1896,7 @@ fi echo $ac_n "checking "for --with-dmalloc"""... $ac_c" 1>&6 -echo "configure:1799: checking "for --with-dmalloc"" >&5 +echo "configure:1900: checking "for --with-dmalloc"" >&5 no_cache=0 # Check whether --with-dmalloc or --without-dmalloc was given. if test "${with_dmalloc+set}" = set; then @@ -1834,7 +1935,7 @@ fi echo $ac_n "checking "for --with-zlib"""... $ac_c" 1>&6 -echo "configure:1838: checking "for --with-zlib"" >&5 +echo "configure:1939: checking "for --with-zlib"" >&5 no_cache=0 # Check whether --with-zlib or --without-zlib was given. if test "${with_zlib+set}" = set; then @@ -1881,7 +1982,7 @@ fi echo $ac_n "checking "for --with-odbc"""... $ac_c" 1>&6 -echo "configure:1885: checking "for --with-odbc"" >&5 +echo "configure:1986: checking "for --with-odbc"" >&5 no_cache=0 # Check whether --with-odbc or --without-odbc was given. if test "${with_odbc+set}" = set; then @@ -1923,7 +2024,7 @@ fi echo $ac_n "checking "for --enable-shared"""... $ac_c" 1>&6 -echo "configure:1927: checking "for --enable-shared"" >&5 +echo "configure:2028: checking "for --enable-shared"" >&5 no_cache=0 # Check whether --enable-shared or --disable-shared was given. if test "${enable_shared+set}" = set; then @@ -1962,7 +2063,7 @@ fi echo $ac_n "checking "for --enable-burnt_name"""... $ac_c" 1>&6 -echo "configure:1966: checking "for --enable-burnt_name"" >&5 +echo "configure:2067: checking "for --enable-burnt_name"" >&5 no_cache=0 # Check whether --enable-burnt_name or --disable-burnt_name was given. if test "${enable_burnt_name+set}" = set; then @@ -2001,7 +2102,7 @@ fi echo $ac_n "checking "for --enable-optimise"""... $ac_c" 1>&6 -echo "configure:2005: checking "for --enable-optimise"" >&5 +echo "configure:2106: checking "for --enable-optimise"" >&5 no_cache=0 # Check whether --enable-optimise or --disable-optimise was given. if test "${enable_optimise+set}" = set; then @@ -2040,7 +2141,7 @@ fi echo $ac_n "checking "for --enable-debug"""... $ac_c" 1>&6 -echo "configure:2044: checking "for --enable-debug"" >&5 +echo "configure:2145: checking "for --enable-debug"" >&5 no_cache=0 # Check whether --enable-debug or --disable-debug was given. if test "${enable_debug+set}" = set; then @@ -2088,7 +2189,7 @@ fi echo $ac_n "checking "for --enable-debug_flag"""... $ac_c" 1>&6 -echo "configure:2092: checking "for --enable-debug_flag"" >&5 +echo "configure:2193: checking "for --enable-debug_flag"" >&5 no_cache=0 # Check whether --enable-debug_flag or --disable-debug_flag was given. if test "${enable_debug_flag+set}" = set; then @@ -2127,7 +2228,7 @@ fi echo $ac_n "checking "for --enable-debug_info"""... $ac_c" 1>&6 -echo "configure:2131: checking "for --enable-debug_info"" >&5 +echo "configure:2232: checking "for --enable-debug_info"" >&5 no_cache=0 # Check whether --enable-debug_info or --disable-debug_info was given. if test "${enable_debug_info+set}" = set; then @@ -2166,7 +2267,7 @@ fi echo $ac_n "checking "for --enable-debug_gdb"""... $ac_c" 1>&6 -echo "configure:2170: checking "for --enable-debug_gdb"" >&5 +echo "configure:2271: checking "for --enable-debug_gdb"" >&5 no_cache=0 # Check whether --enable-debug_gdb or --disable-debug_gdb was given. if test "${enable_debug_gdb+set}" = set; then @@ -2205,7 +2306,7 @@ fi echo $ac_n "checking "for --enable-debug_cntxt"""... $ac_c" 1>&6 -echo "configure:2209: checking "for --enable-debug_cntxt"" >&5 +echo "configure:2310: checking "for --enable-debug_cntxt"" >&5 no_cache=0 # Check whether --enable-debug_cntxt or --disable-debug_cntxt was given. if test "${enable_debug_cntxt+set}" = set; then @@ -2244,7 +2345,7 @@ fi echo $ac_n "checking "for --enable-mem_tracing"""... $ac_c" 1>&6 -echo "configure:2248: checking "for --enable-mem_tracing"" >&5 +echo "configure:2349: checking "for --enable-mem_tracing"" >&5 no_cache=0 # Check whether --enable-mem_tracing or --disable-mem_tracing was given. if test "${enable_mem_tracing+set}" = set; then @@ -2283,7 +2384,7 @@ fi echo $ac_n "checking "for --enable-profile"""... $ac_c" 1>&6 -echo "configure:2287: checking "for --enable-profile"" >&5 +echo "configure:2388: checking "for --enable-profile"" >&5 no_cache=0 # Check whether --enable-profile or --disable-profile was given. if test "${enable_profile+set}" = set; then @@ -2322,7 +2423,7 @@ fi echo $ac_n "checking "for --enable-no_rtti"""... $ac_c" 1>&6 -echo "configure:2326: checking "for --enable-no_rtti"" >&5 +echo "configure:2427: checking "for --enable-no_rtti"" >&5 no_cache=0 # Check whether --enable-no_rtti or --disable-no_rtti was given. if test "${enable_no_rtti+set}" = set; then @@ -2361,7 +2462,7 @@ fi echo $ac_n "checking "for --enable-no_exceptions"""... $ac_c" 1>&6 -echo "configure:2365: checking "for --enable-no_exceptions"" >&5 +echo "configure:2466: checking "for --enable-no_exceptions"" >&5 no_cache=0 # Check whether --enable-no_exceptions or --disable-no_exceptions was given. if test "${enable_no_exceptions+set}" = set; then @@ -2400,7 +2501,7 @@ fi echo $ac_n "checking "for --enable-permissive"""... $ac_c" 1>&6 -echo "configure:2404: checking "for --enable-permissive"" >&5 +echo "configure:2505: checking "for --enable-permissive"" >&5 no_cache=0 # Check whether --enable-permissive or --disable-permissive was given. if test "${enable_permissive+set}" = set; then @@ -2439,7 +2540,7 @@ fi echo $ac_n "checking "for --enable-no_deps"""... $ac_c" 1>&6 -echo "configure:2443: checking "for --enable-no_deps"" >&5 +echo "configure:2544: checking "for --enable-no_deps"" >&5 no_cache=0 # Check whether --enable-no_deps or --disable-no_deps was given. if test "${enable_no_deps+set}" = set; then @@ -2480,7 +2581,7 @@ fi echo $ac_n "checking "for --enable-intl"""... $ac_c" 1>&6 -echo "configure:2484: checking "for --enable-intl"" >&5 +echo "configure:2585: checking "for --enable-intl"" >&5 no_cache=0 # Check whether --enable-intl or --disable-intl was given. if test "${enable_intl+set}" = set; then @@ -2519,7 +2620,7 @@ fi echo $ac_n "checking "for --enable-config"""... $ac_c" 1>&6 -echo "configure:2523: checking "for --enable-config"" >&5 +echo "configure:2624: checking "for --enable-config"" >&5 no_cache=0 # Check whether --enable-config or --disable-config was given. if test "${enable_config+set}" = set; then @@ -2559,7 +2660,7 @@ fi echo $ac_n "checking "for --enable-sockets"""... $ac_c" 1>&6 -echo "configure:2563: checking "for --enable-sockets"" >&5 +echo "configure:2664: checking "for --enable-sockets"" >&5 no_cache=0 # Check whether --enable-sockets or --disable-sockets was given. if test "${enable_sockets+set}" = set; then @@ -2599,7 +2700,7 @@ fi echo $ac_n "checking "for --enable-ipc"""... $ac_c" 1>&6 -echo "configure:2603: checking "for --enable-ipc"" >&5 +echo "configure:2704: checking "for --enable-ipc"" >&5 no_cache=0 # Check whether --enable-ipc or --disable-ipc was given. if test "${enable_ipc+set}" = set; then @@ -2638,8 +2739,125 @@ fi + echo $ac_n "checking "for --enable-cmdline"""... $ac_c" 1>&6 +echo "configure:2744: checking "for --enable-cmdline"" >&5 + no_cache=0 + # Check whether --enable-cmdline or --disable-cmdline was given. +if test "${enable_cmdline+set}" = set; then + enableval="$enable_cmdline" + + if test "$enableval" = yes; then + ac_cv_use_cmdline='wxUSE_CMDLINE_PARSER=yes' + else + ac_cv_use_cmdline='wxUSE_CMDLINE_PARSER=no' + fi + +else + + LINE=`grep "wxUSE_CMDLINE_PARSER" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_cmdline='wxUSE_CMDLINE_PARSER='$DEFAULT_wxUSE_CMDLINE_PARSER + +fi + + + eval "$ac_cv_use_cmdline" + if test "$no_cache" != 1; then + echo $ac_cv_use_cmdline >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_CMDLINE_PARSER" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + echo $ac_n "checking "for --enable-datetime"""... $ac_c" 1>&6 +echo "configure:2783: checking "for --enable-datetime"" >&5 + no_cache=0 + # Check whether --enable-datetime or --disable-datetime was given. +if test "${enable_datetime+set}" = set; then + enableval="$enable_datetime" + + if test "$enableval" = yes; then + ac_cv_use_datetime='wxUSE_DATETIME=yes' + else + ac_cv_use_datetime='wxUSE_DATETIME=no' + fi + +else + + LINE=`grep "wxUSE_DATETIME" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_datetime='wxUSE_DATETIME='$DEFAULT_wxUSE_DATETIME + +fi + + + eval "$ac_cv_use_datetime" + if test "$no_cache" != 1; then + echo $ac_cv_use_datetime >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_DATETIME" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + echo $ac_n "checking "for --enable-stopwatch"""... $ac_c" 1>&6 +echo "configure:2822: checking "for --enable-stopwatch"" >&5 + no_cache=0 + # Check whether --enable-stopwatch or --disable-stopwatch was given. +if test "${enable_stopwatch+set}" = set; then + enableval="$enable_stopwatch" + + if test "$enableval" = yes; then + ac_cv_use_stopwatch='wxUSE_STOPWATCH=yes' + else + ac_cv_use_stopwatch='wxUSE_STOPWATCH=no' + fi + +else + + LINE=`grep "wxUSE_STOPWATCH" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_stopwatch='wxUSE_STOPWATCH='$DEFAULT_wxUSE_STOPWATCH + +fi + + + eval "$ac_cv_use_stopwatch" + if test "$no_cache" != 1; then + echo $ac_cv_use_stopwatch >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_STOPWATCH" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + echo $ac_n "checking "for --enable-dialupman"""... $ac_c" 1>&6 -echo "configure:2643: checking "for --enable-dialupman"" >&5 +echo "configure:2861: checking "for --enable-dialupman"" >&5 no_cache=0 # Check whether --enable-dialupman or --disable-dialupman was given. if test "${enable_dialupman+set}" = set; then @@ -2678,7 +2896,7 @@ fi echo $ac_n "checking "for --enable-apple_ieee"""... $ac_c" 1>&6 -echo "configure:2682: checking "for --enable-apple_ieee"" >&5 +echo "configure:2900: checking "for --enable-apple_ieee"" >&5 no_cache=0 # Check whether --enable-apple_ieee or --disable-apple_ieee was given. if test "${enable_apple_ieee+set}" = set; then @@ -2716,39 +2934,39 @@ fi fi - echo $ac_n "checking "for --enable-timedate"""... $ac_c" 1>&6 -echo "configure:2721: checking "for --enable-timedate"" >&5 + echo $ac_n "checking "for --enable-timer"""... $ac_c" 1>&6 +echo "configure:2939: checking "for --enable-timer"" >&5 no_cache=0 - # Check whether --enable-timedate or --disable-timedate was given. -if test "${enable_timedate+set}" = set; then - enableval="$enable_timedate" + # Check whether --enable-timer or --disable-timer was given. +if test "${enable_timer+set}" = set; then + enableval="$enable_timer" if test "$enableval" = yes; then - ac_cv_use_timedate='wxUSE_TIMEDATE=yes' + ac_cv_use_timer='wxUSE_TIMER=yes' else - ac_cv_use_timedate='wxUSE_TIMEDATE=no' + ac_cv_use_timer='wxUSE_TIMER=no' fi else - LINE=`grep "wxUSE_TIMEDATE" ${wx_arg_cache_file}` + LINE=`grep "wxUSE_TIMER" ${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 + ac_cv_use_timer='wxUSE_TIMER='$DEFAULT_wxUSE_TIMER fi - eval "$ac_cv_use_timedate" + eval "$ac_cv_use_timer" if test "$no_cache" != 1; then - echo $ac_cv_use_timedate >> ${wx_arg_cache_file}.tmp + echo $ac_cv_use_timer >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_TIMEDATE" = yes; then + if test "$wxUSE_TIMER" = yes; then echo "$ac_t""yes" 1>&6 else echo "$ac_t""no" 1>&6 @@ -2756,7 +2974,7 @@ fi echo $ac_n "checking "for --enable-wave"""... $ac_c" 1>&6 -echo "configure:2760: checking "for --enable-wave"" >&5 +echo "configure:2978: checking "for --enable-wave"" >&5 no_cache=0 # Check whether --enable-wave or --disable-wave was given. if test "${enable_wave+set}" = set; then @@ -2795,7 +3013,7 @@ fi echo $ac_n "checking "for --enable-fraction"""... $ac_c" 1>&6 -echo "configure:2799: checking "for --enable-fraction"" >&5 +echo "configure:3017: checking "for --enable-fraction"" >&5 no_cache=0 # Check whether --enable-fraction or --disable-fraction was given. if test "${enable_fraction+set}" = set; then @@ -2834,7 +3052,7 @@ fi echo $ac_n "checking "for --enable-dynlib"""... $ac_c" 1>&6 -echo "configure:2838: checking "for --enable-dynlib"" >&5 +echo "configure:3056: checking "for --enable-dynlib"" >&5 no_cache=0 # Check whether --enable-dynlib or --disable-dynlib was given. if test "${enable_dynlib+set}" = set; then @@ -2873,7 +3091,7 @@ fi echo $ac_n "checking "for --enable-longlong"""... $ac_c" 1>&6 -echo "configure:2877: checking "for --enable-longlong"" >&5 +echo "configure:3095: checking "for --enable-longlong"" >&5 no_cache=0 # Check whether --enable-longlong or --disable-longlong was given. if test "${enable_longlong+set}" = set; then @@ -2912,7 +3130,7 @@ fi echo $ac_n "checking "for --enable-log"""... $ac_c" 1>&6 -echo "configure:2916: checking "for --enable-log"" >&5 +echo "configure:3134: checking "for --enable-log"" >&5 no_cache=0 # Check whether --enable-log or --disable-log was given. if test "${enable_log+set}" = set; then @@ -2951,7 +3169,7 @@ fi echo $ac_n "checking "for --enable-streams"""... $ac_c" 1>&6 -echo "configure:2955: checking "for --enable-streams"" >&5 +echo "configure:3173: checking "for --enable-streams"" >&5 no_cache=0 # Check whether --enable-streams or --disable-streams was given. if test "${enable_streams+set}" = set; then @@ -2990,7 +3208,7 @@ fi echo $ac_n "checking "for --enable-file"""... $ac_c" 1>&6 -echo "configure:2994: checking "for --enable-file"" >&5 +echo "configure:3212: checking "for --enable-file"" >&5 no_cache=0 # Check whether --enable-file or --disable-file was given. if test "${enable_file+set}" = set; then @@ -3029,7 +3247,7 @@ fi echo $ac_n "checking "for --enable-textfile"""... $ac_c" 1>&6 -echo "configure:3033: checking "for --enable-textfile"" >&5 +echo "configure:3251: checking "for --enable-textfile"" >&5 no_cache=0 # Check whether --enable-textfile or --disable-textfile was given. if test "${enable_textfile+set}" = set; then @@ -3067,8 +3285,47 @@ fi fi + echo $ac_n "checking "for --enable-fontmap"""... $ac_c" 1>&6 +echo "configure:3290: checking "for --enable-fontmap"" >&5 + no_cache=0 + # Check whether --enable-fontmap or --disable-fontmap was given. +if test "${enable_fontmap+set}" = set; then + enableval="$enable_fontmap" + + if test "$enableval" = yes; then + ac_cv_use_fontmap='wxUSE_FONTMAP=yes' + else + ac_cv_use_fontmap='wxUSE_FONTMAP=no' + fi + +else + + LINE=`grep "wxUSE_FONTMAP" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_fontmap='wxUSE_FONTMAP='$DEFAULT_wxUSE_FONTMAP + +fi + + + eval "$ac_cv_use_fontmap" + if test "$no_cache" != 1; then + echo $ac_cv_use_fontmap >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_FONTMAP" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + echo $ac_n "checking "for --enable-unicode"""... $ac_c" 1>&6 -echo "configure:3072: checking "for --enable-unicode"" >&5 +echo "configure:3329: checking "for --enable-unicode"" >&5 no_cache=0 # Check whether --enable-unicode or --disable-unicode was given. if test "${enable_unicode+set}" = set; then @@ -3107,7 +3364,7 @@ fi echo $ac_n "checking "for --enable-wcsrtombs"""... $ac_c" 1>&6 -echo "configure:3111: checking "for --enable-wcsrtombs"" >&5 +echo "configure:3368: checking "for --enable-wcsrtombs"" >&5 no_cache=0 # Check whether --enable-wcsrtombs or --disable-wcsrtombs was given. if test "${enable_wcsrtombs+set}" = set; then @@ -3146,7 +3403,7 @@ fi echo $ac_n "checking "for --enable-wxprintfv"""... $ac_c" 1>&6 -echo "configure:3150: checking "for --enable-wxprintfv"" >&5 +echo "configure:3407: checking "for --enable-wxprintfv"" >&5 no_cache=0 # Check whether --enable-wxprintfv or --disable-wxprintfv was given. if test "${enable_wxprintfv+set}" = set; then @@ -3185,7 +3442,7 @@ fi echo $ac_n "checking "for --enable-std_iostreams"""... $ac_c" 1>&6 -echo "configure:3189: checking "for --enable-std_iostreams"" >&5 +echo "configure:3446: checking "for --enable-std_iostreams"" >&5 no_cache=0 # Check whether --enable-std_iostreams or --disable-std_iostreams was given. if test "${enable_std_iostreams+set}" = set; then @@ -3224,7 +3481,7 @@ fi echo $ac_n "checking "for --enable-filesystem"""... $ac_c" 1>&6 -echo "configure:3228: checking "for --enable-filesystem"" >&5 +echo "configure:3485: checking "for --enable-filesystem"" >&5 no_cache=0 # Check whether --enable-filesystem or --disable-filesystem was given. if test "${enable_filesystem+set}" = set; then @@ -3263,7 +3520,7 @@ fi echo $ac_n "checking "for --enable-fs_inet"""... $ac_c" 1>&6 -echo "configure:3267: checking "for --enable-fs_inet"" >&5 +echo "configure:3524: checking "for --enable-fs_inet"" >&5 no_cache=0 # Check whether --enable-fs_inet or --disable-fs_inet was given. if test "${enable_fs_inet+set}" = set; then @@ -3302,7 +3559,7 @@ fi echo $ac_n "checking "for --enable-fs_zip"""... $ac_c" 1>&6 -echo "configure:3306: checking "for --enable-fs_zip"" >&5 +echo "configure:3563: checking "for --enable-fs_zip"" >&5 no_cache=0 # Check whether --enable-fs_zip or --disable-fs_zip was given. if test "${enable_fs_zip+set}" = set; then @@ -3341,7 +3598,7 @@ fi echo $ac_n "checking "for --enable-zipstream"""... $ac_c" 1>&6 -echo "configure:3345: checking "for --enable-zipstream"" >&5 +echo "configure:3602: checking "for --enable-zipstream"" >&5 no_cache=0 # Check whether --enable-zipstream or --disable-zipstream was given. if test "${enable_zipstream+set}" = set; then @@ -3381,7 +3638,7 @@ fi echo $ac_n "checking "for --enable-catch_segvs"""... $ac_c" 1>&6 -echo "configure:3385: checking "for --enable-catch_segvs"" >&5 +echo "configure:3642: checking "for --enable-catch_segvs"" >&5 no_cache=0 # Check whether --enable-catch_segvs or --disable-catch_segvs was given. if test "${enable_catch_segvs+set}" = set; then @@ -3422,7 +3679,7 @@ fi echo $ac_n "checking "for --enable-threads"""... $ac_c" 1>&6 -echo "configure:3426: checking "for --enable-threads"" >&5 +echo "configure:3683: checking "for --enable-threads"" >&5 no_cache=0 # Check whether --enable-threads or --disable-threads was given. if test "${enable_threads+set}" = set; then @@ -3461,7 +3718,7 @@ fi echo $ac_n "checking "for --enable-serial"""... $ac_c" 1>&6 -echo "configure:3465: checking "for --enable-serial"" >&5 +echo "configure:3722: checking "for --enable-serial"" >&5 no_cache=0 # Check whether --enable-serial or --disable-serial was given. if test "${enable_serial+set}" = set; then @@ -3504,7 +3761,7 @@ if test "$wxUSE_GUI" = "yes"; then echo $ac_n "checking "for --enable-docview"""... $ac_c" 1>&6 -echo "configure:3508: checking "for --enable-docview"" >&5 +echo "configure:3765: checking "for --enable-docview"" >&5 no_cache=0 # Check whether --enable-docview or --disable-docview was given. if test "${enable_docview+set}" = set; then @@ -3543,7 +3800,7 @@ fi echo $ac_n "checking "for --enable-help"""... $ac_c" 1>&6 -echo "configure:3547: checking "for --enable-help"" >&5 +echo "configure:3804: checking "for --enable-help"" >&5 no_cache=0 # Check whether --enable-help or --disable-help was given. if test "${enable_help+set}" = set; then @@ -3582,7 +3839,7 @@ fi echo $ac_n "checking "for --enable-constraints"""... $ac_c" 1>&6 -echo "configure:3586: checking "for --enable-constraints"" >&5 +echo "configure:3843: checking "for --enable-constraints"" >&5 no_cache=0 # Check whether --enable-constraints or --disable-constraints was given. if test "${enable_constraints+set}" = set; then @@ -3621,7 +3878,7 @@ fi echo $ac_n "checking "for --enable-printarch"""... $ac_c" 1>&6 -echo "configure:3625: checking "for --enable-printarch"" >&5 +echo "configure:3882: checking "for --enable-printarch"" >&5 no_cache=0 # Check whether --enable-printarch or --disable-printarch was given. if test "${enable_printarch+set}" = set; then @@ -3660,7 +3917,7 @@ fi echo $ac_n "checking "for --enable-mdi"""... $ac_c" 1>&6 -echo "configure:3664: checking "for --enable-mdi"" >&5 +echo "configure:3921: checking "for --enable-mdi"" >&5 no_cache=0 # Check whether --enable-mdi or --disable-mdi was given. if test "${enable_mdi+set}" = set; then @@ -3698,9 +3955,87 @@ fi fi + echo $ac_n "checking "for --enable-loggui"""... $ac_c" 1>&6 +echo "configure:3960: checking "for --enable-loggui"" >&5 + no_cache=0 + # Check whether --enable-loggui or --disable-loggui was given. +if test "${enable_loggui+set}" = set; then + enableval="$enable_loggui" + + if test "$enableval" = yes; then + ac_cv_use_loggui='wxUSE_LOGGUI=yes' + else + ac_cv_use_loggui='wxUSE_LOGGUI=no' + fi + +else + + LINE=`grep "wxUSE_LOGGUI" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_loggui='wxUSE_LOGGUI='$DEFAULT_wxUSE_LOGGUI + +fi + + + eval "$ac_cv_use_loggui" + if test "$no_cache" != 1; then + echo $ac_cv_use_loggui >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_LOGGUI" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + echo $ac_n "checking "for --enable-logwin"""... $ac_c" 1>&6 +echo "configure:3999: checking "for --enable-logwin"" >&5 + no_cache=0 + # Check whether --enable-logwin or --disable-logwin was given. +if test "${enable_logwin+set}" = set; then + enableval="$enable_logwin" + + if test "$enableval" = yes; then + ac_cv_use_logwin='wxUSE_LOGWINDOW=yes' + else + ac_cv_use_logwin='wxUSE_LOGWINDOW=no' + fi + +else + + LINE=`grep "wxUSE_LOGWINDOW" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_logwin='wxUSE_LOGWINDOW='$DEFAULT_wxUSE_LOGWINDOW + +fi + + + eval "$ac_cv_use_logwin" + if test "$no_cache" != 1; then + echo $ac_cv_use_logwin >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_LOGWINDOW" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + echo $ac_n "checking "for --enable-postscript"""... $ac_c" 1>&6 -echo "configure:3704: checking "for --enable-postscript"" >&5 +echo "configure:4039: checking "for --enable-postscript"" >&5 no_cache=0 # Check whether --enable-postscript or --disable-postscript was given. if test "${enable_postscript+set}" = set; then @@ -3741,7 +4076,7 @@ fi echo $ac_n "checking "for --enable-prologio"""... $ac_c" 1>&6 -echo "configure:3745: checking "for --enable-prologio"" >&5 +echo "configure:4080: checking "for --enable-prologio"" >&5 no_cache=0 # Check whether --enable-prologio or --disable-prologio was given. if test "${enable_prologio+set}" = set; then @@ -3780,7 +4115,7 @@ fi echo $ac_n "checking "for --enable-resources"""... $ac_c" 1>&6 -echo "configure:3784: checking "for --enable-resources"" >&5 +echo "configure:4119: checking "for --enable-resources"" >&5 no_cache=0 # Check whether --enable-resources or --disable-resources was given. if test "${enable_resources+set}" = set; then @@ -3820,7 +4155,7 @@ fi echo $ac_n "checking "for --enable-xresources"""... $ac_c" 1>&6 -echo "configure:3824: checking "for --enable-xresources"" >&5 +echo "configure:4159: checking "for --enable-xresources"" >&5 no_cache=0 # Check whether --enable-xresources or --disable-xresources was given. if test "${enable_xresources+set}" = set; then @@ -3861,7 +4196,7 @@ fi echo $ac_n "checking "for --enable-clipboard"""... $ac_c" 1>&6 -echo "configure:3865: checking "for --enable-clipboard"" >&5 +echo "configure:4200: checking "for --enable-clipboard"" >&5 no_cache=0 # Check whether --enable-clipboard or --disable-clipboard was given. if test "${enable_clipboard+set}" = set; then @@ -3900,7 +4235,7 @@ fi echo $ac_n "checking "for --enable-dnd"""... $ac_c" 1>&6 -echo "configure:3904: checking "for --enable-dnd"" >&5 +echo "configure:4239: checking "for --enable-dnd"" >&5 no_cache=0 # Check whether --enable-dnd or --disable-dnd was given. if test "${enable_dnd+set}" = set; then @@ -3940,7 +4275,7 @@ fi echo $ac_n "checking "for --enable-wxtree"""... $ac_c" 1>&6 -echo "configure:3944: checking "for --enable-wxtree"" >&5 +echo "configure:4279: checking "for --enable-wxtree"" >&5 no_cache=0 # Check whether --enable-wxtree or --disable-wxtree was given. if test "${enable_wxtree+set}" = set; then @@ -3981,7 +4316,7 @@ fi echo $ac_n "checking "for --enable-controls"""... $ac_c" 1>&6 -echo "configure:3985: checking "for --enable-controls"" >&5 +echo "configure:4320: checking "for --enable-controls"" >&5 no_cache=0 # Check whether --enable-controls or --disable-controls was given. if test "${enable_controls+set}" = set; then @@ -4021,6 +4356,7 @@ fi if test "$wxUSE_CONTROLS" = "yes"; then DEFAULT_wxUSE_ACCEL=yes + DEFAULT_wxUSE_BUTTON=yes DEFAULT_wxUSE_CARET=yes DEFAULT_wxUSE_COMBOBOX=yes DEFAULT_wxUSE_BMPBUTTON=yes @@ -4054,6 +4390,7 @@ if test "$wxUSE_CONTROLS" = "yes"; then DEFAULT_wxUSE_TREECTRL=yes elif test "$wxUSE_CONTROLS" = "no"; then DEFAULT_wxUSE_ACCEL=no + DEFAULT_wxUSE_BUTTON=no DEFAULT_wxUSE_CARET=no DEFAULT_wxUSE_COMBOBOX=no DEFAULT_wxUSE_BMPBUTTON=no @@ -4089,7 +4426,7 @@ fi echo $ac_n "checking "for --enable-accel"""... $ac_c" 1>&6 -echo "configure:4093: checking "for --enable-accel"" >&5 +echo "configure:4430: checking "for --enable-accel"" >&5 no_cache=0 # Check whether --enable-accel or --disable-accel was given. if test "${enable_accel+set}" = set; then @@ -4127,39 +4464,39 @@ fi fi - echo $ac_n "checking "for --enable-caret"""... $ac_c" 1>&6 -echo "configure:4132: checking "for --enable-caret"" >&5 + echo $ac_n "checking "for --enable-button"""... $ac_c" 1>&6 +echo "configure:4469: checking "for --enable-button"" >&5 no_cache=0 - # Check whether --enable-caret or --disable-caret was given. -if test "${enable_caret+set}" = set; then - enableval="$enable_caret" + # Check whether --enable-button or --disable-button was given. +if test "${enable_button+set}" = set; then + enableval="$enable_button" if test "$enableval" = yes; then - ac_cv_use_caret='wxUSE_CARET=yes' + ac_cv_use_button='wxUSE_BUTTON=yes' else - ac_cv_use_caret='wxUSE_CARET=no' + ac_cv_use_button='wxUSE_BUTTON=no' fi else - LINE=`grep "wxUSE_CARET" ${wx_arg_cache_file}` + LINE=`grep "wxUSE_BUTTON" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_caret='wxUSE_CARET='$DEFAULT_wxUSE_CARET + ac_cv_use_button='wxUSE_BUTTON='$DEFAULT_wxUSE_BUTTON fi - eval "$ac_cv_use_caret" + eval "$ac_cv_use_button" if test "$no_cache" != 1; then - echo $ac_cv_use_caret >> ${wx_arg_cache_file}.tmp + echo $ac_cv_use_button >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_CARET" = yes; then + if test "$wxUSE_BUTTON" = yes; then echo "$ac_t""yes" 1>&6 else echo "$ac_t""no" 1>&6 @@ -4167,7 +4504,7 @@ fi echo $ac_n "checking "for --enable-bmpbutton"""... $ac_c" 1>&6 -echo "configure:4171: checking "for --enable-bmpbutton"" >&5 +echo "configure:4508: checking "for --enable-bmpbutton"" >&5 no_cache=0 # Check whether --enable-bmpbutton or --disable-bmpbutton was given. if test "${enable_bmpbutton+set}" = set; then @@ -4205,8 +4542,47 @@ fi fi + echo $ac_n "checking "for --enable-caret"""... $ac_c" 1>&6 +echo "configure:4547: checking "for --enable-caret"" >&5 + no_cache=0 + # Check whether --enable-caret or --disable-caret was given. +if test "${enable_caret+set}" = set; then + enableval="$enable_caret" + + if test "$enableval" = yes; then + ac_cv_use_caret='wxUSE_CARET=yes' + else + ac_cv_use_caret='wxUSE_CARET=no' + fi + +else + + LINE=`grep "wxUSE_CARET" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_caret='wxUSE_CARET='$DEFAULT_wxUSE_CARET + +fi + + + eval "$ac_cv_use_caret" + if test "$no_cache" != 1; then + echo $ac_cv_use_caret >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_CARET" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + echo $ac_n "checking "for --enable-checkbox"""... $ac_c" 1>&6 -echo "configure:4210: checking "for --enable-checkbox"" >&5 +echo "configure:4586: checking "for --enable-checkbox"" >&5 no_cache=0 # Check whether --enable-checkbox or --disable-checkbox was given. if test "${enable_checkbox+set}" = set; then @@ -4245,7 +4621,7 @@ fi echo $ac_n "checking "for --enable-checklst"""... $ac_c" 1>&6 -echo "configure:4249: checking "for --enable-checklst"" >&5 +echo "configure:4625: checking "for --enable-checklst"" >&5 no_cache=0 # Check whether --enable-checklst or --disable-checklst was given. if test "${enable_checklst+set}" = set; then @@ -4284,7 +4660,7 @@ fi echo $ac_n "checking "for --enable-choice"""... $ac_c" 1>&6 -echo "configure:4288: checking "for --enable-choice"" >&5 +echo "configure:4664: checking "for --enable-choice"" >&5 no_cache=0 # Check whether --enable-choice or --disable-choice was given. if test "${enable_choice+set}" = set; then @@ -4323,7 +4699,7 @@ fi echo $ac_n "checking "for --enable-combobox"""... $ac_c" 1>&6 -echo "configure:4327: checking "for --enable-combobox"" >&5 +echo "configure:4703: checking "for --enable-combobox"" >&5 no_cache=0 # Check whether --enable-combobox or --disable-combobox was given. if test "${enable_combobox+set}" = set; then @@ -4362,7 +4738,7 @@ fi echo $ac_n "checking "for --enable-gauge"""... $ac_c" 1>&6 -echo "configure:4366: checking "for --enable-gauge"" >&5 +echo "configure:4742: checking "for --enable-gauge"" >&5 no_cache=0 # Check whether --enable-gauge or --disable-gauge was given. if test "${enable_gauge+set}" = set; then @@ -4401,7 +4777,7 @@ fi echo $ac_n "checking "for --enable-grid"""... $ac_c" 1>&6 -echo "configure:4405: checking "for --enable-grid"" >&5 +echo "configure:4781: checking "for --enable-grid"" >&5 no_cache=0 # Check whether --enable-grid or --disable-grid was given. if test "${enable_grid+set}" = set; then @@ -4440,7 +4816,7 @@ fi echo $ac_n "checking "for --enable-newgrid"""... $ac_c" 1>&6 -echo "configure:4444: checking "for --enable-newgrid"" >&5 +echo "configure:4820: checking "for --enable-newgrid"" >&5 no_cache=0 # Check whether --enable-newgrid or --disable-newgrid was given. if test "${enable_newgrid+set}" = set; then @@ -4479,7 +4855,7 @@ fi echo $ac_n "checking "for --enable-imaglist"""... $ac_c" 1>&6 -echo "configure:4483: checking "for --enable-imaglist"" >&5 +echo "configure:4859: checking "for --enable-imaglist"" >&5 no_cache=0 # Check whether --enable-imaglist or --disable-imaglist was given. if test "${enable_imaglist+set}" = set; then @@ -4518,7 +4894,7 @@ fi echo $ac_n "checking "for --enable-listbox"""... $ac_c" 1>&6 -echo "configure:4522: checking "for --enable-listbox"" >&5 +echo "configure:4898: checking "for --enable-listbox"" >&5 no_cache=0 # Check whether --enable-listbox or --disable-listbox was given. if test "${enable_listbox+set}" = set; then @@ -4557,7 +4933,7 @@ fi echo $ac_n "checking "for --enable-listctrl"""... $ac_c" 1>&6 -echo "configure:4561: checking "for --enable-listctrl"" >&5 +echo "configure:4937: checking "for --enable-listctrl"" >&5 no_cache=0 # Check whether --enable-listctrl or --disable-listctrl was given. if test "${enable_listctrl+set}" = set; then @@ -4596,7 +4972,7 @@ fi echo $ac_n "checking "for --enable-notebook"""... $ac_c" 1>&6 -echo "configure:4600: checking "for --enable-notebook"" >&5 +echo "configure:4976: checking "for --enable-notebook"" >&5 no_cache=0 # Check whether --enable-notebook or --disable-notebook was given. if test "${enable_notebook+set}" = set; then @@ -4635,7 +5011,7 @@ fi echo $ac_n "checking "for --enable-radiobox"""... $ac_c" 1>&6 -echo "configure:4639: checking "for --enable-radiobox"" >&5 +echo "configure:5015: checking "for --enable-radiobox"" >&5 no_cache=0 # Check whether --enable-radiobox or --disable-radiobox was given. if test "${enable_radiobox+set}" = set; then @@ -4674,7 +5050,7 @@ fi echo $ac_n "checking "for --enable-radiobtn"""... $ac_c" 1>&6 -echo "configure:4678: checking "for --enable-radiobtn"" >&5 +echo "configure:5054: checking "for --enable-radiobtn"" >&5 no_cache=0 # Check whether --enable-radiobtn or --disable-radiobtn was given. if test "${enable_radiobtn+set}" = set; then @@ -4713,7 +5089,7 @@ fi echo $ac_n "checking "for --enable-sash"""... $ac_c" 1>&6 -echo "configure:4717: checking "for --enable-sash"" >&5 +echo "configure:5093: checking "for --enable-sash"" >&5 no_cache=0 # Check whether --enable-sash or --disable-sash was given. if test "${enable_sash+set}" = set; then @@ -4752,7 +5128,7 @@ fi echo $ac_n "checking "for --enable-scrollbar"""... $ac_c" 1>&6 -echo "configure:4756: checking "for --enable-scrollbar"" >&5 +echo "configure:5132: checking "for --enable-scrollbar"" >&5 no_cache=0 # Check whether --enable-scrollbar or --disable-scrollbar was given. if test "${enable_scrollbar+set}" = set; then @@ -4791,7 +5167,7 @@ fi echo $ac_n "checking "for --enable-slider"""... $ac_c" 1>&6 -echo "configure:4795: checking "for --enable-slider"" >&5 +echo "configure:5171: checking "for --enable-slider"" >&5 no_cache=0 # Check whether --enable-slider or --disable-slider was given. if test "${enable_slider+set}" = set; then @@ -4830,7 +5206,7 @@ fi echo $ac_n "checking "for --enable-spinbtn"""... $ac_c" 1>&6 -echo "configure:4834: checking "for --enable-spinbtn"" >&5 +echo "configure:5210: checking "for --enable-spinbtn"" >&5 no_cache=0 # Check whether --enable-spinbtn or --disable-spinbtn was given. if test "${enable_spinbtn+set}" = set; then @@ -4869,7 +5245,7 @@ fi echo $ac_n "checking "for --enable-spinctrl"""... $ac_c" 1>&6 -echo "configure:4873: checking "for --enable-spinctrl"" >&5 +echo "configure:5249: checking "for --enable-spinctrl"" >&5 no_cache=0 # Check whether --enable-spinctrl or --disable-spinctrl was given. if test "${enable_spinctrl+set}" = set; then @@ -4908,7 +5284,7 @@ fi echo $ac_n "checking "for --enable-splitter"""... $ac_c" 1>&6 -echo "configure:4912: checking "for --enable-splitter"" >&5 +echo "configure:5288: checking "for --enable-splitter"" >&5 no_cache=0 # Check whether --enable-splitter or --disable-splitter was given. if test "${enable_splitter+set}" = set; then @@ -4947,7 +5323,7 @@ fi echo $ac_n "checking "for --enable-statbmp"""... $ac_c" 1>&6 -echo "configure:4951: checking "for --enable-statbmp"" >&5 +echo "configure:5327: checking "for --enable-statbmp"" >&5 no_cache=0 # Check whether --enable-statbmp or --disable-statbmp was given. if test "${enable_statbmp+set}" = set; then @@ -4986,7 +5362,7 @@ fi echo $ac_n "checking "for --enable-statbox"""... $ac_c" 1>&6 -echo "configure:4990: checking "for --enable-statbox"" >&5 +echo "configure:5366: checking "for --enable-statbox"" >&5 no_cache=0 # Check whether --enable-statbox or --disable-statbox was given. if test "${enable_statbox+set}" = set; then @@ -5025,7 +5401,7 @@ fi echo $ac_n "checking "for --enable-statline"""... $ac_c" 1>&6 -echo "configure:5029: checking "for --enable-statline"" >&5 +echo "configure:5405: checking "for --enable-statline"" >&5 no_cache=0 # Check whether --enable-statline or --disable-statline was given. if test "${enable_statline+set}" = set; then @@ -5064,7 +5440,7 @@ fi echo $ac_n "checking "for --enable-statusbar"""... $ac_c" 1>&6 -echo "configure:5068: checking "for --enable-statusbar"" >&5 +echo "configure:5444: checking "for --enable-statusbar"" >&5 no_cache=0 # Check whether --enable-statusbar or --disable-statusbar was given. if test "${enable_statusbar+set}" = set; then @@ -5103,7 +5479,7 @@ fi echo $ac_n "checking "for --enable-tabdialog"""... $ac_c" 1>&6 -echo "configure:5107: checking "for --enable-tabdialog"" >&5 +echo "configure:5483: checking "for --enable-tabdialog"" >&5 no_cache=0 # Check whether --enable-tabdialog or --disable-tabdialog was given. if test "${enable_tabdialog+set}" = set; then @@ -5141,8 +5517,47 @@ fi fi + echo $ac_n "checking "for --enable-textctrl"""... $ac_c" 1>&6 +echo "configure:5522: checking "for --enable-textctrl"" >&5 + no_cache=0 + # Check whether --enable-textctrl or --disable-textctrl was given. +if test "${enable_textctrl+set}" = set; then + enableval="$enable_textctrl" + + if test "$enableval" = yes; then + ac_cv_use_textctrl='wxUSE_TEXTCTRL=yes' + else + ac_cv_use_textctrl='wxUSE_TEXTCTRL=no' + fi + +else + + LINE=`grep "wxUSE_TEXTCTRL" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_textctrl='wxUSE_TEXTCTRL='$DEFAULT_wxUSE_TEXTCTRL + +fi + + + eval "$ac_cv_use_textctrl" + if test "$no_cache" != 1; then + echo $ac_cv_use_textctrl >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_TEXTCTRL" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + echo $ac_n "checking "for --enable-toolbar"""... $ac_c" 1>&6 -echo "configure:5146: checking "for --enable-toolbar"" >&5 +echo "configure:5561: checking "for --enable-toolbar"" >&5 no_cache=0 # Check whether --enable-toolbar or --disable-toolbar was given. if test "${enable_toolbar+set}" = set; then @@ -5181,7 +5596,7 @@ fi echo $ac_n "checking "for --enable-tbarnative"""... $ac_c" 1>&6 -echo "configure:5185: checking "for --enable-tbarnative"" >&5 +echo "configure:5600: checking "for --enable-tbarnative"" >&5 no_cache=0 # Check whether --enable-tbarnative or --disable-tbarnative was given. if test "${enable_tbarnative+set}" = set; then @@ -5220,7 +5635,7 @@ fi echo $ac_n "checking "for --enable-tbarsmpl"""... $ac_c" 1>&6 -echo "configure:5224: checking "for --enable-tbarsmpl"" >&5 +echo "configure:5639: checking "for --enable-tbarsmpl"" >&5 no_cache=0 # Check whether --enable-tbarsmpl or --disable-tbarsmpl was given. if test "${enable_tbarsmpl+set}" = set; then @@ -5259,7 +5674,7 @@ fi echo $ac_n "checking "for --enable-treectrl"""... $ac_c" 1>&6 -echo "configure:5263: checking "for --enable-treectrl"" >&5 +echo "configure:5678: checking "for --enable-treectrl"" >&5 no_cache=0 # Check whether --enable-treectrl or --disable-treectrl was given. if test "${enable_treectrl+set}" = set; then @@ -5300,7 +5715,7 @@ fi echo $ac_n "checking "for --enable-commondlg"""... $ac_c" 1>&6 -echo "configure:5304: checking "for --enable-commondlg"" >&5 +echo "configure:5719: checking "for --enable-commondlg"" >&5 no_cache=0 # Check whether --enable-commondlg or --disable-commondlg was given. if test "${enable_commondlg+set}" = set; then @@ -5338,8 +5753,164 @@ fi fi + echo $ac_n "checking "for --enable-choicedlg"""... $ac_c" 1>&6 +echo "configure:5758: checking "for --enable-choicedlg"" >&5 + no_cache=0 + # Check whether --enable-choicedlg or --disable-choicedlg was given. +if test "${enable_choicedlg+set}" = set; then + enableval="$enable_choicedlg" + + if test "$enableval" = yes; then + ac_cv_use_choicedlg='wxUSE_CHOICEDLG=yes' + else + ac_cv_use_choicedlg='wxUSE_CHOICEDLG=no' + fi + +else + + LINE=`grep "wxUSE_CHOICEDLG" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_choicedlg='wxUSE_CHOICEDLG='$DEFAULT_wxUSE_CHOICEDLG + +fi + + + eval "$ac_cv_use_choicedlg" + if test "$no_cache" != 1; then + echo $ac_cv_use_choicedlg >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_CHOICEDLG" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + echo $ac_n "checking "for --enable-coldlg"""... $ac_c" 1>&6 +echo "configure:5797: checking "for --enable-coldlg"" >&5 + no_cache=0 + # Check whether --enable-coldlg or --disable-coldlg was given. +if test "${enable_coldlg+set}" = set; then + enableval="$enable_coldlg" + + if test "$enableval" = yes; then + ac_cv_use_coldlg='wxUSE_COLOURDLG=yes' + else + ac_cv_use_coldlg='wxUSE_COLOURDLG=no' + fi + +else + + LINE=`grep "wxUSE_COLOURDLG" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_coldlg='wxUSE_COLOURDLG='$DEFAULT_wxUSE_COLOURDLG + +fi + + + eval "$ac_cv_use_coldlg" + if test "$no_cache" != 1; then + echo $ac_cv_use_coldlg >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_COLOURDLG" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + echo $ac_n "checking "for --enable-filedlg"""... $ac_c" 1>&6 +echo "configure:5836: checking "for --enable-filedlg"" >&5 + no_cache=0 + # Check whether --enable-filedlg or --disable-filedlg was given. +if test "${enable_filedlg+set}" = set; then + enableval="$enable_filedlg" + + if test "$enableval" = yes; then + ac_cv_use_filedlg='wxUSE_FILEDLG=yes' + else + ac_cv_use_filedlg='wxUSE_FILEDLG=no' + fi + +else + + LINE=`grep "wxUSE_FILEDLG" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_filedlg='wxUSE_FILEDLG='$DEFAULT_wxUSE_FILEDLG + +fi + + + eval "$ac_cv_use_filedlg" + if test "$no_cache" != 1; then + echo $ac_cv_use_filedlg >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_FILEDLG" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + echo $ac_n "checking "for --enable-fontdlg"""... $ac_c" 1>&6 +echo "configure:5875: checking "for --enable-fontdlg"" >&5 + no_cache=0 + # Check whether --enable-fontdlg or --disable-fontdlg was given. +if test "${enable_fontdlg+set}" = set; then + enableval="$enable_fontdlg" + + if test "$enableval" = yes; then + ac_cv_use_fontdlg='wxUSE_FONTDLG=yes' + else + ac_cv_use_fontdlg='wxUSE_FONTDLG=no' + fi + +else + + LINE=`grep "wxUSE_FONTDLG" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_fontdlg='wxUSE_FONTDLG='$DEFAULT_wxUSE_FONTDLG + +fi + + + eval "$ac_cv_use_fontdlg" + if test "$no_cache" != 1; then + echo $ac_cv_use_fontdlg >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_FONTDLG" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + echo $ac_n "checking "for --enable-dirdlg"""... $ac_c" 1>&6 -echo "configure:5343: checking "for --enable-dirdlg"" >&5 +echo "configure:5914: checking "for --enable-dirdlg"" >&5 no_cache=0 # Check whether --enable-dirdlg or --disable-dirdlg was given. if test "${enable_dirdlg+set}" = set; then @@ -5377,8 +5948,86 @@ fi fi + echo $ac_n "checking "for --enable-msgdlg"""... $ac_c" 1>&6 +echo "configure:5953: checking "for --enable-msgdlg"" >&5 + no_cache=0 + # Check whether --enable-msgdlg or --disable-msgdlg was given. +if test "${enable_msgdlg+set}" = set; then + enableval="$enable_msgdlg" + + if test "$enableval" = yes; then + ac_cv_use_msgdlg='wxUSE_MSGDLG=yes' + else + ac_cv_use_msgdlg='wxUSE_MSGDLG=no' + fi + +else + + LINE=`grep "wxUSE_MSGDLG" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_msgdlg='wxUSE_MSGDLG='$DEFAULT_wxUSE_MSGDLG + +fi + + + eval "$ac_cv_use_msgdlg" + if test "$no_cache" != 1; then + echo $ac_cv_use_msgdlg >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_MSGDLG" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + echo $ac_n "checking "for --enable-numberdlg"""... $ac_c" 1>&6 +echo "configure:5992: checking "for --enable-numberdlg"" >&5 + no_cache=0 + # Check whether --enable-numberdlg or --disable-numberdlg was given. +if test "${enable_numberdlg+set}" = set; then + enableval="$enable_numberdlg" + + if test "$enableval" = yes; then + ac_cv_use_numberdlg='wxUSE_NUMBERDLG=yes' + else + ac_cv_use_numberdlg='wxUSE_NUMBERDLG=no' + fi + +else + + LINE=`grep "wxUSE_NUMBERDLG" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_numberdlg='wxUSE_NUMBERDLG='$DEFAULT_wxUSE_NUMBERDLG + +fi + + + eval "$ac_cv_use_numberdlg" + if test "$no_cache" != 1; then + echo $ac_cv_use_numberdlg >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_NUMBERDLG" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + echo $ac_n "checking "for --enable-textdlg"""... $ac_c" 1>&6 -echo "configure:5382: checking "for --enable-textdlg"" >&5 +echo "configure:6031: checking "for --enable-textdlg"" >&5 no_cache=0 # Check whether --enable-textdlg or --disable-textdlg was given. if test "${enable_textdlg+set}" = set; then @@ -5417,7 +6066,7 @@ fi echo $ac_n "checking "for --enable-tipdlg"""... $ac_c" 1>&6 -echo "configure:5421: checking "for --enable-tipdlg"" >&5 +echo "configure:6070: checking "for --enable-tipdlg"" >&5 no_cache=0 # Check whether --enable-tipdlg or --disable-tipdlg was given. if test "${enable_tipdlg+set}" = set; then @@ -5456,7 +6105,7 @@ fi echo $ac_n "checking "for --enable-progressdlg"""... $ac_c" 1>&6 -echo "configure:5460: checking "for --enable-progressdlg"" >&5 +echo "configure:6109: checking "for --enable-progressdlg"" >&5 no_cache=0 # Check whether --enable-progressdlg or --disable-progressdlg was given. if test "${enable_progressdlg+set}" = set; then @@ -5495,7 +6144,7 @@ fi echo $ac_n "checking "for --enable-miniframe"""... $ac_c" 1>&6 -echo "configure:5499: checking "for --enable-miniframe"" >&5 +echo "configure:6148: checking "for --enable-miniframe"" >&5 no_cache=0 # Check whether --enable-miniframe or --disable-miniframe was given. if test "${enable_miniframe+set}" = set; then @@ -5534,7 +6183,7 @@ fi echo $ac_n "checking "for --enable-html"""... $ac_c" 1>&6 -echo "configure:5538: checking "for --enable-html"" >&5 +echo "configure:6187: checking "for --enable-html"" >&5 no_cache=0 # Check whether --enable-html or --disable-html was given. if test "${enable_html+set}" = set; then @@ -5573,7 +6222,7 @@ fi echo $ac_n "checking "for --enable-tooltips"""... $ac_c" 1>&6 -echo "configure:5577: checking "for --enable-tooltips"" >&5 +echo "configure:6226: checking "for --enable-tooltips"" >&5 no_cache=0 # Check whether --enable-tooltips or --disable-tooltips was given. if test "${enable_tooltips+set}" = set; then @@ -5612,7 +6261,7 @@ fi echo $ac_n "checking "for --enable-splines"""... $ac_c" 1>&6 -echo "configure:5616: checking "for --enable-splines"" >&5 +echo "configure:6265: checking "for --enable-splines"" >&5 no_cache=0 # Check whether --enable-splines or --disable-splines was given. if test "${enable_splines+set}" = set; then @@ -5651,7 +6300,7 @@ fi echo $ac_n "checking "for --enable-validators"""... $ac_c" 1>&6 -echo "configure:5655: checking "for --enable-validators"" >&5 +echo "configure:6304: checking "for --enable-validators"" >&5 no_cache=0 # Check whether --enable-validators or --disable-validators was given. if test "${enable_validators+set}" = set; then @@ -5690,7 +6339,7 @@ fi echo $ac_n "checking "for --enable-busyinfo"""... $ac_c" 1>&6 -echo "configure:5694: checking "for --enable-busyinfo"" >&5 +echo "configure:6343: checking "for --enable-busyinfo"" >&5 no_cache=0 # Check whether --enable-busyinfo or --disable-busyinfo was given. if test "${enable_busyinfo+set}" = set; then @@ -5729,7 +6378,7 @@ fi echo $ac_n "checking "for --enable-plot"""... $ac_c" 1>&6 -echo "configure:5733: checking "for --enable-plot"" >&5 +echo "configure:6382: checking "for --enable-plot"" >&5 no_cache=0 # Check whether --enable-plot or --disable-plot was given. if test "${enable_plot+set}" = set; then @@ -5768,7 +6417,7 @@ fi echo $ac_n "checking "for --enable-joystick"""... $ac_c" 1>&6 -echo "configure:5772: checking "for --enable-joystick"" >&5 +echo "configure:6421: checking "for --enable-joystick"" >&5 no_cache=0 # Check whether --enable-joystick or --disable-joystick was given. if test "${enable_joystick+set}" = set; then @@ -5809,7 +6458,7 @@ fi echo $ac_n "checking "for --enable-gif"""... $ac_c" 1>&6 -echo "configure:5813: checking "for --enable-gif"" >&5 +echo "configure:6462: checking "for --enable-gif"" >&5 no_cache=0 # Check whether --enable-gif or --disable-gif was given. if test "${enable_gif+set}" = set; then @@ -5848,7 +6497,7 @@ fi echo $ac_n "checking "for --enable-pcx"""... $ac_c" 1>&6 -echo "configure:5852: checking "for --enable-pcx"" >&5 +echo "configure:6501: checking "for --enable-pcx"" >&5 no_cache=0 # Check whether --enable-pcx or --disable-pcx was given. if test "${enable_pcx+set}" = set; then @@ -5887,7 +6536,7 @@ fi echo $ac_n "checking "for --enable-pnm"""... $ac_c" 1>&6 -echo "configure:5891: checking "for --enable-pnm"" >&5 +echo "configure:6540: checking "for --enable-pnm"" >&5 no_cache=0 # Check whether --enable-pnm or --disable-pnm was given. if test "${enable_pnm+set}" = set; then @@ -5934,7 +6583,7 @@ fi echo $ac_n "checking for toolkit""... $ac_c" 1>&6 -echo "configure:5938: checking for toolkit" >&5 +echo "configure:6587: checking for toolkit" >&5 if test "$wxUSE_GUI" = "yes"; then @@ -6067,7 +6716,7 @@ fi # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:6071: checking for $ac_word" >&5 +echo "configure:6720: 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 @@ -6097,7 +6746,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:6101: checking for $ac_word" >&5 +echo "configure:6750: 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 @@ -6148,7 +6797,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:6152: checking for $ac_word" >&5 +echo "configure:6801: 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 @@ -6180,7 +6829,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:6184: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:6833: 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. @@ -6191,12 +6840,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 6195 "configure" +#line 6844 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:6200: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6849: \"$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 @@ -6222,12 +6871,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:6226: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:6875: 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:6231: checking whether we are using GNU C" >&5 +echo "configure:6880: 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 @@ -6236,7 +6885,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:6240: \"$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:6889: \"$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 @@ -6255,7 +6904,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:6259: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:6908: 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 @@ -6290,7 +6939,7 @@ fi CFLAGS=`echo "$CFLAGS" | sed 's/-g//g'` echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:6294: checking how to run the C preprocessor" >&5 +echo "configure:6943: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -6305,13 +6954,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:6315: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6964: \"$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 : @@ -6322,13 +6971,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:6332: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6981: \"$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 : @@ -6339,13 +6988,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:6349: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6998: \"$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 : @@ -6372,13 +7021,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:6376: checking whether ${CC-cc} needs -traditional" >&5 +echo "configure:7025: 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 @@ -6396,7 +7045,7 @@ rm -f conftest* if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext < Autoconf TCGETA @@ -6432,7 +7081,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:6436: checking for $ac_word" >&5 +echo "configure:7085: 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 @@ -6464,7 +7113,7 @@ test -n "$CXX" || CXX="gcc" echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:6468: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 +echo "configure:7117: 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. @@ -6475,12 +7124,12 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext << EOF -#line 6479 "configure" +#line 7128 "configure" #include "confdefs.h" int main(){return(0);} EOF -if { (eval echo configure:6484: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7133: \"$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 @@ -6506,12 +7155,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:6510: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:7159: 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:6515: checking whether we are using GNU C++" >&5 +echo "configure:7164: 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 @@ -6520,7 +7169,7 @@ else yes; #endif EOF -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:6524: \"$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:7173: \"$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 @@ -6539,7 +7188,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:6543: checking whether ${CXX-g++} accepts -g" >&5 +echo "configure:7192: 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 @@ -6572,7 +7221,7 @@ fi echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 -echo "configure:6576: checking how to run the C++ preprocessor" >&5 +echo "configure:7225: 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 @@ -6585,12 +7234,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:6594: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7243: \"$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 : @@ -6628,7 +7277,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:6632: checking for $ac_word" >&5 +echo "configure:7281: 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 @@ -6659,7 +7308,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:6663: checking for $ac_word" >&5 +echo "configure:7312: 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 @@ -6699,7 +7348,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:6703: checking for a BSD compatible install" >&5 +echo "configure:7352: 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 @@ -6755,7 +7404,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:6759: checking for $ac_word" >&5 +echo "configure:7408: 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 @@ -6784,7 +7433,7 @@ fi echo $ac_n "checking "make for VPATH support"""... $ac_c" 1>&6 -echo "configure:6788: checking "make for VPATH support"" >&5 +echo "configure:7437: checking "make for VPATH support"" >&5 cat - << EOF > confMake check : file cp \$? \$@ @@ -6813,7 +7462,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:6817: checking for $ac_word" >&5 +echo "configure:7466: 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 @@ -6847,7 +7496,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:6851: checking for $ac_word" >&5 +echo "configure:7500: 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 @@ -6881,7 +7530,7 @@ then *) ac_lib=l ;; esac echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6 -echo "configure:6885: checking for yywrap in -l$ac_lib" >&5 +echo "configure:7534: 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 @@ -6889,7 +7538,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:7553: \"$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 @@ -6924,7 +7573,7 @@ fi echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:6928: checking whether ln -s works" >&5 +echo "configure:7577: 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 @@ -7068,32 +7717,31 @@ rm -f confcache AFMINSTALL= if test "$wxUSE_GUI" = "yes"; then + USE_GUI=1 -USE_GUI=1 + TOOLKIT= + TOOLKIT_INCLUDE= -TOOLKIT= -TOOLKIT_INCLUDE= + GUIOBJS= + COMMONOBJS= + GENERICOBJS= -GUIOBJS= -COMMONOBJS= -GENERICOBJS= + GUI_TK_LIBRARY= + GUI_TK_LINK= -GUI_TK_LIBRARY= -GUI_TK_LINK= + WXGTK12= + WXGTK127= + WXGTK20= -WXGTK12= -WXGTK127= -WXGTK20= + WXWINE= -WXWINE= - -if test "$wxUSE_CYGWIN" = 1 || test "$wxUSE_MINGW" = 1 ; then - if test "$cross_compiling" = "yes" ; then - echo "configure: warning: skipping windows.h check for cross-compilation" 1>&2 - else - echo $ac_n "checking for Windows headers""... $ac_c" 1>&6 -echo "configure:7096: checking for Windows headers" >&5 - + if test "$wxUSE_CYGWIN" = 1 || test "$wxUSE_MINGW" = 1 ; then + if test "$cross_compiling" = "yes" ; then + echo "configure: warning: skipping windows.h check for cross-compilation" 1>&2 + else + echo $ac_n "checking for Windows headers""... $ac_c" 1>&6 +echo "configure:7744: checking for Windows headers" >&5 + ac_find_includes= for ac_dir in $SEARCH_INCLUDE; do @@ -7103,48 +7751,47 @@ for ac_dir in $SEARCH_INCLUDE; fi done - if test "$ac_find_includes" != "" ; then - echo "$ac_t""found $ac_find_includes" 1>&6 - TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE -I$ac_find_includes" - else - echo "$ac_t""no" 1>&6 - { echo "configure: error: please set CFLAGS to contain the location of windows.h" 1>&2; exit 1; } + if test "$ac_find_includes" != "" ; then + echo "$ac_t""found $ac_find_includes" 1>&6 + TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE -I$ac_find_includes" + else + echo "$ac_t""no" 1>&6 + { echo "configure: error: please set CFLAGS to contain the location of windows.h" 1>&2; exit 1; } + fi fi + + INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS msw" + LIBS="$LIBS -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lctl3d32 -lcrtdll -ladvapi32 -lwsock32" + + if test "$wxUSE_ODBC" = "yes" ; then + LIBS="$LIBS -lodbc32 -lole32 -loleaut32" + fi + + if test "$wxUSE_MINGW" = 1; then + LDFLAGS="$LDFLAGS -mwindows" + fi + + TOOLKIT=MSW + + GUIOBJS="\$(MSW_GUIOBJS)" + GUIHEADERS="\$(MSW_HEADERS)" + COMMONOBJS="\$(MSW_COMMONOBJS)" + GENERICOBJS="\$(MSW_GENERICOBJS)" + UNIXOBJS= + GUIDIST=MSW_DIST + + RCINCSWITCH="--include-dir" + RCDEFSWITCH="--define" + RCPREPROCESSOR="--preprocessor \"\$(CC) -c -E -xc-header -DRC_INVOKED\"" + RCINPUTSWITCH="-i" + RCOUTPUTSWITCH="-o" + RESFLAGS="$RCPREPROCESSOR $RCINCSWITCH \$(top_srcdir)/include $RCINCSWITCH \$(top_srcdir)/\$(program_dir) $RCDEFSWITCH __WIN32__ $RCDEFSWITCH __WIN95__ $RCDEFSWITCH __GNUWIN32__" + + RESPROGRAM="\$(RES_PROGRAM)" fi - INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS msw" - LIBS="$LIBS -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lctl3d32 -lcrtdll -ladvapi32 -lwsock32" - - if test "$wxUSE_ODBC" = "yes" ; then - LIBS="$LIBS -lodbc32 -lole32 -loleaut32" - fi - - if test "$wxUSE_MINGW" = 1; then - LDFLAGS="$LDFLAGS -mwindows" - fi - - TOOLKIT=MSW - - GUIOBJS="\$(MSW_GUIOBJS)" - GUIHEADERS="\$(MSW_HEADERS)" - COMMONOBJS="\$(MSW_COMMONOBJS)" - GENERICOBJS="\$(MSW_GENERICOBJS)" - UNIXOBJS= - GUIDIST=MSW_DIST - - RCINCSWITCH="--include-dir" - RCDEFSWITCH="--define" - RCPREPROCESSOR="--preprocessor \"\$(CC) -c -E -xc-header -DRC_INVOKED\"" - RCINPUTSWITCH="-i" - RCOUTPUTSWITCH="-o" - RESFLAGS="$RCPREPROCESSOR $RCINCSWITCH \$(top_srcdir)/include $RCINCSWITCH \$(top_srcdir)/\$(program_dir) $RCDEFSWITCH __WIN32__ $RCDEFSWITCH __WIN95__ $RCDEFSWITCH __GNUWIN32__" - - RESPROGRAM="\$(RES_PROGRAM)" - -fi - -if test "$wxUSE_GTK" = 1; then - # Check whether --with-gtk-prefix or --without-gtk-prefix was given. + if test "$wxUSE_GTK" = 1; then + # Check whether --with-gtk-prefix or --without-gtk-prefix was given. if test "${with_gtk_prefix+set}" = set; then withval="$with_gtk_prefix" gtk_config_prefix="$withval" @@ -7194,7 +7841,7 @@ fi # Extract the first word of "gtk-config-2.0", so it can be a program name with args. set dummy gtk-config-2.0; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:7198: checking for $ac_word" >&5 +echo "configure:7845: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG_2_0'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7229,7 +7876,7 @@ fi min_gtk_version=1.3.1 echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6 -echo "configure:7233: checking for GTK - version >= $min_gtk_version" >&5 +echo "configure:7880: checking for GTK - version >= $min_gtk_version" >&5 no_gtk="" if test "$GTK_CONFIG_2_0" = "no" ; then no_gtk=yes @@ -7252,7 +7899,7 @@ echo "configure:7233: checking for GTK - version >= $min_gtk_version" >&5 echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < @@ -7330,7 +7977,7 @@ main () } EOF -if { (eval echo configure:7334: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7981: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -7364,7 +8011,7 @@ fi CFLAGS="$CFLAGS $GTK_CFLAGS" LIBS="$LIBS $GTK_LIBS" cat > conftest.$ac_ext < @@ -7374,7 +8021,7 @@ int main() { return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ; return 0; } EOF -if { (eval echo configure:7378: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8025: \"$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" @@ -7407,7 +8054,7 @@ rm -f conftest* GTK_CFLAGS="" GTK_LIBS="" - + if test x$gtk_config_exec_prefix != x ; then gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix" if test x${GTK_CONFIG+set} != xset ; then @@ -7424,7 +8071,7 @@ rm -f conftest* # Extract the first word of "gtk-config", so it can be a program name with args. set dummy gtk-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:7428: checking for $ac_word" >&5 +echo "configure:8075: 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 @@ -7459,7 +8106,7 @@ fi min_gtk_version=1.2.7 echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6 -echo "configure:7463: checking for GTK - version >= $min_gtk_version" >&5 +echo "configure:8110: checking for GTK - version >= $min_gtk_version" >&5 no_gtk="" if test "$GTK_CONFIG" != "no" ; then GTK_CFLAGS=`$GTK_CONFIG --cflags` @@ -7472,7 +8119,7 @@ echo "configure:7463: checking for GTK - version >= $min_gtk_version" >&5 echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < @@ -7505,7 +8152,7 @@ main () } EOF -if { (eval echo configure:7509: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:8156: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -7534,7 +8181,7 @@ fi - + if test x$gtk_config_exec_prefix != x ; then gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix" if test x${GTK_CONFIG+set} != xset ; then @@ -7551,7 +8198,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:7555: checking for $ac_word" >&5 +echo "configure:8202: 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 @@ -7586,7 +8233,7 @@ fi min_gtk_version=1.2.3 echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6 -echo "configure:7590: checking for GTK - version >= $min_gtk_version" >&5 +echo "configure:8237: checking for GTK - version >= $min_gtk_version" >&5 no_gtk="" if test "$GTK_CONFIG" != "no" ; then GTK_CFLAGS=`$GTK_CONFIG --cflags` @@ -7599,7 +8246,7 @@ echo "configure:7590: checking for GTK - version >= $min_gtk_version" >&5 echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < @@ -7632,7 +8279,7 @@ main () } EOF -if { (eval echo configure:7636: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:8283: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -7661,44 +8308,44 @@ fi - + fi rm -f conf.gtktest - if test "$WXGTK12" != 1 -a "$WXGTK20" != 1; then - { echo "configure: error: - Please check that gtk-config is in path, the directory - where GTK+ libraries are installed (returned by - 'gtk-config --libs' command) is in LD_LIBRARY_PATH or - equivalent variable and GTK+ is version 1.2.3 or above. - " 1>&2; exit 1; } - fi + if test "$WXGTK12" != 1 -a "$WXGTK20" != 1; then + { echo "configure: error: + Please check that gtk-config is in path, the directory + where GTK+ libraries are installed (returned by + 'gtk-config --libs' command) is in LD_LIBRARY_PATH or + equivalent variable and GTK+ is version 1.2.3 or above. + " 1>&2; exit 1; } + fi - TOOLKIT_INCLUDE="$GTK_CFLAGS" + TOOLKIT_INCLUDE="$GTK_CFLAGS" + + GUI_TK_LIBRARY="$GTK_LIBS" - GUI_TK_LIBRARY="$GTK_LIBS" + TOOLKIT=GTK - TOOLKIT=GTK + AFMINSTALL=afminstall - AFMINSTALL=afminstall + GUIOBJS="\$(GTK_GUIOBJS)" + GUIHEADERS="\$(GTK_HEADERS)" + COMMONOBJS="\$(GTK_COMMONOBJS)" + GENERICOBJS="\$(GTK_GENERICOBJS)" + GUIDEPS="\$(GTK_GUIDEPS)" + COMMONDEPS="\$(GTK_COMMONDEPS)" + GENERICDEPS="\$(GTK_GENERICDEPS)" + UNIXOBJS="\$(UNIX_OBJS)" + UNIXDEPS="\$(UNIX_DEPS)" + GUIDIST=GTK_DIST - GUIOBJS="\$(GTK_GUIOBJS)" - GUIHEADERS="\$(GTK_HEADERS)" - COMMONOBJS="\$(GTK_COMMONOBJS)" - GENERICOBJS="\$(GTK_GENERICOBJS)" - GUIDEPS="\$(GTK_GUIDEPS)" - COMMONDEPS="\$(GTK_COMMONDEPS)" - GENERICDEPS="\$(GTK_GENERICDEPS)" - UNIXOBJS="\$(UNIX_OBJS)" - UNIXDEPS="\$(UNIX_DEPS)" - GUIDIST=GTK_DIST - - echo $ac_n "checking for gdk_im_open in -lgdk""... $ac_c" 1>&6 -echo "configure:7702: checking for gdk_im_open in -lgdk" >&5 + echo $ac_n "checking for gdk_im_open in -lgdk""... $ac_c" 1>&6 +echo "configure:8349: 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 @@ -7706,7 +8353,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:8368: \"$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 @@ -7740,12 +8387,12 @@ else echo "$ac_t""no" 1>&6 fi -fi + fi -if test "$wxUSE_WINE" = 1; then - echo $ac_n "checking for WINE includes""... $ac_c" 1>&6 -echo "configure:7748: checking for WINE includes" >&5 - + if test "$wxUSE_WINE" = 1; then + echo $ac_n "checking for WINE includes""... $ac_c" 1>&6 +echo "configure:8395: checking for WINE includes" >&5 + ac_find_includes= for ac_dir in $SEARCH_INCLUDE; do @@ -7755,18 +8402,18 @@ for ac_dir in $SEARCH_INCLUDE; fi done - if test "$ac_find_includes" != "" ; then - echo "$ac_t""found $ac_find_includes" 1>&6 - TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE -I$ac_find_includes" - else - echo "$ac_t""no" 1>&6 - { echo "configure: error: please set CFLAGS to contain the location of windows.h" 1>&2; exit 1; } - fi + if test "$ac_find_includes" != "" ; then + echo "$ac_t""found $ac_find_includes" 1>&6 + TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE -I$ac_find_includes" + else + echo "$ac_t""no" 1>&6 + { echo "configure: error: please set CFLAGS to contain the location of windows.h" 1>&2; exit 1; } + fi - XPM_LINK="" - echo $ac_n "checking for Xpm library""... $ac_c" 1>&6 -echo "configure:7769: checking for Xpm library" >&5 - + XPM_LINK="" + echo $ac_n "checking for Xpm library""... $ac_c" 1>&6 +echo "configure:8416: checking for Xpm library" >&5 + ac_find_libraries= for ac_dir in $SEARCH_LIB; do @@ -7778,23 +8425,23 @@ for ac_dir in $SEARCH_LIB; done done - if test "$ac_find_libraries" != "" ; then - GUI_TK_LIBRARY="-L$ac_find_libraries" - XPM_LINK="-lXpm" - cat >> confdefs.h <<\EOF + if test "$ac_find_libraries" != "" ; then + GUI_TK_LIBRARY="-L$ac_find_libraries" + XPM_LINK="-lXpm" + cat >> confdefs.h <<\EOF #define wxHAVE_LIB_XPM 1 EOF - echo "$ac_t""found at $ac_find_libraries" 1>&6 - else - echo "$ac_t""no" 1>&6 - echo "configure: warning: library will be compiled without support for images in XPM format" 1>&2 - fi + echo "$ac_t""found at $ac_find_libraries" 1>&6 + else + echo "$ac_t""no" 1>&6 + echo "configure: warning: library will be compiled without support for images in XPM format" 1>&2 + fi - MESA_LINK="" - echo $ac_n "checking for Mesa library""... $ac_c" 1>&6 -echo "configure:7797: checking for Mesa library" >&5 - + MESA_LINK="" + echo $ac_n "checking for Mesa library""... $ac_c" 1>&6 +echo "configure:8444: checking for Mesa library" >&5 + ac_find_libraries= for ac_dir in $SEARCH_LIB; do @@ -7806,38 +8453,38 @@ for ac_dir in $SEARCH_LIB; done done - if test "$ac_find_libraries" != "" ; then - GUI_TK_LIBRARY="$GUI_TK_LIBRARY -L$ac_find_libraries" - MESA_LINK="-lMesaGL" - echo "$ac_t""found at $ac_find_libraries" 1>&6 - else - { echo "configure: error: no" 1>&2; exit 1; } + if test "$ac_find_libraries" != "" ; then + GUI_TK_LIBRARY="$GUI_TK_LIBRARY -L$ac_find_libraries" + MESA_LINK="-lMesaGL" + echo "$ac_t""found at $ac_find_libraries" 1>&6 + else + { echo "configure: error: no" 1>&2; exit 1; } + fi + + GUI_TK_LINK="-lwine $MESA_LINK $XPM_LINK -lXxf86dga -lXxf86vm -lSM -lICE -lXext -lXmu -lX11 -lncurses" + GUI_TK_LIBRARY="$GUI_TK_LIBRARY $GUI_TK_LINK" + WXWINE=1 + TOOLKIT=MSW + + GUIHEADERS="\$(MSW_HEADERS)" + GUIOBJS="\$(MSW_GUIOBJS)" + COMMONOBJS="\$(MSW_COMMONOBJS)" + GENERICOBJS="\$(MSW_GENERICOBJS)" + GUIDEPS="\$(MSW_GUIDEPS)" + COMMONDEPS="\$(MSW_COMMONDEPS)" + GENERICDEPS="\$(MSW_GENERICDEPS)" + UNIXOBJS="\$(UNIX_OBJS)" + UNIXDEPS="\$(UNIX_DEPS)" + GUIDIST=MSW_DIST fi - GUI_TK_LINK="-lwine $MESA_LINK $XPM_LINK -lXxf86dga -lXxf86vm -lSM -lICE -lXext -lXmu -lX11 -lncurses" - GUI_TK_LIBRARY="$GUI_TK_LIBRARY $GUI_TK_LINK" - WXWINE=1 - TOOLKIT=MSW - - GUIHEADERS="\$(MSW_HEADERS)" - GUIOBJS="\$(MSW_GUIOBJS)" - COMMONOBJS="\$(MSW_COMMONOBJS)" - GENERICOBJS="\$(MSW_GENERICOBJS)" - GUIDEPS="\$(MSW_GUIDEPS)" - COMMONDEPS="\$(MSW_COMMONDEPS)" - GENERICDEPS="\$(MSW_GENERICDEPS)" - UNIXOBJS="\$(UNIX_OBJS)" - UNIXDEPS="\$(UNIX_DEPS)" - GUIDIST=MSW_DIST -fi - -if test "$wxUSE_MOTIF" = 1; then - # If we find X, set shell vars x_includes and x_libraries to the + + # If we find X, set shell vars x_includes and x_libraries to the # paths, otherwise set no_x=yes. # 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:7841: checking for X" >&5 +echo "configure:8488: checking for X" >&5 # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then @@ -7899,12 +8546,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:7908: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8555: \"$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* @@ -7973,14 +8620,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:8631: \"$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. @@ -8086,17 +8733,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:8090: checking whether -R must be followed by a space" >&5 +echo "configure:8737: 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:8747: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_nospace=yes else @@ -8112,14 +8759,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:8770: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_space=yes else @@ -8151,7 +8798,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:8155: checking for dnet_ntoa in -ldnet" >&5 +echo "configure:8802: 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 @@ -8159,7 +8806,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:8821: \"$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 @@ -8192,7 +8839,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:8196: checking for dnet_ntoa in -ldnet_stub" >&5 +echo "configure:8843: 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 @@ -8200,7 +8847,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:8862: \"$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 @@ -8240,12 +8887,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:8244: checking for gethostbyname" >&5 +echo "configure:8891: 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:8919: \"$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 @@ -8289,7 +8936,7 @@ fi if test $ac_cv_func_gethostbyname = no; then echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:8293: checking for gethostbyname in -lnsl" >&5 +echo "configure:8940: 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 @@ -8297,7 +8944,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:8959: \"$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 @@ -8338,12 +8985,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:8342: checking for connect" >&5 +echo "configure:8989: 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:9017: \"$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 @@ -8387,7 +9034,7 @@ fi if test $ac_cv_func_connect = no; then echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 -echo "configure:8391: checking for connect in -lsocket" >&5 +echo "configure:9038: 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 @@ -8395,7 +9042,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:9057: \"$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 @@ -8430,12 +9077,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:8434: checking for remove" >&5 +echo "configure:9081: 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:9109: \"$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 @@ -8479,7 +9126,7 @@ fi if test $ac_cv_func_remove = no; then echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 -echo "configure:8483: checking for remove in -lposix" >&5 +echo "configure:9130: 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 @@ -8487,7 +9134,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:9149: \"$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 @@ -8522,12 +9169,12 @@ fi # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. echo $ac_n "checking for shmat""... $ac_c" 1>&6 -echo "configure:8526: checking for shmat" >&5 +echo "configure:9173: 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:9201: \"$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 @@ -8571,7 +9218,7 @@ fi if test $ac_cv_func_shmat = no; then echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 -echo "configure:8575: checking for shmat in -lipc" >&5 +echo "configure:9222: 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 @@ -8579,7 +9226,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:9241: \"$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 @@ -8623,7 +9270,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:8627: checking for IceConnectionNumber in -lICE" >&5 +echo "configure:9274: 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 @@ -8631,7 +9278,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:9293: \"$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 @@ -8666,22 +9313,25 @@ fi fi + CPPFLAGS="$CPPFLAGS $X_CFLAGS" + LDFLAGS="$LDFLAGS $X_LIBS" - if test "$no_x" = "yes"; then - { echo "configure: error: X11 not found" 1>&2; exit 1; } - fi + if test "$wxUSE_MOTIF" = 1; then + if test "$no_x" = "yes"; then + { echo "configure: error: X11 not found" 1>&2; exit 1; } + fi - GUI_TK_LIBRARY="$X_LIBS" - TOOLKIT_INCLUDE="$X_CFLAGS" + GUI_TK_LIBRARY="$X_LIBS" + TOOLKIT_INCLUDE="$X_CFLAGS" - AFMINSTALL=afminstall + AFMINSTALL=afminstall - - COMPILED_X_PROGRAM=0 + + COMPILED_X_PROGRAM=0 - echo $ac_n "checking for Motif/Lesstif headers""... $ac_c" 1>&6 -echo "configure:8684: checking for Motif/Lesstif headers" >&5 - + echo $ac_n "checking for Motif/Lesstif headers""... $ac_c" 1>&6 +echo "configure:9334: checking for Motif/Lesstif headers" >&5 + ac_find_includes= for ac_dir in $SEARCH_INCLUDE; do @@ -8691,84 +9341,11 @@ for ac_dir in $SEARCH_INCLUDE; fi done - if test "$ac_find_includes" != "" ; then - echo "$ac_t""found $ac_find_includes" 1>&6 - else - cat > conftest.$ac_ext < - -int main() { - - int version; - - version = xmUseVersion; - -; return 0; } -EOF -if { (eval echo configure:8712: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - - echo "$ac_t""found in default search path" 1>&6 - COMPILED_X_PROGRAM=1 - -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - - echo "$ac_t""no" 1>&6 - { echo "configure: error: please set CFLAGS to contain the location of Xm/Xm.h" 1>&2; exit 1; } - - -fi -rm -f conftest* - fi - - if test "$COMPILED_X_PROGRAM" = 0; then - echo $ac_n "checking for Motif/Lesstif library""... $ac_c" 1>&6 -echo "configure:8733: checking for Motif/Lesstif library" >&5 - -ac_find_libraries= -for ac_dir in $SEARCH_LIB; - do - for ac_extension in a so sl; do - if test -f "$ac_dir/libXm.$ac_extension"; then - ac_find_libraries=$ac_dir - break 2 - fi - done - done - - if test "$ac_find_libraries" != "" ; then - - ac_path_to_include=$ac_find_includes - echo "$TOOLKIT_INCLUDE" | grep "\-I$ac_find_includes" > /dev/null - result=$? - if test $result = 0; then - ac_path_to_include="" - else - ac_path_to_include="-I$ac_find_includes" - fi - - - echo "$GUI_TK_LIBRARY" | grep "\-L$ac_find_libraries" > /dev/null - result=$? - if test $result = 0; then - ac_path_to_link="" - else - ac_path_to_link="-L$ac_find_libraries" - fi - - - GUI_TK_LIBRARY="$GUI_TK_LIBRARY $ac_path_to_link" - TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE $ac_path_to_include" - echo "$ac_t""found at $ac_find_libraries" 1>&6 + if test "$ac_find_includes" != "" ; then + echo "$ac_t""found $ac_find_includes" 1>&6 else - cat > conftest.$ac_ext < conftest.$ac_ext < @@ -8781,7 +9358,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:8785: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9362: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""found in default search path" 1>&6 @@ -8793,19 +9370,92 @@ else rm -rf conftest* echo "$ac_t""no" 1>&6 - { echo "configure: error: please set LDFLAGS to contain the location of libXm" 1>&2; exit 1; } + { echo "configure: error: please set CFLAGS to contain the location of Xm/Xm.h" 1>&2; exit 1; } fi rm -f conftest* fi - fi - - XPM_LINK="" - echo $ac_n "checking for Xpm library""... $ac_c" 1>&6 -echo "configure:8808: checking for Xpm library" >&5 - + if test "$COMPILED_X_PROGRAM" = 0; then + echo $ac_n "checking for Motif/Lesstif library""... $ac_c" 1>&6 +echo "configure:9383: checking for Motif/Lesstif library" >&5 + +ac_find_libraries= +for ac_dir in $SEARCH_LIB; + do + for ac_extension in a so sl; do + if test -f "$ac_dir/libXm.$ac_extension"; then + ac_find_libraries=$ac_dir + break 2 + fi + done + done + + if test "$ac_find_libraries" != "" ; then + + ac_path_to_include=$ac_find_includes + echo "$TOOLKIT_INCLUDE" | grep "\-I$ac_find_includes" > /dev/null + result=$? + if test $result = 0; then + ac_path_to_include="" + else + ac_path_to_include="-I$ac_find_includes" + fi + + + echo "$GUI_TK_LIBRARY" | grep "\-L$ac_find_libraries" > /dev/null + result=$? + if test $result = 0; then + ac_path_to_link="" + else + ac_path_to_link="-L$ac_find_libraries" + fi + + + GUI_TK_LIBRARY="$GUI_TK_LIBRARY $ac_path_to_link" + TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE $ac_path_to_include" + echo "$ac_t""found at $ac_find_libraries" 1>&6 + else + cat > conftest.$ac_ext < + +int main() { + + int version; + + version = xmUseVersion; + +; return 0; } +EOF +if { (eval echo configure:9435: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + + echo "$ac_t""found in default search path" 1>&6 + COMPILED_X_PROGRAM=1 + +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + + echo "$ac_t""no" 1>&6 + { echo "configure: error: please set LDFLAGS to contain the location of libXm" 1>&2; exit 1; } + + +fi +rm -f conftest* + fi + fi + + + XPM_LINK="" + echo $ac_n "checking for Xpm library""... $ac_c" 1>&6 +echo "configure:9458: checking for Xpm library" >&5 + ac_find_libraries= for ac_dir in $SEARCH_LIB; do @@ -8817,8 +9467,8 @@ for ac_dir in $SEARCH_LIB; done done - if test "$ac_find_libraries" != "" ; then - + if test "$ac_find_libraries" != "" ; then + echo "$GUI_TK_LIBRARY" | grep "\-L$ac_find_libraries" > /dev/null result=$? if test $result = 0; then @@ -8827,100 +9477,115 @@ for ac_dir in $SEARCH_LIB; ac_path_to_link="-L$ac_find_libraries" fi - GUI_TK_LIBRARY="$GUI_TK_LIBRARY $ac_path_to_link" - XPM_LINK="-lXpm " - cat >> confdefs.h <<\EOF -#define wxHAVE_LIB_XPM 1 -EOF - - echo "$ac_t""found at $ac_find_libraries" 1>&6 - else - cat > conftest.$ac_ext < - -int main() { - - int version; - - version = XpmLibraryVersion(); - -; return 0; } -EOF -if { (eval echo configure:8853: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - + GUI_TK_LIBRARY="$GUI_TK_LIBRARY $ac_path_to_link" XPM_LINK="-lXpm " cat >> confdefs.h <<\EOF #define wxHAVE_LIB_XPM 1 EOF - echo "$ac_t""found in default search path" 1>&6 - COMPILED_X_PROGRAM=0 - + echo "$ac_t""found at $ac_find_libraries" 1>&6 + else + cat > conftest.$ac_ext < + +int main() { + + int version; + + version = XpmLibraryVersion(); + +; return 0; } +EOF +if { (eval echo configure:9503: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + + XPM_LINK="-lXpm " + cat >> confdefs.h <<\EOF +#define wxHAVE_LIB_XPM 1 +EOF + + echo "$ac_t""found in default search path" 1>&6 + COMPILED_X_PROGRAM=0 + else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* - echo "$ac_t""no" 1>&6 - echo "configure: warning: library will be compiled without support for images in XPM format" 1>&2 + echo "$ac_t""no" 1>&6 + echo "configure: warning: library will be compiled without support for images in XPM format" 1>&2 + - fi rm -f conftest* + fi + + GUI_TK_LINK="-lXm $XPM_LINK -lXmu -lXext -lXt -lX11" + GUI_TK_LIBRARY="$GUI_TK_LIBRARY $GUI_TK_LINK" + TOOLKIT=MOTIF + + GUIHEADERS="\$(MOTIF_HEADERS)" + GUIOBJS="\$(MOTIF_GUIOBJS)" + COMMONOBJS="\$(MOTIF_COMMONOBJS)" + GENERICOBJS="\$(MOTIF_GENERICOBJS)" + GUIDEPS="\$(MOTIF_GUIDEPS)" + COMMONDEPS="\$(MOTIF_COMMONDEPS)" + GENERICDEPS="\$(MOTIF_GENERICDEPS)" + UNIXOBJS="\$(UNIX_OBJS)" + UNIXDEPS="\$(UNIX_DEPS)" + GUIDIST=MOTIF_DIST fi - GUI_TK_LINK="-lXm $XPM_LINK -lXmu -lXext -lXt -lX11" - GUI_TK_LIBRARY="$GUI_TK_LIBRARY $GUI_TK_LINK" - TOOLKIT=MOTIF + if test "$wxUSE_PM" = 1; then + TOOLKIT=PM - GUIHEADERS="\$(MOTIF_HEADERS)" - GUIOBJS="\$(MOTIF_GUIOBJS)" - COMMONOBJS="\$(MOTIF_COMMONOBJS)" - GENERICOBJS="\$(MOTIF_GENERICOBJS)" - GUIDEPS="\$(MOTIF_GUIDEPS)" - COMMONDEPS="\$(MOTIF_COMMONDEPS)" - GENERICDEPS="\$(MOTIF_GENERICDEPS)" - UNIXOBJS="\$(UNIX_OBJS)" - UNIXDEPS="\$(UNIX_DEPS)" - GUIDIST=MOTIF_DIST -fi + GUIOBJS="\$(PM_GUIOBJS)" + GUIHEADERS="\$(PM_HEADERS)" + COMMONOBJS="\$(PM_COMMONOBJS)" + GENERICOBJS="\$(PM_GENERICOBJS)" + GUIDEPS="\$(PM_GUIDEPS)" + COMMONDEPS="\$(PM_COMMONDEPS)" + GENERICDEPS="\$(PM_GENERICDEPS)" + UNIXOBJS= + UNIXDEPS= + GUIDIST=GTK_DIST + fi -if test "$wxUSE_PM" = 1; then - TOOLKIT=PM + if test "$TOOLKIT" != "PM" ; then + TOOLKIT_DIR=`echo ${TOOLKIT} | tr "[A-Z]" "[a-z]"` + else + TOOLKIT_DIR="os2" + fi - GUIOBJS="\$(PM_GUIOBJS)" - GUIHEADERS="\$(PM_HEADERS)" - COMMONOBJS="\$(PM_COMMONOBJS)" - GENERICOBJS="\$(PM_GENERICOBJS)" - GUIDEPS="\$(PM_GUIDEPS)" - COMMONDEPS="\$(PM_COMMONDEPS)" - GENERICDEPS="\$(PM_GENERICDEPS)" - UNIXOBJS= - UNIXDEPS= - GUIDIST=GTK_DIST -fi + TOOLKIT_NAME="${TOOLKIT_DIR}" -if test "$TOOLKIT" != "PM" ; then - TOOLKIT_DIR=`echo ${TOOLKIT} | tr "[A-Z]" "[a-z]"` -else - TOOLKIT_DIR="os2" -fi + if test "$wxUSE_UNIVERSAL" = "yes"; then + TOOLKIT_NAME="${TOOLKIT_NAME}univ" + fi if test "$wxUSE_DEBUG_FLAG" = "yes"; then - TOOLKIT_NAME="${TOOLKIT_DIR}d" - else - TOOLKIT_NAME="${TOOLKIT_DIR}" + TOOLKIT_NAME="${TOOLKIT_NAME}d" fi TOOLKIT_DEF="-D__WX${TOOLKIT}__" + if test "$wxUSE_UNIVERSAL" = "yes"; then + TOOLKIT_DEF="${TOOLKIT_DEF} -D__WXUNIVERSAL__" + fi WX_LIBRARY="wx_${TOOLKIT_NAME}" - ALL_OBJECTS="\$(GUIOBJS) \$(COMMONOBJS) \$(GENERICOBJS) \$(UNIXOBJS) \$(HTMLOBJS) \$(OGLOBJS)" + if test "$wxUSE_UNIVERSAL" = "yes"; then + ALL_OBJECTS="\$(GUI_LOWLEVEL_OBJS)" + else + ALL_OBJECTS="\$(GUIOBJS)" + fi + ALL_OBJECTS="${ALL_OBJECTS} \$(COMMONOBJS) \$(GENERICOBJS) \$(UNIXOBJS)" + if test "$wxUSE_HTML" = "yes"; then + ALL_OBJECTS="${ALL_OBJECTS} \$(HTMLOBJS)" + fi if test "$TOOLKIT" != "MSW"; then if test "$wxUSE_ODBC" = "yes" ; then @@ -8940,7 +9605,14 @@ fi if test "$wxUSE_ZLIB" = "yes" ; then ALL_OBJECTS="${ALL_OBJECTS} \$(ZLIBOBJS)" fi - ALL_DEPFILES="\$(GUIDEPS) \$(COMMONDEPS) \$(GENERICDEPS) \$(UNIXDEPS) \$(HTMLDEPS) \$(OGLDEPS)" + + if test "$wxUSE_UNIVERSAL" = "yes"; then + ALL_DEPFILES="\$(GUI_LOWLEVEL_DEPS)" + else + ALL_DEPFILES="\$(GUIDEPS)" + fi + + ALL_DEPFILES="${ALL_DEPFILES} \$(COMMONDEPS) \$(GENERICDEPS) \$(UNIXDEPS) \$(HTMLDEPS) \$(OGLDEPS)" PORT_FILES="src/\$(TOOLKITDIR)/files.lst" RPM_FILES="src/\$(TOOLKITDIR)/rpmfiles.lst" @@ -9082,8 +9754,13 @@ if test "$wxUSE_SHARED" = "yes"; then *-*-freebsd* | *-*-netbsd*) SHARED_LD="${CC} -shared -o" PIC_FLAG="-fPIC" - WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS" - WX_ALL="CREATE_LINKS" + if test "$wxUSE_OPENGL" = "yes"; then + WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS CREATE_INSTALLED_LINKS_GL" + WX_ALL="CREATE_LINKS CREATE_LINKS_GL" + else + WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS" + WX_ALL="CREATE_LINKS" + fi ;; *-*-osf* ) SHARED_LD="${CXX} -shared -o" @@ -9169,17 +9846,17 @@ for ac_hdr in strings.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:9173: checking for $ac_hdr" >&5 +echo "configure:9850: 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:9183: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9860: \"$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* @@ -9209,17 +9886,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:9213: checking for $ac_hdr" >&5 +echo "configure:9890: 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:9223: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9900: \"$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* @@ -9249,17 +9926,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:9253: checking for $ac_hdr" >&5 +echo "configure:9930: 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:9263: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9940: \"$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* @@ -9289,17 +9966,17 @@ for ac_hdr in wcstr.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:9293: checking for $ac_hdr" >&5 +echo "configure:9970: 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:9303: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9980: \"$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* @@ -9329,17 +10006,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:9333: checking for $ac_hdr" >&5 +echo "configure:10010: 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:9343: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10020: \"$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* @@ -9369,17 +10046,17 @@ for ac_hdr in iconv.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:9373: checking for $ac_hdr" >&5 +echo "configure:10050: 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:9383: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10060: \"$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* @@ -9409,17 +10086,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:9413: checking for $ac_hdr" >&5 +echo "configure:10090: 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:9423: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10100: \"$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* @@ -9452,17 +10129,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:9456: checking for $ac_hdr" >&5 +echo "configure:10133: 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:9466: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10143: \"$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* @@ -9493,12 +10170,12 @@ fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:9497: checking for ANSI C header files" >&5 +echo "configure:10174: 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 @@ -9506,7 +10183,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9510: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10187: \"$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* @@ -9523,7 +10200,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 @@ -9541,7 +10218,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 @@ -9562,7 +10239,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -9573,7 +10250,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:9577: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:10254: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -9597,12 +10274,12 @@ EOF fi echo $ac_n "checking for mode_t""... $ac_c" 1>&6 -echo "configure:9601: checking for mode_t" >&5 +echo "configure:10278: 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 @@ -9630,12 +10307,12 @@ EOF fi echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:9634: checking for off_t" >&5 +echo "configure:10311: 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 @@ -9663,12 +10340,12 @@ EOF fi echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:9667: checking for pid_t" >&5 +echo "configure:10344: 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 @@ -9696,12 +10373,12 @@ EOF fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:9700: checking for size_t" >&5 +echo "configure:10377: 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 @@ -9729,12 +10406,12 @@ EOF fi echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:9733: checking for uid_t in sys/types.h" >&5 +echo "configure:10410: 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 @@ -9765,13 +10442,13 @@ fi echo $ac_n "checking for pw_gecos in struct passwd""... $ac_c" 1>&6 -echo "configure:9769: checking for pw_gecos in struct passwd" >&5 +echo "configure:10446: 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() { @@ -9782,7 +10459,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:9786: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10463: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_struct_pw_gecos=yes @@ -9812,18 +10489,18 @@ fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:9816: checking for working const" >&5 +echo "configure:10493: 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:10547: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -9887,21 +10564,21 @@ EOF fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:9891: checking for inline" >&5 +echo "configure:10568: 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:10582: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -9928,7 +10605,7 @@ esac echo $ac_n "checking size of char""... $ac_c" 1>&6 -echo "configure:9932: checking size of char" >&5 +echo "configure:10609: 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 @@ -9936,7 +10613,7 @@ else ac_cv_sizeof_char=1 else cat > conftest.$ac_ext < main() @@ -9947,7 +10624,7 @@ main() exit(0); } EOF -if { (eval echo configure:9951: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:10628: \"$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 @@ -9967,7 +10644,7 @@ EOF echo $ac_n "checking size of wchar_t""... $ac_c" 1>&6 -echo "configure:9971: checking size of wchar_t" >&5 +echo "configure:10648: checking size of wchar_t" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_wchar_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9975,7 +10652,7 @@ else ac_cv_sizeof_wchar_t=4 else cat > conftest.$ac_ext < main() @@ -9986,7 +10663,7 @@ main() exit(0); } EOF -if { (eval echo configure:9990: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:10667: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_wchar_t=`cat conftestval` else @@ -10006,7 +10683,7 @@ EOF echo $ac_n "checking size of short""... $ac_c" 1>&6 -echo "configure:10010: checking size of short" >&5 +echo "configure:10687: 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 @@ -10014,7 +10691,7 @@ else ac_cv_sizeof_short=2 else cat > conftest.$ac_ext < main() @@ -10025,7 +10702,7 @@ main() exit(0); } EOF -if { (eval echo configure:10029: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:10706: \"$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 @@ -10045,7 +10722,7 @@ EOF echo $ac_n "checking size of int *""... $ac_c" 1>&6 -echo "configure:10049: checking size of int *" >&5 +echo "configure:10726: checking size of int *" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_int_p'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -10053,7 +10730,7 @@ else ac_cv_sizeof_int_p=4 else cat > conftest.$ac_ext < main() @@ -10064,7 +10741,7 @@ main() exit(0); } EOF -if { (eval echo configure:10068: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:10745: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_int_p=`cat conftestval` else @@ -10084,7 +10761,7 @@ EOF echo $ac_n "checking size of int""... $ac_c" 1>&6 -echo "configure:10088: checking size of int" >&5 +echo "configure:10765: 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 @@ -10092,7 +10769,7 @@ else ac_cv_sizeof_int=4 else cat > conftest.$ac_ext < main() @@ -10103,7 +10780,7 @@ main() exit(0); } EOF -if { (eval echo configure:10107: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:10784: \"$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 @@ -10123,7 +10800,7 @@ EOF echo $ac_n "checking size of long""... $ac_c" 1>&6 -echo "configure:10127: checking size of long" >&5 +echo "configure:10804: 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 @@ -10131,7 +10808,7 @@ else ac_cv_sizeof_long=4 else cat > conftest.$ac_ext < main() @@ -10142,7 +10819,7 @@ main() exit(0); } EOF -if { (eval echo configure:10146: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:10823: \"$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 @@ -10162,7 +10839,7 @@ EOF echo $ac_n "checking size of long long""... $ac_c" 1>&6 -echo "configure:10166: checking size of long long" >&5 +echo "configure:10843: 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 @@ -10170,7 +10847,7 @@ else ac_cv_sizeof_long_long=0 else cat > conftest.$ac_ext < main() @@ -10181,7 +10858,7 @@ main() exit(0); } EOF -if { (eval echo configure:10185: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:10862: \"$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 @@ -10202,14 +10879,14 @@ EOF echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 -echo "configure:10206: checking whether byte ordering is bigendian" >&5 +echo "configure:10883: 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 @@ -10220,11 +10897,11 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:10224: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10901: \"$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 @@ -10235,7 +10912,7 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:10239: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10916: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_bigendian=yes else @@ -10255,7 +10932,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:10949: \"$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 @@ -10315,17 +10992,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:10319: checking for $ac_hdr" >&5 +echo "configure:10996: 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:10329: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11006: \"$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* @@ -10373,7 +11050,7 @@ cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking if C++ compiler supports bool""... $ac_c" 1>&6 -echo "configure:10377: checking if C++ compiler supports bool" >&5 +echo "configure:11054: 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 @@ -10388,7 +11065,7 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11081: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF @@ -10442,13 +11119,13 @@ EOF echo $ac_n "checking if you need GNU extensions""... $ac_c" 1>&6 -echo "configure:10446: checking if you need GNU extensions" >&5 +echo "configure:11123: checking if you need GNU extensions" >&5 if eval "test \"`echo '$''{'wx_cv_gnu_extensions'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { @@ -10461,7 +11138,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:10465: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11142: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_gnu_extensions=yes else @@ -10486,7 +11163,7 @@ fi echo $ac_n "checking for wcslen in -lc""... $ac_c" 1>&6 -echo "configure:10490: checking for wcslen in -lc" >&5 +echo "configure:11167: checking for wcslen in -lc" >&5 ac_lib_var=`echo c'_'wcslen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -10494,7 +11171,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11186: \"$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 @@ -10531,7 +11208,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for wcslen in -lw""... $ac_c" 1>&6 -echo "configure:10535: checking for wcslen in -lw" >&5 +echo "configure:11212: 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 @@ -10539,7 +11216,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:11231: \"$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 @@ -10581,12 +11258,12 @@ fi echo $ac_n "checking for vprintf""... $ac_c" 1>&6 -echo "configure:10585: checking for vprintf" >&5 +echo "configure:11262: checking for vprintf" >&5 if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11290: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_vprintf=yes" else @@ -10633,12 +11310,12 @@ fi if test "$ac_cv_func_vprintf" != yes; then echo $ac_n "checking for _doprnt""... $ac_c" 1>&6 -echo "configure:10637: checking for _doprnt" >&5 +echo "configure:11314: checking for _doprnt" >&5 if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11342: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func__doprnt=yes" else @@ -10698,13 +11375,13 @@ cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking for vsnprintf""... $ac_c" 1>&6 -echo "configure:10702: checking for vsnprintf" >&5 +echo "configure:11379: checking for vsnprintf" >&5 if eval "test \"`echo '$''{'wx_cv_func_vsnprintf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -10729,7 +11406,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:10733: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11410: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF @@ -10754,13 +11431,13 @@ fi echo "$ac_t""$wx_cv_func_vsnprintf" 1>&6 echo $ac_n "checking for vsscanf""... $ac_c" 1>&6 -echo "configure:10758: checking for vsscanf" >&5 +echo "configure:11435: checking for vsscanf" >&5 if eval "test \"`echo '$''{'wx_cv_func_vsscanf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -10783,7 +11460,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:10787: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11464: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF @@ -10820,12 +11497,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:10824: checking for $ac_func" >&5 +echo "configure:11501: 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:11529: \"$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 @@ -10889,13 +11566,13 @@ cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking for sa_handler type""... $ac_c" 1>&6 -echo "configure:10893: checking for sa_handler type" >&5 +echo "configure:11570: 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() { @@ -10907,7 +11584,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:10911: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11588: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_type_sa_handler=int @@ -10944,12 +11621,12 @@ fi for ac_func in vfork do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:10948: checking for $ac_func" >&5 +echo "configure:11625: 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:11653: \"$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 @@ -11000,12 +11677,12 @@ done for ac_func in timegm do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:11004: checking for $ac_func" >&5 +echo "configure:11681: 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:11709: \"$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 @@ -11067,12 +11744,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:11071: checking for $ac_func" >&5 +echo "configure:11748: 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:11776: \"$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 @@ -11120,7 +11797,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for nanosleep in -lposix4""... $ac_c" 1>&6 -echo "configure:11124: checking for nanosleep in -lposix4" >&5 +echo "configure:11801: 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 @@ -11128,7 +11805,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:11820: \"$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 @@ -11167,12 +11844,12 @@ else for ac_func in usleep do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:11171: checking for $ac_func" >&5 +echo "configure:11848: 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:11876: \"$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 @@ -11234,12 +11911,12 @@ fi for ac_func in uname gethostname do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:11238: checking for $ac_func" >&5 +echo "configure:11915: 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:11943: \"$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 @@ -11299,12 +11976,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:11303: checking for $ac_func" >&5 +echo "configure:11980: 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:12011: \"$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 @@ -11367,12 +12044,12 @@ INET_LINK= for ac_func in inet_addr do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:11371: checking for $ac_func" >&5 +echo "configure:12048: 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:12076: \"$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 @@ -11420,7 +12097,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for inet_addr in -lnsl""... $ac_c" 1>&6 -echo "configure:11424: checking for inet_addr in -lnsl" >&5 +echo "configure:12101: 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 @@ -11428,7 +12105,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:12120: \"$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 @@ -11458,7 +12135,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:11462: checking for inet_addr in -lresolv" >&5 +echo "configure:12139: 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 @@ -11466,7 +12143,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:12158: \"$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 @@ -11510,12 +12187,12 @@ done for ac_func in inet_aton do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:11514: checking for $ac_func" >&5 +echo "configure:12191: 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:12219: \"$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 @@ -11563,7 +12240,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:11567: checking for inet_aton in -l$INET_LINK" >&5 +echo "configure:12244: 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 @@ -11571,7 +12248,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:12263: \"$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 @@ -11695,7 +12372,7 @@ if test "$wxUSE_THREADS" = "yes" ; then fi echo $ac_n "checking for pthread_create in -l$THREADS_LIB""... $ac_c" 1>&6 -echo "configure:11699: checking for pthread_create in -l$THREADS_LIB" >&5 +echo "configure:12376: checking for pthread_create in -l$THREADS_LIB" >&5 ac_lib_var=`echo $THREADS_LIB'_'pthread_create | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -11703,7 +12380,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$THREADS_LIB $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12395: \"$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 @@ -11737,7 +12414,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6 -echo "configure:11741: checking for pthread_create in -lc_r" >&5 +echo "configure:12418: checking for pthread_create in -lc_r" >&5 ac_lib_var=`echo c_r'_'pthread_create | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -11745,7 +12422,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lc_r $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12437: \"$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 @@ -11780,17 +12457,17 @@ else ac_safe=`echo "sys/prctl.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for sys/prctl.h""... $ac_c" 1>&6 -echo "configure:11784: checking for sys/prctl.h" >&5 +echo "configure:12461: checking for sys/prctl.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11794: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12471: \"$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* @@ -11830,12 +12507,12 @@ if test "$wxUSE_THREADS" = "yes" ; then for ac_func in thr_setconcurrency do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:11834: checking for $ac_func" >&5 +echo "configure:12511: 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:12539: \"$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 @@ -11888,17 +12565,17 @@ done do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:11892: checking for $ac_hdr" >&5 +echo "configure:12569: 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:11902: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12579: \"$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* @@ -11926,7 +12603,7 @@ done echo $ac_n "checking for sched_yield in -l$THREADS_LINK""... $ac_c" 1>&6 -echo "configure:11930: checking for sched_yield in -l$THREADS_LINK" >&5 +echo "configure:12607: checking for sched_yield in -l$THREADS_LINK" >&5 ac_lib_var=`echo $THREADS_LINK'_'sched_yield | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -11934,7 +12611,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$THREADS_LINK $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12626: \"$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 @@ -11967,7 +12644,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for sched_yield in -l"posix4"""... $ac_c" 1>&6 -echo "configure:11971: checking for sched_yield in -l"posix4"" >&5 +echo "configure:12648: checking for sched_yield in -l"posix4"" >&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 @@ -11975,7 +12652,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l"posix4" $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12667: \"$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 @@ -12017,7 +12694,7 @@ fi HAVE_PRIOR_FUNCS=0 echo $ac_n "checking for pthread_attr_getschedpolicy in -l$THREADS_LINK""... $ac_c" 1>&6 -echo "configure:12021: checking for pthread_attr_getschedpolicy in -l$THREADS_LINK" >&5 +echo "configure:12698: checking for pthread_attr_getschedpolicy in -l$THREADS_LINK" >&5 ac_lib_var=`echo $THREADS_LINK'_'pthread_attr_getschedpolicy | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -12025,7 +12702,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$THREADS_LINK $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12717: \"$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 @@ -12052,7 +12729,7 @@ fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for pthread_attr_setschedparam in -l$THREADS_LINK""... $ac_c" 1>&6 -echo "configure:12056: checking for pthread_attr_setschedparam in -l$THREADS_LINK" >&5 +echo "configure:12733: checking for pthread_attr_setschedparam in -l$THREADS_LINK" >&5 ac_lib_var=`echo $THREADS_LINK'_'pthread_attr_setschedparam | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -12060,7 +12737,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$THREADS_LINK $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12752: \"$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 @@ -12087,7 +12764,7 @@ fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for sched_get_priority_max in -l$THREADS_LINK""... $ac_c" 1>&6 -echo "configure:12091: checking for sched_get_priority_max in -l$THREADS_LINK" >&5 +echo "configure:12768: checking for sched_get_priority_max in -l$THREADS_LINK" >&5 ac_lib_var=`echo $THREADS_LINK'_'sched_get_priority_max | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -12095,7 +12772,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$THREADS_LINK $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12787: \"$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 @@ -12125,7 +12802,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for sched_get_priority_max in -l"posix4"""... $ac_c" 1>&6 -echo "configure:12129: checking for sched_get_priority_max in -l"posix4"" >&5 +echo "configure:12806: checking for sched_get_priority_max in -l"posix4"" >&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 @@ -12133,7 +12810,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l"posix4" $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12825: \"$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 @@ -12191,7 +12868,7 @@ EOF fi echo $ac_n "checking for pthread_cancel in -l$THREADS_LINK""... $ac_c" 1>&6 -echo "configure:12195: checking for pthread_cancel in -l$THREADS_LINK" >&5 +echo "configure:12872: checking for pthread_cancel in -l$THREADS_LINK" >&5 ac_lib_var=`echo $THREADS_LINK'_'pthread_cancel | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -12199,7 +12876,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$THREADS_LINK $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12891: \"$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 @@ -12236,13 +12913,13 @@ fi echo $ac_n "checking for pthread_cleanup_push/pop""... $ac_c" 1>&6 -echo "configure:12240: checking for pthread_cleanup_push/pop" >&5 +echo "configure:12917: 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() { @@ -12252,7 +12929,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:12256: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12933: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_func_pthread_cleanup_push=yes @@ -12293,7 +12970,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:12297: checking if -D_REENTRANT is needed" >&5 +echo "configure:12974: checking if -D_REENTRANT is needed" >&5 if test "$NEEDS_D_REENTRANT_FOR_R_FUNCS" = 1; then CFLAGS="${CFLAGS} -D_REENTRANT" CXXFLAGS="${CXXFLAGS} -D_REENTRANT" @@ -12431,17 +13108,17 @@ EOF ZLIB_LINK= ac_safe=`echo "zlib.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for zlib.h""... $ac_c" 1>&6 -echo "configure:12435: checking for zlib.h" >&5 +echo "configure:13112: 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:12445: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13122: \"$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* @@ -12458,7 +13135,7 @@ fi if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for deflate in -lz""... $ac_c" 1>&6 -echo "configure:12462: checking for deflate in -lz" >&5 +echo "configure:13139: 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 @@ -12466,7 +13143,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:13158: \"$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 @@ -12524,17 +13201,17 @@ EOF PNG_LINK= ac_safe=`echo "png.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for png.h""... $ac_c" 1>&6 -echo "configure:12528: checking for png.h" >&5 +echo "configure:13205: 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:12538: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13215: \"$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* @@ -12551,7 +13228,7 @@ fi if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for png_check_sig in -lpng""... $ac_c" 1>&6 -echo "configure:12555: checking for png_check_sig in -lpng" >&5 +echo "configure:13232: 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 @@ -12559,7 +13236,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:13251: \"$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 @@ -12615,17 +13292,17 @@ EOF JPEG_LINK= ac_safe=`echo "jpeglib.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for jpeglib.h""... $ac_c" 1>&6 -echo "configure:12619: checking for jpeglib.h" >&5 +echo "configure:13296: checking for jpeglib.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:12629: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13306: \"$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* @@ -12642,7 +13319,7 @@ fi if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for jpeg_read_header in -ljpeg""... $ac_c" 1>&6 -echo "configure:12646: checking for jpeg_read_header in -ljpeg" >&5 +echo "configure:13323: 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 @@ -12650,7 +13327,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:13342: \"$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 @@ -12697,23 +13374,23 @@ if test "$wxUSE_LIBTIFF" = "yes" -o "$wxUSE_LIBTIFF" = "sys" ; then #define wxUSE_LIBTIFF 1 EOF - if test "$wxUSE_LIBTIFF" = "yes" ; then + if test "$wxUSE_LIBTIFF" = "yes" ; then TIFF_INCLUDE="-I\${top_srcdir}/src/tiff" else TIFF_LINK= ac_safe=`echo "tiffio.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for tiffio.h""... $ac_c" 1>&6 -echo "configure:12707: checking for tiffio.h" >&5 +echo "configure:13384: 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:12717: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13394: \"$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* @@ -12730,7 +13407,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:12734: checking for TIFFError in -ltiff" >&5 +echo "configure:13411: 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 @@ -12738,7 +13415,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ltiff -lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13430: \"$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 @@ -12782,17 +13459,17 @@ fi if test "$wxUSE_OPENGL" = "yes"; then ac_safe=`echo "GL/gl.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for GL/gl.h""... $ac_c" 1>&6 -echo "configure:12786: checking for GL/gl.h" >&5 +echo "configure:13463: 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:12796: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13473: \"$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* @@ -12818,7 +13495,7 @@ EOF EOF echo $ac_n "checking for glFlush in -lGL""... $ac_c" 1>&6 -echo "configure:12822: checking for glFlush in -lGL" >&5 +echo "configure:13499: checking for glFlush in -lGL" >&5 ac_lib_var=`echo GL'_'glFlush | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -12826,7 +13503,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lGL $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13518: \"$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 @@ -12859,7 +13536,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for glFlush in -lMesaGL""... $ac_c" 1>&6 -echo "configure:12863: checking for glFlush in -lMesaGL" >&5 +echo "configure:13540: checking for glFlush in -lMesaGL" >&5 ac_lib_var=`echo MesaGL'_'glFlush | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -12867,7 +13544,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lMesaGL $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13559: \"$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 @@ -12948,6 +13625,27 @@ EOF fi +if test "$wxUSE_CMDLINE_PARSER" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_CMDLINE_PARSER 1 +EOF + +fi + +if test "$wxUSE_STOPWATCH" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_STOPWATCH 1 +EOF + +fi + +if test "$wxUSE_DATETIME" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_DATETIME 1 +EOF + +fi + if test "$wxUSE_FILE" = "yes"; then cat >> confdefs.h <<\EOF #define wxUSE_FILE 1 @@ -13041,14 +13739,35 @@ EOF fi if test "$wxUSE_LOG" = "yes"; then - cat >> confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define wxUSE_LOG 1 EOF + + if test "$wxUSE_LOGGUI" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_LOGGUI 1 +EOF + + fi + + if test "$wxUSE_LOGWINDOW" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_LOGWINDOW 1 +EOF + + fi +fi + +if test "$wxUSE_FONTMAP" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_FONTMAP 1 +EOF + fi if test "$wxUSE_LONGLONG" = "yes"; then - cat >> confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define wxUSE_LONGLONG 1 EOF @@ -13077,16 +13796,16 @@ EOF fi -if test "$wxUSE_TIMEDATE" = "yes"; then +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:13085: checking for $ac_func" >&5 +echo "configure:13804: 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:13832: \"$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 @@ -13135,13 +13854,13 @@ done echo $ac_n "checking for timezone variable in ""... $ac_c" 1>&6 -echo "configure:13139: checking for timezone variable in " >&5 +echo "configure:13858: 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 < @@ -13153,7 +13872,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:13157: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13876: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_var_timezone=__timezone @@ -13164,7 +13883,7 @@ else rm -rf conftest* cat > conftest.$ac_ext < @@ -13176,7 +13895,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:13180: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13899: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_var_timezone=_timezone @@ -13187,7 +13906,7 @@ else rm -rf conftest* cat > conftest.$ac_ext < @@ -13199,7 +13918,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:13203: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13922: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_var_timezone=timezone @@ -13234,12 +13953,12 @@ EOF for ac_func in localtime do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:13238: checking for $ac_func" >&5 +echo "configure:13957: 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:13985: \"$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 @@ -13289,13 +14008,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:13293: checking for tm_gmtoff in struct tm" >&5 +echo "configure:14012: 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 < @@ -13307,7 +14026,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:13311: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:14030: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_struct_tm_has_gmtoff=yes @@ -13333,12 +14052,12 @@ echo "$ac_t""$wx_cv_struct_tm_has_gmtoff" 1>&6 for ac_func in gettimeofday ftime do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:13337: checking for $ac_func" >&5 +echo "configure:14056: 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:14084: \"$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 @@ -13388,7 +14107,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:13392: checking whether gettimeofday takes two arguments" >&5 +echo "configure:14111: 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 @@ -13403,7 +14122,7 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext < @@ -13417,7 +14136,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:13421: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:14140: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_func_gettimeofday_has_2_args=yes else @@ -13425,7 +14144,7 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext < @@ -13438,7 +14157,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:13442: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:14161: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_func_gettimeofday_has_2_args=no else @@ -13473,7 +14192,7 @@ EOF fi cat >> confdefs.h <<\EOF -#define wxUSE_TIMEDATE 1 +#define wxUSE_DATETIME 1 EOF SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS typetest" @@ -13484,12 +14203,12 @@ if test "$TOOLKIT" != "MSW"; then if test "$wxUSE_SOCKETS" = "yes"; then echo $ac_n "checking for socket""... $ac_c" 1>&6 -echo "configure:13488: checking for socket" >&5 +echo "configure:14207: 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:14235: \"$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 @@ -13530,7 +14249,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:13534: checking for socket in -lsocket" >&5 +echo "configure:14253: 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 @@ -13538,7 +14257,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:14272: \"$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 @@ -13583,7 +14302,7 @@ fi if test "$wxUSE_SOCKETS" = "yes" ; then echo $ac_n "checking what is the type of the third argument of getsockname""... $ac_c" 1>&6 -echo "configure:13587: checking what is the type of the third argument of getsockname" >&5 +echo "configure:14306: 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 @@ -13598,7 +14317,7 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext < @@ -13611,7 +14330,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:13615: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:14334: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_type_getsockname3=socklen_t else @@ -13619,7 +14338,7 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext < @@ -13632,7 +14351,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:13636: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:14355: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_type_getsockname3=size_t else @@ -13640,7 +14359,7 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext < @@ -13653,7 +14372,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:13657: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:14376: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_type_getsockname3=int else @@ -13713,17 +14432,17 @@ if test "$wxUSE_JOYSTICK" = "yes"; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:13717: checking for $ac_hdr" >&5 +echo "configure:14436: 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:13727: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14446: \"$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* @@ -13776,12 +14495,12 @@ if test "$wxUSE_DYNLIB_CLASS" = "yes"; then for ac_func in dlopen do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:13780: checking for $ac_func" >&5 +echo "configure:14499: 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:14527: \"$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 @@ -13832,7 +14551,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:13836: checking for dlopen in -ldl" >&5 +echo "configure:14555: 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 @@ -13840,7 +14559,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:14574: \"$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 @@ -13880,12 +14599,12 @@ else for ac_func in shl_load do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:13884: checking for $ac_func" >&5 +echo "configure:14603: 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:14631: \"$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 @@ -13936,7 +14655,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dld in -lshl_load""... $ac_c" 1>&6 -echo "configure:13940: checking for dld in -lshl_load" >&5 +echo "configure:14659: 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 @@ -13944,7 +14663,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:14678: \"$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 @@ -13994,12 +14713,12 @@ done for ac_func in dlerror do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:13998: checking for $ac_func" >&5 +echo "configure:14717: 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:14745: \"$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 @@ -14047,7 +14766,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dlerror in -ldl""... $ac_c" 1>&6 -echo "configure:14051: checking for dlerror in -ldl" >&5 +echo "configure:14770: 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 @@ -14055,7 +14774,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:14789: \"$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 @@ -14291,17 +15010,17 @@ if test "$wxUSE_DRAG_AND_DROP" = "yes" ; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:14295: checking for $ac_hdr" >&5 +echo "configure:15014: 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:14305: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:15024: \"$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* @@ -14351,6 +15070,13 @@ EOF fi +if test "$wxUSE_CONTROLS" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_CONTROLS 1 +EOF + +fi + if test "$wxUSE_ACCEL" = "yes"; then cat >> confdefs.h <<\EOF #define wxUSE_ACCEL 1 @@ -14358,6 +15084,20 @@ EOF fi +if test "$wxUSE_BUTTON" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_BUTTON 1 +EOF + +fi + +if test "$wxUSE_BMPBUTTON" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_BMPBUTTON 1 +EOF + +fi + if test "$wxUSE_CARET" = "yes"; then cat >> confdefs.h <<\EOF #define wxUSE_CARET 1 @@ -14380,13 +15120,6 @@ EOF fi -if test "$wxUSE_BMPBUTTON" = "yes"; then - cat >> confdefs.h <<\EOF -#define wxUSE_BMPBUTTON 1 -EOF - -fi - if test "$wxUSE_CHECKBOX" = "yes"; then cat >> confdefs.h <<\EOF #define wxUSE_CHECKBOX 1 @@ -14561,6 +15294,14 @@ EOF SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS tab" fi +if test "$wxUSE_TEXTCTRL" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_TEXTCTRL 1 +EOF + + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS text" +fi + if test "$wxUSE_TOOLBAR_SIMPLE" = "yes"; then cat >> confdefs.h <<\EOF #define wxUSE_TOOLBAR_SIMPLE 1 @@ -14625,6 +15366,34 @@ EOF fi +if test "$wxUSE_CHOICEDLG" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_CHOICEDLG 1 +EOF + +fi + +if test "$wxUSE_COLOURDLG" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_COLOURDLG 1 +EOF + +fi + +if test "$wxUSE_FILEDLG" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_FILEDLG 1 +EOF + +fi + +if test "$wxUSE_FONTDLG" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_FONTDLG 1 +EOF + +fi + if test "$wxUSE_DIRDLG" = "yes"; then if test "$wxUSE_CONSTRAINTS" != "yes"; then echo "configure: warning: wxDirDialog requires constraints so it won't be compiled without them" 1>&2 @@ -14640,6 +15409,20 @@ EOF fi fi +if test "$wxUSE_MSGDLG" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_MSGDLG 1 +EOF + +fi + +if test "$wxUSE_NUMBERDLG" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_NUMBERDLG 1 +EOF + +fi + if test "$wxUSE_TEXTDLG" = "yes"; then cat >> confdefs.h <<\EOF #define wxUSE_TEXTDLG 1 @@ -14762,6 +15545,10 @@ if test "$wxUSE_GUI" = "yes"; then SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS controls dialogs dragimag drawing dynamic \ font fractal image menu minimal richedit" + if test "$wxUSE_UNICODE" = "yes" ; then + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS univ" + fi + CPPFLAGS="$CPPFLAGS \$(EXTRADEFS) \$(APPEXTRADEFS)" else SAMPLES_SUBDIRS="" @@ -14864,7 +15651,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:14868: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:15655: 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 @@ -14895,12 +15682,12 @@ if test -d include; then if test -d include/wx; then if test -d include/wx/${TOOLKIT_DIR}; then if test -f include/wx/${TOOLKIT_DIR}/setup.h; then - mv -f include/wx/${TOOLKIT_DIR}/setup.h setup.h + mv -f include/wx/${TOOLKIT_DIR}/setup.h setup.h fi fi fi fi - + if test "$wxUSE_GUI" = "yes"; then @@ -15395,8 +16182,8 @@ cat >> $CONFIG_STATUS <<\EOF chmod +x wx-config mv wx-config wx${TOOLKIT_NAME}-config ${LN_S} wx${TOOLKIT_NAME}-config wx-config - - + + if test ! -d lib; then mkdir lib fi @@ -15429,7 +16216,7 @@ cat >> $CONFIG_STATUS <<\EOF if test -f setup.h; then mv -f setup.h include/wx/${TOOLKIT_DIR}/setup.h fi - + exit 0 EOF diff --git a/configure.in b/configure.in index 51dc45d4ea..b3b38ba9a4 100644 --- a/configure.in +++ b/configure.in @@ -680,13 +680,14 @@ WX_ARG_CACHE_INIT dnl useful to test the compilation with minimum options, define as 0 for normal dnl usage -DEBUG_CONFIGURE=0 +DEBUG_CONFIGURE=1 if test $DEBUG_CONFIGURE = 1; then - DEFAULT_wxUSE_THREADS=yes + DEFAULT_wxUSE_UNIVERSAL=no + DEFAULT_wxUSE_THREADS=no DEFAULT_wxUSE_SHARED=yes DEFAULT_wxUSE_BURNT_NAME=no - DEFAULT_wxUSE_OPTIMISE=yes + DEFAULT_wxUSE_OPTIMISE=no DEFAULT_wxUSE_PROFILE=no DEFAULT_wxUSE_NO_DEPS=no DEFAULT_wxUSE_NO_RTTI=no @@ -701,8 +702,11 @@ if test $DEBUG_CONFIGURE = 1; then DEFAULT_wxUSE_APPLE_IEEE=no DEFAULT_wxUSE_LOG=yes + DEFAULT_wxUSE_LOGWINDOW=no + DEFAULT_wxUSE_LOGGUI=no DEFAULT_wxUSE_GUI=yes + DEFAULT_wxUSE_CONTROLS=no DEFAULT_wxUSE_ZLIB=no DEFAULT_wxUSE_LIBPNG=no @@ -713,12 +717,16 @@ if test $DEBUG_CONFIGURE = 1; then DEFAULT_wxUSE_ON_FATAL_EXCEPTION=no DEFAULT_wxUSE_STD_IOSTREAM=no + DEFAULT_wxUSE_CMDLINE_PARSER=no + DEFAULT_wxUSE_DATETIME=no + DEFAULT_wxUSE_STOPWATCH=no DEFAULT_wxUSE_FILE=no DEFAULT_wxUSE_TEXTFILE=no DEFAULT_wxUSE_TIMEDATE=no DEFAULT_wxUSE_WAVE=no DEFAULT_wxUSE_INTL=no DEFAULT_wxUSE_CONFIG=no + DEFAULT_wxUSE_FONTMAP=no DEFAULT_wxUSE_STREAMS=no DEFAULT_wxUSE_SOCKETS=no DEFAULT_wxUSE_DIALUP_MANAGER=no @@ -750,7 +758,13 @@ if test $DEBUG_CONFIGURE = 1; then DEFAULT_wxUSE_METAFILE=no DEFAULT_wxUSE_COMMONDLGS=no + DEFAULT_wxUSE_CHOICEDLG=no + DEFAULT_wxUSE_COLOURDLG=no DEFAULT_wxUSE_DIRDLG=no + DEFAULT_wxUSE_FILEDLG=no + DEFAULT_wxUSE_FONTDLG=no + DEFAULT_wxUSE_MSGDLG=no + DEFAULT_wxUSE_NUMBERDLG=no DEFAULT_wxUSE_TEXTDLG=no DEFAULT_wxUSE_STARTUP_TIPS=no DEFAULT_wxUSE_PROGRESSDLG=no @@ -761,14 +775,15 @@ if test $DEBUG_CONFIGURE = 1; then DEFAULT_wxUSE_FS_ZIP=no DEFAULT_wxUSE_BUSYINFO=no DEFAULT_wxUSE_ZIPSTREAM=no - DEFAULT_wxUSE_VALIDATORS=yes + DEFAULT_wxUSE_VALIDATORS=no DEFAULT_wxUSE_ACCEL=no + DEFAULT_wxUSE_BUTTON=no DEFAULT_wxUSE_CARET=no DEFAULT_wxUSE_BMPBUTTON=no DEFAULT_wxUSE_CHECKBOX=no DEFAULT_wxUSE_CHECKLST=no - DEFAULT_wxUSE_CHOICE=yes + DEFAULT_wxUSE_CHOICE=no DEFAULT_wxUSE_COMBOBOX=no DEFAULT_wxUSE_GAUGE=no DEFAULT_wxUSE_GRID=no @@ -789,8 +804,9 @@ if test $DEBUG_CONFIGURE = 1; then DEFAULT_wxUSE_STATBMP=no DEFAULT_wxUSE_STATBOX=no DEFAULT_wxUSE_STATLINE=no - DEFAULT_wxUSE_STATUSBAR=yes + DEFAULT_wxUSE_STATUSBAR=no DEFAULT_wxUSE_TABDIALOG=no + DEFAULT_wxUSE_TEXTCTRL=no DEFAULT_wxUSE_TOOLBAR=no DEFAULT_wxUSE_TOOLBAR_NATIVE=no DEFAULT_wxUSE_TOOLBAR_SIMPLE=no @@ -803,6 +819,7 @@ if test $DEBUG_CONFIGURE = 1; then DEFAULT_wxUSE_PCX=no DEFAULT_wxUSE_PNM=no else + DEFAULT_wxUSE_UNIVERSAL=no DEFAULT_wxUSE_THREADS=yes DEFAULT_wxUSE_SHARED=yes @@ -822,8 +839,11 @@ else DEFAULT_wxUSE_APPLE_IEEE=yes DEFAULT_wxUSE_LOG=yes + DEFAULT_wxUSE_LOGWINDOW=yes + DEFAULT_wxUSE_LOGGUI=yes DEFAULT_wxUSE_GUI=yes + DEFAULT_wxUSE_CONTROLS=yes DEFAULT_wxUSE_ZLIB=yes DEFAULT_wxUSE_LIBPNG=yes @@ -834,12 +854,16 @@ else DEFAULT_wxUSE_ON_FATAL_EXCEPTION=yes DEFAULT_wxUSE_STD_IOSTREAM=no + DEFAULT_wxUSE_CMDLINE_PARSER=yes + DEFAULT_wxUSE_DATETIME=yes + DEFAULT_wxUSE_STOPWATCH=yes DEFAULT_wxUSE_FILE=yes DEFAULT_wxUSE_TEXTFILE=yes DEFAULT_wxUSE_TIMEDATE=yes DEFAULT_wxUSE_WAVE=no DEFAULT_wxUSE_INTL=yes DEFAULT_wxUSE_CONFIG=yes + DEFAULT_wxUSE_FONTMAP=yes DEFAULT_wxUSE_STREAMS=yes DEFAULT_wxUSE_SOCKETS=yes DEFAULT_wxUSE_DIALUP_MANAGER=yes @@ -871,7 +895,13 @@ else DEFAULT_wxUSE_METAFILE=yes DEFAULT_wxUSE_COMMONDLGS=yes + DEFAULT_wxUSE_CHOICEDLG=yes + DEFAULT_wxUSE_COLOURDLG=yes DEFAULT_wxUSE_DIRDLG=yes + DEFAULT_wxUSE_FILEDLG=yes + DEFAULT_wxUSE_FONTDLG=yes + DEFAULT_wxUSE_MSGDLG=yes + DEFAULT_wxUSE_NUMBERDLG=yes DEFAULT_wxUSE_TEXTDLG=yes DEFAULT_wxUSE_STARTUP_TIPS=yes DEFAULT_wxUSE_PROGRESSDLG=yes @@ -885,6 +915,7 @@ else DEFAULT_wxUSE_VALIDATORS=yes DEFAULT_wxUSE_ACCEL=yes + DEFAULT_wxUSE_BUTTON=yes DEFAULT_wxUSE_CARET=yes DEFAULT_wxUSE_BMPBUTTON=yes DEFAULT_wxUSE_CHECKBOX=yes @@ -912,6 +943,7 @@ else DEFAULT_wxUSE_STATLINE=yes DEFAULT_wxUSE_STATUSBAR=yes DEFAULT_wxUSE_TABDIALOG=no + DEFAULT_wxUSE_TEXTCTRL=yes DEFAULT_wxUSE_TOOLBAR=yes DEFAULT_wxUSE_TOOLBAR_NATIVE=yes DEFAULT_wxUSE_TOOLBAR_SIMPLE=yes @@ -956,6 +988,7 @@ WX_ARG_ENABLE(gui, [ --enable-gui use GUI classes], wxUSE_GU if test "$wxUSE_GUI" = "yes"; then +WX_ARG_ENABLE(universal, [ --enable-universal use wxWindows GUI controls instead of native ones], wxUSE_UNIVERSAL) AC_ARG_WITH(gtk, [ --with-gtk use GTK+], [wxUSE_GTK="$withval" CACHE_GTK=1 TOOLKIT_GIVEN=1]) AC_ARG_WITH(motif, [ --with-motif use Motif/Lesstif], [wxUSE_MOTIF="$withval" CACHE_MOTIF=1 TOOLKIT_GIVEN=1]) AC_ARG_WITH(wine, [ --with-wine use WINE], [wxUSE_WINE="$withval" CACHE_WINE=1 TOOLKIT_GIVEN=1]) @@ -1023,9 +1056,12 @@ WX_ARG_ENABLE(sockets, [ --enable-sockets use socket/network class WX_ARG_ENABLE(ipc, [ --enable-ipc use interprocess communication (wxSocket etc.)], wxUSE_IPC) +WX_ARG_ENABLE(cmdline, [ --enable-cmdline use wxCmdLineParser class], wxUSE_CMDLINE_PARSER) +WX_ARG_ENABLE(datetime, [ --enable-datetime use wxDateTime class], wxUSE_DATETIME) +WX_ARG_ENABLE(stopwatch, [ --enable-stopwatch use wxStopWatch class], wxUSE_STOPWATCH) WX_ARG_ENABLE(dialupman, [ --enable-dialupman use dialup network classes], wxUSE_DIALUP_MANAGER) WX_ARG_ENABLE(apple_ieee, [ --enable-apple_ieee use the Apple IEEE codec], wxUSE_APPLE_IEEE) -WX_ARG_ENABLE(timedate, [ --enable-timedate use date/time classes], wxUSE_TIMEDATE) +WX_ARG_ENABLE(timer, [ --enable-timer use wxTimer class], wxUSE_TIMER) WX_ARG_ENABLE(wave, [ --enable-wave use wxWave class], wxUSE_WAVE) WX_ARG_ENABLE(fraction, [ --enable-fraction use wxFraction class], wxUSE_FRACTION) WX_ARG_ENABLE(dynlib, [ --enable-dynlib use wxLibrary class for DLL loading], wxUSE_DYNLIB_CLASS) @@ -1034,6 +1070,7 @@ WX_ARG_ENABLE(log, [ --enable-log use logging system], wxU WX_ARG_ENABLE(streams, [ --enable-streams use wxStream etc classes], wxUSE_STREAMS) WX_ARG_ENABLE(file, [ --enable-file use wxFile classes], wxUSE_FILE) WX_ARG_ENABLE(textfile, [ --enable-textfile use wxTextFile classes], wxUSE_TEXTFILE) +WX_ARG_ENABLE(fontmap, [ --enable-fontmap use font encodings conversion classes], wxUSE_FONTMAP) WX_ARG_ENABLE(unicode, [ --enable-unicode compile wxString with Unicode support], wxUSE_UNICODE) WX_ARG_ENABLE(wcsrtombs, [ --enable-wcsrtombs use wcsrtombs instead of buggy (GNU libc1/Linux libc5) wcstombs], wxUSE_WCSRTOMBS) WX_ARG_ENABLE(wxprintfv, [ --enable-wxprintfv use wxWindows implementation of vprintf()], wxUSE_EXPERIMENTAL_PRINTF) @@ -1063,6 +1100,8 @@ WX_ARG_ENABLE(help, [ --enable-help use help (using external b WX_ARG_ENABLE(constraints, [ --enable-constraints use layout-constraints system], wxUSE_CONSTRAINTS) WX_ARG_ENABLE(printarch, [ --enable-printarch use printing architecture], wxUSE_PRINTING_ARCHITECTURE) WX_ARG_ENABLE(mdi, [ --enable-mdi use multiple document interface architecture], wxUSE_MDI_ARCHITECTURE) +WX_ARG_ENABLE(loggui, [ --enable-loggui use standard GUI logger], wxUSE_LOGGUI) +WX_ARG_ENABLE(logwin, [ --enable-logwin use wxLogWindow], wxUSE_LOGWINDOW) dnl --------------------------------------------------------------------------- dnl PostScript options @@ -1102,6 +1141,7 @@ dnl --disable- later on the command line - but by default all will be dnl used (and vice versa) if test "$wxUSE_CONTROLS" = "yes"; then DEFAULT_wxUSE_ACCEL=yes + DEFAULT_wxUSE_BUTTON=yes DEFAULT_wxUSE_CARET=yes DEFAULT_wxUSE_COMBOBOX=yes DEFAULT_wxUSE_BMPBUTTON=yes @@ -1135,6 +1175,7 @@ if test "$wxUSE_CONTROLS" = "yes"; then DEFAULT_wxUSE_TREECTRL=yes elif test "$wxUSE_CONTROLS" = "no"; then DEFAULT_wxUSE_ACCEL=no + DEFAULT_wxUSE_BUTTON=no DEFAULT_wxUSE_CARET=no DEFAULT_wxUSE_COMBOBOX=no DEFAULT_wxUSE_BMPBUTTON=no @@ -1169,8 +1210,9 @@ elif test "$wxUSE_CONTROLS" = "no"; then fi WX_ARG_ENABLE(accel, [ --enable-accel use accelerators], wxUSE_ACCEL) -WX_ARG_ENABLE(caret, [ --enable-caret use wxCaret class], wxUSE_CARET) +WX_ARG_ENABLE(button, [ --enable-button use wxButton class], wxUSE_BUTTON) WX_ARG_ENABLE(bmpbutton, [ --enable-bmpbutton use wxBitmapButton class], wxUSE_BMPBUTTON) +WX_ARG_ENABLE(caret, [ --enable-caret use wxCaret class], wxUSE_CARET) WX_ARG_ENABLE(checkbox, [ --enable-checkbox use wxCheckBox class], wxUSE_CHECKBOX) WX_ARG_ENABLE(checklst, [ --enable-checklst use wxCheckListBox (listbox with checkboxes) class], wxUSE_CHECKLST) WX_ARG_ENABLE(choice, [ --enable-choice use wxChoice class], wxUSE_CHOICE) @@ -1195,6 +1237,7 @@ WX_ARG_ENABLE(statbox, [ --enable-statbox use wxStaticBox class], wx WX_ARG_ENABLE(statline, [ --enable-statline use wxStaticLine class], wxUSE_STATLINE) WX_ARG_ENABLE(statusbar, [ --enable-statusbar use wxStatusBar class], wxUSE_STATUSBAR) WX_ARG_ENABLE(tabdialog, [ --enable-tabdialog use wxTabControl class], wxUSE_TABDIALOG) +WX_ARG_ENABLE(textctrl, [ --enable-textctrl use wxTextCtrl class], wxUSE_TEXTCTRL) WX_ARG_ENABLE(toolbar, [ --enable-toolbar use wxToolBar class], wxUSE_TOOLBAR) WX_ARG_ENABLE(tbarnative, [ --enable-tbarnative use native wxToolBar class], wxUSE_TOOLBAR_NATIVE) WX_ARG_ENABLE(tbarsmpl, [ --enable-tbarsmpl use wxToolBarSimple class], wxUSE_TOOLBAR_SIMPLE) @@ -1205,7 +1248,13 @@ dnl misc GUI options dnl --------------------------------------------------------------------------- WX_ARG_ENABLE(commondlg, [ --enable-commondlg use common dialogs (wxDirDialog, wxProgressDialog, wxTextDialog, ...)], wxUSE_COMMONDLGS) +WX_ARG_ENABLE(choicedlg, [ --enable-choicedlg use wxChoiceDialog], wxUSE_CHOICEDLG) +WX_ARG_ENABLE(coldlg, [ --enable-coldlg use wxColourDialog], wxUSE_COLOURDLG) +WX_ARG_ENABLE(filedlg, [ --enable-filedlg use wxFileDialog], wxUSE_FILEDLG) +WX_ARG_ENABLE(fontdlg, [ --enable-fontdlg use wxFontDialog], wxUSE_FONTDLG) WX_ARG_ENABLE(dirdlg, [ --enable-dirdlg use wxDirDialog], wxUSE_DIRDLG) +WX_ARG_ENABLE(msgdlg, [ --enable-msgdlg use wxMessageDialog], wxUSE_MSGDLG) +WX_ARG_ENABLE(numberdlg, [ --enable-numberdlg use wxNumberEntryDialog], wxUSE_NUMBERDLG) WX_ARG_ENABLE(textdlg, [ --enable-textdlg use wxTextDialog], wxUSE_TEXTDLG) WX_ARG_ENABLE(tipdlg, [ --enable-tipdlg use startup tips], wxUSE_STARTUP_TIPS) WX_ARG_ENABLE(progressdlg, [ --enable-progressdlg use wxProgressDialog], wxUSE_PROGRESSDLG) @@ -1526,31 +1575,129 @@ dnl ---------------------------------------------------------------- AFMINSTALL= if test "$wxUSE_GUI" = "yes"; then + USE_GUI=1 -USE_GUI=1 + TOOLKIT= + TOOLKIT_INCLUDE= -TOOLKIT= -TOOLKIT_INCLUDE= + GUIOBJS= + COMMONOBJS= + GENERICOBJS= -GUIOBJS= -COMMONOBJS= -GENERICOBJS= + GUI_TK_LIBRARY= + GUI_TK_LINK= -GUI_TK_LIBRARY= -GUI_TK_LINK= + WXGTK12= + WXGTK127= + WXGTK20= -WXGTK12= -WXGTK127= -WXGTK20= + WXWINE= -WXWINE= + if test "$wxUSE_CYGWIN" = 1 || test "$wxUSE_MINGW" = 1 ; then + if test "$cross_compiling" = "yes" ; then + dnl mingw32 will find them even if they're not in one of standard paths + AC_MSG_WARN(skipping windows.h check for cross-compilation) + else + AC_MSG_CHECKING(for Windows headers) + WX_PATH_FIND_INCLUDES($SEARCH_INCLUDE, windows.h) + if test "$ac_find_includes" != "" ; then + AC_MSG_RESULT(found $ac_find_includes) + TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE -I$ac_find_includes" + else + AC_MSG_RESULT(no) + AC_MSG_ERROR(please set CFLAGS to contain the location of windows.h) + fi + fi -if test "$wxUSE_CYGWIN" = 1 || test "$wxUSE_MINGW" = 1 ; then - if test "$cross_compiling" = "yes" ; then - dnl mingw32 will find them even if they're not in one of standard paths - AC_MSG_WARN(skipping windows.h check for cross-compilation) - else - AC_MSG_CHECKING(for Windows headers) + INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS msw" + dnl --- Quick & Dirty ; link against most/all libraries + dnl --- This will bloat the executable, but it'll work for now... + LIBS="$LIBS -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lctl3d32 -lcrtdll -ladvapi32 -lwsock32" + + dnl add extra odbc libs if we have compiled in odbc + if test "$wxUSE_ODBC" = "yes" ; then + LIBS="$LIBS -lodbc32 -lole32 -loleaut32" + fi + + dnl -mwindows is needed to avoid that spawning of a console window + if test "$wxUSE_MINGW" = 1; then + LDFLAGS="$LDFLAGS -mwindows" + fi + + TOOLKIT=MSW + + GUIOBJS="\$(MSW_GUIOBJS)" + GUIHEADERS="\$(MSW_HEADERS)" + COMMONOBJS="\$(MSW_COMMONOBJS)" + GENERICOBJS="\$(MSW_GENERICOBJS)" + UNIXOBJS= + GUIDIST=MSW_DIST + + dnl we should calculate these + RCINCSWITCH="--include-dir" + RCDEFSWITCH="--define" + RCPREPROCESSOR="--preprocessor \"\$(CC) -c -E -xc-header -DRC_INVOKED\"" + RCINPUTSWITCH="-i" + RCOUTPUTSWITCH="-o" + RESFLAGS="$RCPREPROCESSOR $RCINCSWITCH \$(top_srcdir)/include $RCINCSWITCH \$(top_srcdir)/\$(program_dir) $RCDEFSWITCH __WIN32__ $RCDEFSWITCH __WIN95__ $RCDEFSWITCH __GNUWIN32__" + + dnl set optinal RES_PROGRAM_OPT to RES_PROGRAM + RESPROGRAM="\$(RES_PROGRAM)" + fi + + if test "$wxUSE_GTK" = 1; then + dnl avoid calling AM_PATH_GTK twice, so check first for the newer version + dnl and only then, if it wasn't found, for an older one + AM_PATH_GTK_2_0(1.3.1, WXGTK20=1,[ + AM_PATH_GTK(1.2.7, WXGTK127=1) + AM_PATH_GTK(1.2.3, WXGTK12=1) + ], gthread) + + if test "$WXGTK12" != 1 -a "$WXGTK20" != 1; then + AC_MSG_ERROR([ + Please check that gtk-config is in path, the directory + where GTK+ libraries are installed (returned by + 'gtk-config --libs' command) is in LD_LIBRARY_PATH or + equivalent variable and GTK+ is version 1.2.3 or above. + ]) + fi + + TOOLKIT_INCLUDE="$GTK_CFLAGS" + + dnl Appending gthreads as it was done here is not portable, instead + dnl we now call "gtk-config --libs gthread" which sets the right library + dnl name for us. The following hacks are no longer required. + + GUI_TK_LIBRARY="$GTK_LIBS" + + dnl dnl On FreeBSD, the libs are called gtk12 etc, so we must append gthread12 + dnl echo $GTK_LIBS | fgrep -q "glib12" + dnl if test $? = 0 ; then + dnl GUI_TK_LIBRARY="$GTK_LIBS -gthread12" + dnl else + dnl GUI_TK_LIBRARY="$GTK_LIBS -lgthread" + dnl fi + TOOLKIT=GTK + + AFMINSTALL=afminstall + + GUIOBJS="\$(GTK_GUIOBJS)" + GUIHEADERS="\$(GTK_HEADERS)" + COMMONOBJS="\$(GTK_COMMONOBJS)" + GENERICOBJS="\$(GTK_GENERICOBJS)" + GUIDEPS="\$(GTK_GUIDEPS)" + COMMONDEPS="\$(GTK_COMMONDEPS)" + GENERICDEPS="\$(GTK_GENERICDEPS)" + UNIXOBJS="\$(UNIX_OBJS)" + UNIXDEPS="\$(UNIX_DEPS)" + GUIDIST=GTK_DIST + + dnl test for XIM support in libgdk + AC_CHECK_LIB(gdk, gdk_im_open, AC_DEFINE(HAVE_XIM)) + fi + + if test "$wxUSE_WINE" = 1; then + AC_MSG_CHECKING(for WINE includes) WX_PATH_FIND_INCLUDES($SEARCH_INCLUDE, windows.h) if test "$ac_find_includes" != "" ; then AC_MSG_RESULT(found $ac_find_includes) @@ -1559,233 +1706,99 @@ if test "$wxUSE_CYGWIN" = 1 || test "$wxUSE_MINGW" = 1 ; then AC_MSG_RESULT(no) AC_MSG_ERROR(please set CFLAGS to contain the location of windows.h) fi - fi - INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS msw" - dnl --- Quick & Dirty ; link against most/all libraries - dnl --- This will bloat the executable, but it'll work for now... - LIBS="$LIBS -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lctl3d32 -lcrtdll -ladvapi32 -lwsock32" - - dnl add extra odbc libs if we have compiled in odbc - if test "$wxUSE_ODBC" = "yes" ; then - LIBS="$LIBS -lodbc32 -lole32 -loleaut32" - fi - - dnl -mwindows is needed to avoid that spawning of a console window - if test "$wxUSE_MINGW" = 1; then - LDFLAGS="$LDFLAGS -mwindows" - fi - - TOOLKIT=MSW - - GUIOBJS="\$(MSW_GUIOBJS)" - GUIHEADERS="\$(MSW_HEADERS)" - COMMONOBJS="\$(MSW_COMMONOBJS)" - GENERICOBJS="\$(MSW_GENERICOBJS)" - UNIXOBJS= - GUIDIST=MSW_DIST - - dnl we should calculate these - RCINCSWITCH="--include-dir" - RCDEFSWITCH="--define" - RCPREPROCESSOR="--preprocessor \"\$(CC) -c -E -xc-header -DRC_INVOKED\"" - RCINPUTSWITCH="-i" - RCOUTPUTSWITCH="-o" - RESFLAGS="$RCPREPROCESSOR $RCINCSWITCH \$(top_srcdir)/include $RCINCSWITCH \$(top_srcdir)/\$(program_dir) $RCDEFSWITCH __WIN32__ $RCDEFSWITCH __WIN95__ $RCDEFSWITCH __GNUWIN32__" - - dnl set optinal RES_PROGRAM_OPT to RES_PROGRAM - RESPROGRAM="\$(RES_PROGRAM)" - -fi - -if test "$wxUSE_GTK" = 1; then - dnl avoid calling AM_PATH_GTK twice, so check first for the newer version - dnl and only then, if it wasn't found, for an older one - AM_PATH_GTK_2_0(1.3.1, WXGTK20=1,[ - AM_PATH_GTK(1.2.7, WXGTK127=1) - AM_PATH_GTK(1.2.3, WXGTK12=1) - ], gthread) - - if test "$WXGTK12" != 1 -a "$WXGTK20" != 1; then - AC_MSG_ERROR([ - Please check that gtk-config is in path, the directory - where GTK+ libraries are installed (returned by - 'gtk-config --libs' command) is in LD_LIBRARY_PATH or - equivalent variable and GTK+ is version 1.2.3 or above. - ]) - fi - - TOOLKIT_INCLUDE="$GTK_CFLAGS" - -dnl Appending gthreads as it was done here is not portable, instead -dnl we now call "gtk-config --libs gthread" which sets the right library -dnl name for us. The following hacks are no longer required. - - GUI_TK_LIBRARY="$GTK_LIBS" - -dnl dnl On FreeBSD, the libs are called gtk12 etc, so we must append gthread12 -dnl echo $GTK_LIBS | fgrep -q "glib12" -dnl if test $? = 0 ; then -dnl GUI_TK_LIBRARY="$GTK_LIBS -gthread12" -dnl else -dnl GUI_TK_LIBRARY="$GTK_LIBS -lgthread" -dnl fi - TOOLKIT=GTK - - AFMINSTALL=afminstall - - GUIOBJS="\$(GTK_GUIOBJS)" - GUIHEADERS="\$(GTK_HEADERS)" - COMMONOBJS="\$(GTK_COMMONOBJS)" - GENERICOBJS="\$(GTK_GENERICOBJS)" - GUIDEPS="\$(GTK_GUIDEPS)" - COMMONDEPS="\$(GTK_COMMONDEPS)" - GENERICDEPS="\$(GTK_GENERICDEPS)" - UNIXOBJS="\$(UNIX_OBJS)" - UNIXDEPS="\$(UNIX_DEPS)" - GUIDIST=GTK_DIST - - dnl test for XIM support in libgdk - AC_CHECK_LIB(gdk, gdk_im_open, AC_DEFINE(HAVE_XIM)) -fi - -if test "$wxUSE_WINE" = 1; then - AC_MSG_CHECKING(for WINE includes) - WX_PATH_FIND_INCLUDES($SEARCH_INCLUDE, windows.h) - if test "$ac_find_includes" != "" ; then - AC_MSG_RESULT(found $ac_find_includes) - TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE -I$ac_find_includes" - else - AC_MSG_RESULT(no) - AC_MSG_ERROR(please set CFLAGS to contain the location of windows.h) - fi - - XPM_LINK="" - AC_MSG_CHECKING(for Xpm library) - WX_PATH_FIND_LIBRARIES($SEARCH_LIB,Xpm) - if test "$ac_find_libraries" != "" ; then - GUI_TK_LIBRARY="-L$ac_find_libraries" - XPM_LINK="-lXpm" - AC_DEFINE(wxHAVE_LIB_XPM) - AC_MSG_RESULT(found at $ac_find_libraries) - else - AC_MSG_RESULT(no) - AC_MSG_WARN(library will be compiled without support for images in XPM format) - fi - - MESA_LINK="" - AC_MSG_CHECKING(for Mesa library) - WX_PATH_FIND_LIBRARIES($SEARCH_LIB,MesaGL) - if test "$ac_find_libraries" != "" ; then - GUI_TK_LIBRARY="$GUI_TK_LIBRARY -L$ac_find_libraries" - MESA_LINK="-lMesaGL" - AC_MSG_RESULT(found at $ac_find_libraries) - else - AC_MSG_ERROR(no) - fi - - GUI_TK_LINK="-lwine $MESA_LINK $XPM_LINK -lXxf86dga -lXxf86vm -lSM -lICE -lXext -lXmu -lX11 -lncurses" - GUI_TK_LIBRARY="$GUI_TK_LIBRARY $GUI_TK_LINK" - WXWINE=1 - TOOLKIT=MSW - - GUIHEADERS="\$(MSW_HEADERS)" - GUIOBJS="\$(MSW_GUIOBJS)" - COMMONOBJS="\$(MSW_COMMONOBJS)" - GENERICOBJS="\$(MSW_GENERICOBJS)" - GUIDEPS="\$(MSW_GUIDEPS)" - COMMONDEPS="\$(MSW_COMMONDEPS)" - GENERICDEPS="\$(MSW_GENERICDEPS)" - UNIXOBJS="\$(UNIX_OBJS)" - UNIXDEPS="\$(UNIX_DEPS)" - GUIDIST=MSW_DIST -fi - -dnl use standard macros to check for X headers/libs, this brings support -dnl for the standard configure options --x-includes and --x-libraries; -dnl the path to the X headers/libs is not only needed for motif, but also -dnl by the OpenGL and XKBlib.h checks further down - -AC_PATH_XTRA -CPPFLAGS="$CPPFLAGS $X_CFLAGS" -LDFLAGS="$LDFLAGS $X_LIBS" - -if test "$wxUSE_MOTIF" = 1; then - if test "$no_x" = "yes"; then - AC_MSG_ERROR(X11 not found, please use --x-includes and/or --x-libraries options) - fi - - GUI_TK_LIBRARY="$X_LIBS" - TOOLKIT_INCLUDE="$X_CFLAGS" - - AFMINSTALL=afminstall - - dnl manual check for X11 headers/libs - dnl - dnl AC_MSG_CHECKING(for X11 headers) - dnl WX_PATH_FIND_INCLUDES($SEARCH_INCLUDE, X11/Intrinsic.h) - dnl if test "$ac_find_includes" != "" ; then - dnl AC_MSG_RESULT(found $ac_find_includes) - dnl else - dnl AC_MSG_RESULT(no) - dnl AC_MSG_ERROR(please set CFLAGS to contain the location of X11/Intrinsic.h) - dnl fi - dnl - dnl AC_MSG_CHECKING(for X11 libraries) - dnl WX_PATH_FIND_LIBRARIES($SEARCH_LIB, X11) - dnl if test "$ac_find_libraries" != "" ; then - dnl WX_INCLUDE_PATH_EXIST($ac_find_includes, $TOOLKIT_INCLUDE) - dnl WX_LINK_PATH_EXIST($ac_find_libraries, $GUI_TK_LIBRARY) - dnl - dnl GUI_TK_LIBRARY="$GUI_TK_LIBRARY $ac_path_to_link" - dnl TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE $ac_path_to_include" - dnl AC_MSG_RESULT(found at $ac_find_libraries) - dnl else - dnl AC_MSG_RESULT(no) - dnl AC_MSG_ERROR(please set LDFLAGS to contain the location of libX11) - dnl fi - - COMPILED_X_PROGRAM=0 - - AC_MSG_CHECKING(for Motif/Lesstif headers) - WX_PATH_FIND_INCLUDES($SEARCH_INCLUDE, Xm/Xm.h) - if test "$ac_find_includes" != "" ; then - AC_MSG_RESULT(found $ac_find_includes) - else - AC_TRY_COMPILE( - [ - #include - ], - [ - int version; - - version = xmUseVersion; - ], - [ - AC_MSG_RESULT(found in default search path) - COMPILED_X_PROGRAM=1 - ], - [ - AC_MSG_RESULT(no) - AC_MSG_ERROR(please set CFLAGS to contain the location of Xm/Xm.h) - ] - ) - fi - - if test "$COMPILED_X_PROGRAM" = 0; then - AC_MSG_CHECKING(for Motif/Lesstif library) - WX_PATH_FIND_LIBRARIES($SEARCH_LIB, Xm) + XPM_LINK="" + AC_MSG_CHECKING(for Xpm library) + WX_PATH_FIND_LIBRARIES($SEARCH_LIB,Xpm) if test "$ac_find_libraries" != "" ; then - WX_INCLUDE_PATH_EXIST($ac_find_includes, $TOOLKIT_INCLUDE) - WX_LINK_PATH_EXIST($ac_find_libraries, $GUI_TK_LIBRARY) - - GUI_TK_LIBRARY="$GUI_TK_LIBRARY $ac_path_to_link" - TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE $ac_path_to_include" + GUI_TK_LIBRARY="-L$ac_find_libraries" + XPM_LINK="-lXpm" + AC_DEFINE(wxHAVE_LIB_XPM) AC_MSG_RESULT(found at $ac_find_libraries) else - dnl it might happen that we found headers in one of the standard - dnl paths but the libs are elsewhere - we do need to try to - dnl compile a sample program then here + AC_MSG_RESULT(no) + AC_MSG_WARN(library will be compiled without support for images in XPM format) + fi + + MESA_LINK="" + AC_MSG_CHECKING(for Mesa library) + WX_PATH_FIND_LIBRARIES($SEARCH_LIB,MesaGL) + if test "$ac_find_libraries" != "" ; then + GUI_TK_LIBRARY="$GUI_TK_LIBRARY -L$ac_find_libraries" + MESA_LINK="-lMesaGL" + AC_MSG_RESULT(found at $ac_find_libraries) + else + AC_MSG_ERROR(no) + fi + + GUI_TK_LINK="-lwine $MESA_LINK $XPM_LINK -lXxf86dga -lXxf86vm -lSM -lICE -lXext -lXmu -lX11 -lncurses" + GUI_TK_LIBRARY="$GUI_TK_LIBRARY $GUI_TK_LINK" + WXWINE=1 + TOOLKIT=MSW + + GUIHEADERS="\$(MSW_HEADERS)" + GUIOBJS="\$(MSW_GUIOBJS)" + COMMONOBJS="\$(MSW_COMMONOBJS)" + GENERICOBJS="\$(MSW_GENERICOBJS)" + GUIDEPS="\$(MSW_GUIDEPS)" + COMMONDEPS="\$(MSW_COMMONDEPS)" + GENERICDEPS="\$(MSW_GENERICDEPS)" + UNIXOBJS="\$(UNIX_OBJS)" + UNIXDEPS="\$(UNIX_DEPS)" + GUIDIST=MSW_DIST + fi + + dnl use standard macros to check for X headers/libs, this brings support + dnl for the standard configure options --x-includes and --x-libraries; + dnl the path to the X headers/libs is not only needed for motif, but also + dnl by the OpenGL and XKBlib.h checks further down + + AC_PATH_XTRA + CPPFLAGS="$CPPFLAGS $X_CFLAGS" + LDFLAGS="$LDFLAGS $X_LIBS" + + if test "$wxUSE_MOTIF" = 1; then + if test "$no_x" = "yes"; then + AC_MSG_ERROR(X11 not found, please use --x-includes and/or --x-libraries options) + fi + + GUI_TK_LIBRARY="$X_LIBS" + TOOLKIT_INCLUDE="$X_CFLAGS" + + AFMINSTALL=afminstall + + dnl manual check for X11 headers/libs + dnl + dnl AC_MSG_CHECKING(for X11 headers) + dnl WX_PATH_FIND_INCLUDES($SEARCH_INCLUDE, X11/Intrinsic.h) + dnl if test "$ac_find_includes" != "" ; then + dnl AC_MSG_RESULT(found $ac_find_includes) + dnl else + dnl AC_MSG_RESULT(no) + dnl AC_MSG_ERROR(please set CFLAGS to contain the location of X11/Intrinsic.h) + dnl fi + dnl + dnl AC_MSG_CHECKING(for X11 libraries) + dnl WX_PATH_FIND_LIBRARIES($SEARCH_LIB, X11) + dnl if test "$ac_find_libraries" != "" ; then + dnl WX_INCLUDE_PATH_EXIST($ac_find_includes, $TOOLKIT_INCLUDE) + dnl WX_LINK_PATH_EXIST($ac_find_libraries, $GUI_TK_LIBRARY) + dnl + dnl GUI_TK_LIBRARY="$GUI_TK_LIBRARY $ac_path_to_link" + dnl TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE $ac_path_to_include" + dnl AC_MSG_RESULT(found at $ac_find_libraries) + dnl else + dnl AC_MSG_RESULT(no) + dnl AC_MSG_ERROR(please set LDFLAGS to contain the location of libX11) + dnl fi + + COMPILED_X_PROGRAM=0 + + AC_MSG_CHECKING(for Motif/Lesstif headers) + WX_PATH_FIND_INCLUDES($SEARCH_INCLUDE, Xm/Xm.h) + if test "$ac_find_includes" != "" ; then + AC_MSG_RESULT(found $ac_find_includes) + else AC_TRY_COMPILE( [ #include @@ -1801,129 +1814,180 @@ if test "$wxUSE_MOTIF" = 1; then ], [ AC_MSG_RESULT(no) - AC_MSG_ERROR(please set LDFLAGS to contain the location of libXm) + AC_MSG_ERROR(please set CFLAGS to contain the location of Xm/Xm.h) ] ) fi - fi - dnl we don't need this as we used AC_PATH_XTRA above which does it for us - dnl - dnl dnl if we already compiled a sample program, X libs are surely there - dnl if test "$COMPILED_X_PROGRAM" = 0; then - dnl AC_MSG_CHECKING(for Xt library) - dnl WX_PATH_FIND_LIBRARIES($SEARCH_LIB,Xt) - dnl if test "$ac_find_libraries" != "" ; then - dnl WX_LINK_PATH_EXIST($ac_find_libraries,$GUI_TK_LIBRARY) - dnl GUI_TK_LIBRARY="$GUI_TK_LIBRARY $ac_path_to_link" - dnl AC_MSG_RESULT(found at $ac_find_libraries) - dnl else - dnl AC_TRY_COMPILE - dnl ( - dnl [ - dnl #include - dnl ], - dnl [ - dnl char *p; - dnl p = XtMalloc(5); - dnl ], - dnl [ - dnl AC_MSG_RESULT(found in default search path) - dnl COMPILED_X_PROGRAM=1 - dnl ], - dnl [ - dnl AC_MSG_RESULT(no) - dnl AC_MSG_ERROR(please set LDFLAGS to contain the location of libXt) - dnl ] - dnl ) - dnl fi - dnl fi + if test "$COMPILED_X_PROGRAM" = 0; then + AC_MSG_CHECKING(for Motif/Lesstif library) + WX_PATH_FIND_LIBRARIES($SEARCH_LIB, Xm) + if test "$ac_find_libraries" != "" ; then + WX_INCLUDE_PATH_EXIST($ac_find_includes, $TOOLKIT_INCLUDE) + WX_LINK_PATH_EXIST($ac_find_libraries, $GUI_TK_LIBRARY) - XPM_LINK="" - AC_MSG_CHECKING(for Xpm library) - WX_PATH_FIND_LIBRARIES($SEARCH_LIB,Xpm) - if test "$ac_find_libraries" != "" ; then - WX_LINK_PATH_EXIST($ac_find_libraries,$GUI_TK_LIBRARY) - GUI_TK_LIBRARY="$GUI_TK_LIBRARY $ac_path_to_link" - XPM_LINK="-lXpm " - AC_DEFINE(wxHAVE_LIB_XPM) - AC_MSG_RESULT(found at $ac_find_libraries) - else - AC_TRY_COMPILE( - [ - #include - ], - [ - int version; + GUI_TK_LIBRARY="$GUI_TK_LIBRARY $ac_path_to_link" + TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE $ac_path_to_include" + AC_MSG_RESULT(found at $ac_find_libraries) + else + dnl it might happen that we found headers in one of the standard + dnl paths but the libs are elsewhere - we do need to try to + dnl compile a sample program then here + AC_TRY_COMPILE( + [ + #include + ], + [ + int version; - version = XpmLibraryVersion(); - ], - [ + version = xmUseVersion; + ], + [ + AC_MSG_RESULT(found in default search path) + COMPILED_X_PROGRAM=1 + ], + [ + AC_MSG_RESULT(no) + AC_MSG_ERROR(please set LDFLAGS to contain the location of libXm) + ] + ) + fi + fi + + dnl we don't need this as we used AC_PATH_XTRA above which does it for us + dnl + dnl dnl if we already compiled a sample program, X libs are surely there + dnl if test "$COMPILED_X_PROGRAM" = 0; then + dnl AC_MSG_CHECKING(for Xt library) + dnl WX_PATH_FIND_LIBRARIES($SEARCH_LIB,Xt) + dnl if test "$ac_find_libraries" != "" ; then + dnl WX_LINK_PATH_EXIST($ac_find_libraries,$GUI_TK_LIBRARY) + dnl GUI_TK_LIBRARY="$GUI_TK_LIBRARY $ac_path_to_link" + dnl AC_MSG_RESULT(found at $ac_find_libraries) + dnl else + dnl AC_TRY_COMPILE + dnl ( + dnl [ + dnl #include + dnl ], + dnl [ + dnl char *p; + dnl p = XtMalloc(5); + dnl ], + dnl [ + dnl AC_MSG_RESULT(found in default search path) + dnl COMPILED_X_PROGRAM=1 + dnl ], + dnl [ + dnl AC_MSG_RESULT(no) + dnl AC_MSG_ERROR(please set LDFLAGS to contain the location of libXt) + dnl ] + dnl ) + dnl fi + dnl fi + + XPM_LINK="" + AC_MSG_CHECKING(for Xpm library) + WX_PATH_FIND_LIBRARIES($SEARCH_LIB,Xpm) + if test "$ac_find_libraries" != "" ; then + WX_LINK_PATH_EXIST($ac_find_libraries,$GUI_TK_LIBRARY) + GUI_TK_LIBRARY="$GUI_TK_LIBRARY $ac_path_to_link" XPM_LINK="-lXpm " AC_DEFINE(wxHAVE_LIB_XPM) - AC_MSG_RESULT(found in default search path) - COMPILED_X_PROGRAM=0 - ], - [ - AC_MSG_RESULT(no) - AC_MSG_WARN(library will be compiled without support for images in XPM format) - ] - ) + AC_MSG_RESULT(found at $ac_find_libraries) + else + AC_TRY_COMPILE( + [ + #include + ], + [ + int version; + + version = XpmLibraryVersion(); + ], + [ + XPM_LINK="-lXpm " + AC_DEFINE(wxHAVE_LIB_XPM) + AC_MSG_RESULT(found in default search path) + COMPILED_X_PROGRAM=0 + ], + [ + AC_MSG_RESULT(no) + AC_MSG_WARN(library will be compiled without support for images in XPM format) + ] + ) + fi + + GUI_TK_LINK="-lXm $XPM_LINK -lXmu -lXext -lXt -lX11" + GUI_TK_LIBRARY="$GUI_TK_LIBRARY $GUI_TK_LINK" + TOOLKIT=MOTIF + + GUIHEADERS="\$(MOTIF_HEADERS)" + GUIOBJS="\$(MOTIF_GUIOBJS)" + COMMONOBJS="\$(MOTIF_COMMONOBJS)" + GENERICOBJS="\$(MOTIF_GENERICOBJS)" + GUIDEPS="\$(MOTIF_GUIDEPS)" + COMMONDEPS="\$(MOTIF_COMMONDEPS)" + GENERICDEPS="\$(MOTIF_GENERICDEPS)" + UNIXOBJS="\$(UNIX_OBJS)" + UNIXDEPS="\$(UNIX_DEPS)" + GUIDIST=MOTIF_DIST fi - GUI_TK_LINK="-lXm $XPM_LINK -lXmu -lXext -lXt -lX11" - GUI_TK_LIBRARY="$GUI_TK_LIBRARY $GUI_TK_LINK" - TOOLKIT=MOTIF + if test "$wxUSE_PM" = 1; then + TOOLKIT=PM - GUIHEADERS="\$(MOTIF_HEADERS)" - GUIOBJS="\$(MOTIF_GUIOBJS)" - COMMONOBJS="\$(MOTIF_COMMONOBJS)" - GENERICOBJS="\$(MOTIF_GENERICOBJS)" - GUIDEPS="\$(MOTIF_GUIDEPS)" - COMMONDEPS="\$(MOTIF_COMMONDEPS)" - GENERICDEPS="\$(MOTIF_GENERICDEPS)" - UNIXOBJS="\$(UNIX_OBJS)" - UNIXDEPS="\$(UNIX_DEPS)" - GUIDIST=MOTIF_DIST -fi + GUIOBJS="\$(PM_GUIOBJS)" + GUIHEADERS="\$(PM_HEADERS)" + COMMONOBJS="\$(PM_COMMONOBJS)" + GENERICOBJS="\$(PM_GENERICOBJS)" + GUIDEPS="\$(PM_GUIDEPS)" + COMMONDEPS="\$(PM_COMMONDEPS)" + GENERICDEPS="\$(PM_GENERICDEPS)" + UNIXOBJS= + UNIXDEPS= + GUIDIST=GTK_DIST + fi -if test "$wxUSE_PM" = 1; then - TOOLKIT=PM - - GUIOBJS="\$(PM_GUIOBJS)" - GUIHEADERS="\$(PM_HEADERS)" - COMMONOBJS="\$(PM_COMMONOBJS)" - GENERICOBJS="\$(PM_GENERICOBJS)" - GUIDEPS="\$(PM_GUIDEPS)" - COMMONDEPS="\$(PM_COMMONDEPS)" - GENERICDEPS="\$(PM_GENERICDEPS)" - UNIXOBJS= - UNIXDEPS= - GUIDIST=GTK_DIST -fi - -dnl the name of the directory where the files for this toolkit live -if test "$TOOLKIT" != "PM" ; then - TOOLKIT_DIR=`echo ${TOOLKIT} | tr "[[A-Z]]" "[[a-z]]"` -else - TOOLKIT_DIR="os2" -fi + dnl the name of the directory where the files for this toolkit live + if test "$TOOLKIT" != "PM" ; then + TOOLKIT_DIR=`echo ${TOOLKIT} | tr "[[A-Z]]" "[[a-z]]"` + else + TOOLKIT_DIR="os2" + fi dnl the (base) name of the library and support files for this toolkit + TOOLKIT_NAME="${TOOLKIT_DIR}" + + dnl are we using the generic version with this low level toolkit? + if test "$wxUSE_UNIVERSAL" = "yes"; then + TOOLKIT_NAME="${TOOLKIT_NAME}univ" + fi + + dnl append 'd' to the debug library name if test "$wxUSE_DEBUG_FLAG" = "yes"; then - TOOLKIT_NAME="${TOOLKIT_DIR}d" - else - TOOLKIT_NAME="${TOOLKIT_DIR}" + TOOLKIT_NAME="${TOOLKIT_NAME}d" fi dnl the symbol which allows conditional compilation for the given toolkit TOOLKIT_DEF="-D__WX${TOOLKIT}__" + if test "$wxUSE_UNIVERSAL" = "yes"; then + TOOLKIT_DEF="${TOOLKIT_DEF} -D__WXUNIVERSAL__" + fi dnl the name of the (libtool) library WX_LIBRARY="wx_${TOOLKIT_NAME}" dnl the sources, their dependenices and the headers - ALL_OBJECTS="\$(GUIOBJS) \$(COMMONOBJS) \$(GENERICOBJS) \$(UNIXOBJS) \$(HTMLOBJS) \$(OGLOBJS)" + if test "$wxUSE_UNIVERSAL" = "yes"; then + ALL_OBJECTS="\$(GUI_LOWLEVEL_OBJS)" + else + ALL_OBJECTS="\$(GUIOBJS)" + fi + ALL_OBJECTS="${ALL_OBJECTS} \$(COMMONOBJS) \$(GENERICOBJS) \$(UNIXOBJS)" + if test "$wxUSE_HTML" = "yes"; then + ALL_OBJECTS="${ALL_OBJECTS} \$(HTMLOBJS)" + fi dnl ODBC objects are Unix only if test "$TOOLKIT" != "MSW"; then @@ -1944,7 +2008,14 @@ fi if test "$wxUSE_ZLIB" = "yes" ; then ALL_OBJECTS="${ALL_OBJECTS} \$(ZLIBOBJS)" fi - ALL_DEPFILES="\$(GUIDEPS) \$(COMMONDEPS) \$(GENERICDEPS) \$(UNIXDEPS) \$(HTMLDEPS) \$(OGLDEPS)" + + if test "$wxUSE_UNIVERSAL" = "yes"; then + ALL_DEPFILES="\$(GUI_LOWLEVEL_DEPS)" + else + ALL_DEPFILES="\$(GUIDEPS)" + fi + + ALL_DEPFILES="${ALL_DEPFILES} \$(COMMONDEPS) \$(GENERICDEPS) \$(UNIXDEPS) \$(HTMLDEPS) \$(OGLDEPS)" PORT_FILES="src/\$(TOOLKITDIR)/files.lst" RPM_FILES="src/\$(TOOLKITDIR)/rpmfiles.lst" @@ -2831,7 +2902,7 @@ fi TIFF_INCLUDE= if test "$wxUSE_LIBTIFF" = "yes" -o "$wxUSE_LIBTIFF" = "sys" ; then AC_DEFINE(wxUSE_LIBTIFF) - if test "$wxUSE_LIBTIFF" = "yes" ; then + if test "$wxUSE_LIBTIFF" = "yes" ; then TIFF_INCLUDE="-I\${top_srcdir}/src/tiff" else TIFF_LINK= @@ -2901,6 +2972,18 @@ if test "$wxUSE_WAVE" = "yes"; then AC_DEFINE(wxUSE_WAVE) fi +if test "$wxUSE_CMDLINE_PARSER" = "yes"; then + AC_DEFINE(wxUSE_CMDLINE_PARSER) +fi + +if test "$wxUSE_STOPWATCH" = "yes"; then + AC_DEFINE(wxUSE_STOPWATCH) +fi + +if test "$wxUSE_DATETIME" = "yes"; then + AC_DEFINE(wxUSE_DATETIME) +fi + if test "$wxUSE_FILE" = "yes"; then AC_DEFINE(wxUSE_FILE) fi @@ -2961,11 +3044,23 @@ if test "$wxUSE_INTL" = "yes" ; then fi if test "$wxUSE_LOG" = "yes"; then - AC_DEFINE(wxUSE_LOG) + AC_DEFINE(wxUSE_LOG) + + if test "$wxUSE_LOGGUI" = "yes"; then + AC_DEFINE(wxUSE_LOGGUI) + fi + + if test "$wxUSE_LOGWINDOW" = "yes"; then + AC_DEFINE(wxUSE_LOGWINDOW) + fi +fi + +if test "$wxUSE_FONTMAP" = "yes"; then + AC_DEFINE(wxUSE_FONTMAP) fi if test "$wxUSE_LONGLONG" = "yes"; then - AC_DEFINE(wxUSE_LONGLONG) + AC_DEFINE(wxUSE_LONGLONG) fi if test "$wxUSE_PLOT" = "yes"; then @@ -2985,7 +3080,7 @@ dnl ------------------------------------------------------------------------ dnl time/date functions dnl ------------------------------------------------------------------------ -if test "$wxUSE_TIMEDATE" = "yes"; then +if test "$wxUSE_DATETIME" = "yes"; then dnl check for strptime AC_CHECK_FUNCS(strptime) @@ -3108,7 +3203,7 @@ if test "$wxUSE_TIMEDATE" = "yes"; then fi fi - AC_DEFINE(wxUSE_TIMEDATE) + AC_DEFINE(wxUSE_DATETIME) SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS typetest" fi @@ -3451,10 +3546,22 @@ dnl --------------------------------------------------------------------------- dnl GUI controls dnl --------------------------------------------------------------------------- +if test "$wxUSE_CONTROLS" = "yes"; then + AC_DEFINE(wxUSE_CONTROLS) +fi + if test "$wxUSE_ACCEL" = "yes"; then AC_DEFINE(wxUSE_ACCEL) fi +if test "$wxUSE_BUTTON" = "yes"; then + AC_DEFINE(wxUSE_BUTTON) +fi + +if test "$wxUSE_BMPBUTTON" = "yes"; then + AC_DEFINE(wxUSE_BMPBUTTON) +fi + if test "$wxUSE_CARET" = "yes"; then AC_DEFINE(wxUSE_CARET) SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS caret" @@ -3468,10 +3575,6 @@ if test "$wxUSE_CHOICE" = "yes"; then AC_DEFINE(wxUSE_CHOICE) fi -if test "$wxUSE_BMPBUTTON" = "yes"; then - AC_DEFINE(wxUSE_BMPBUTTON) -fi - if test "$wxUSE_CHECKBOX" = "yes"; then AC_DEFINE(wxUSE_CHECKBOX) fi @@ -3580,6 +3683,11 @@ if test "$wxUSE_TABDIALOG" = "yes"; then SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS tab" fi +if test "$wxUSE_TEXTCTRL" = "yes"; then + AC_DEFINE(wxUSE_TEXTCTRL) + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS text" +fi + if test "$wxUSE_TOOLBAR_SIMPLE" = "yes"; then AC_DEFINE(wxUSE_TOOLBAR_SIMPLE) wxUSE_TOOLBAR="yes" @@ -3634,6 +3742,22 @@ if test "$wxUSE_METAFILE" = "yes"; then AC_DEFINE(wxUSE_METAFILE) fi +if test "$wxUSE_CHOICEDLG" = "yes"; then + AC_DEFINE(wxUSE_CHOICEDLG) +fi + +if test "$wxUSE_COLOURDLG" = "yes"; then + AC_DEFINE(wxUSE_COLOURDLG) +fi + +if test "$wxUSE_FILEDLG" = "yes"; then + AC_DEFINE(wxUSE_FILEDLG) +fi + +if test "$wxUSE_FONTDLG" = "yes"; then + AC_DEFINE(wxUSE_FONTDLG) +fi + if test "$wxUSE_DIRDLG" = "yes"; then if test "$wxUSE_CONSTRAINTS" != "yes"; then AC_MSG_WARN(wxDirDialog requires constraints so it won't be compiled without them) @@ -3646,6 +3770,14 @@ if test "$wxUSE_DIRDLG" = "yes"; then fi fi +if test "$wxUSE_MSGDLG" = "yes"; then + AC_DEFINE(wxUSE_MSGDLG) +fi + +if test "$wxUSE_NUMBERDLG" = "yes"; then + AC_DEFINE(wxUSE_NUMBERDLG) +fi + if test "$wxUSE_TEXTDLG" = "yes"; then AC_DEFINE(wxUSE_TEXTDLG) fi @@ -3762,6 +3894,10 @@ if test "$wxUSE_GUI" = "yes"; then SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS controls dialogs dragimag drawing dynamic \ font fractal image menu minimal richedit" + if test "$wxUSE_UNICODE" = "yes" ; then + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS univ" + fi + dnl this is needed to be able to find AFM files CPPFLAGS="$CPPFLAGS \$(EXTRADEFS) \$(APPEXTRADEFS)" else @@ -3876,7 +4012,7 @@ AC_SUBST(RESPROGRAM) AC_SUBST(RESCOMP) AC_SUBST(RESFLAGS) -dnl These seam to be missing +dnl These seem to be missing AC_SUBST(DLLTOOL) AC_SUBST(AS) AC_SUBST(NM) @@ -3894,12 +4030,12 @@ if test -d include; then if test -d include/wx; then if test -d include/wx/${TOOLKIT_DIR}; then if test -f include/wx/${TOOLKIT_DIR}/setup.h; then - mv -f include/wx/${TOOLKIT_DIR}/setup.h setup.h + mv -f include/wx/${TOOLKIT_DIR}/setup.h setup.h fi fi fi fi - + AC_CONFIG_HEADER(setup.h:setup.h.in) dnl some more GUI only things @@ -3929,10 +4065,10 @@ AC_OUTPUT([ chmod +x wx-config mv wx-config wx${TOOLKIT_NAME}-config ${LN_S} wx${TOOLKIT_NAME}-config wx-config - + dnl the debian build process wants setup.h in the lib subdir so we dnl can pretend wxWin is already installed, so we *copy* it there - + if test ! -d lib; then mkdir lib fi @@ -3966,7 +4102,7 @@ AC_OUTPUT([ if test -f setup.h; then mv -f setup.h include/wx/${TOOLKIT_DIR}/setup.h fi - + ], [ TOOLKIT_DIR="${TOOLKIT_DIR}" diff --git a/distrib/msw/tmake/Makefile b/distrib/msw/tmake/Makefile index 00cd18fd74..c1e1b76e90 100644 --- a/distrib/msw/tmake/Makefile +++ b/distrib/msw/tmake/Makefile @@ -1,7 +1,8 @@ # FIXME we'll generate this makefile with configure later, but for now please # change it manually -TMAKEDIR=/home/zeitlin/build/tmake -TMAKE=$(TMAKEDIR)/bin/tmake +#TMAKEDIR=/home/zeitlin/build/tmake +#TMAKE=$(TMAKEDIR)/bin/tmake +TMAKE=tmake WXDIR=../../.. MSW_MAKEFILES_DIR=$(WXDIR)/src/msw diff --git a/distrib/msw/tmake/filelist.txt b/distrib/msw/tmake/filelist.txt index d21c284737..820c16f577 100644 --- a/distrib/msw/tmake/filelist.txt +++ b/distrib/msw/tmake/filelist.txt @@ -44,6 +44,7 @@ # P Not required for the os2Pm port # (unfortunately I can't use O since that is # in use already - and above I can't use P :-( ) +# L Low level GUI toolkit file, used by wxUniversal as well # # WX Base header # GTK GTK header @@ -326,49 +327,49 @@ gsocket.c U B mimetype.cpp U B gsockgtk.c R -win_gtk.c R +win_gtk.c R L accel.cpp R -app.cpp R -bitmap.cpp R +app.cpp R L +bitmap.cpp R L bmpbuttn.cpp R -brush.cpp R +brush.cpp R L button.cpp R checkbox.cpp R checklst.cpp R choice.cpp R clipbrd.cpp R -colour.cpp R +colour.cpp R L combobox.cpp R control.cpp R -cursor.cpp R -data.cpp R +cursor.cpp R L +data.cpp R L dataobj.cpp R -dc.cpp R -dcclient.cpp R -dcmemory.cpp R -dcscreen.cpp R -dialog.cpp R +dc.cpp R L +dcclient.cpp R L +dcmemory.cpp R L +dcscreen.cpp R L +dialog.cpp R L dnd.cpp R -font.cpp R +font.cpp R L fontdlg.cpp R -frame.cpp R +frame.cpp R L gauge.cpp R -gdiobj.cpp R -icon.cpp R +gdiobj.cpp R L +icon.cpp R L joystick.cpp R listbox.cpp R -main.cpp R +main.cpp R L mdi.cpp R menu.cpp R minifram.cpp R notebook.cpp R -palette.cpp R -pen.cpp R +palette.cpp R L +pen.cpp R L radiobox.cpp R radiobut.cpp R -region.cpp R +region.cpp R L scrolbar.cpp R -settings.cpp R +settings.cpp R L slider.cpp R spinbutt.cpp R spinctrl.cpp R @@ -380,10 +381,10 @@ tbargtk.cpp R textctrl.cpp R timer.cpp R tooltip.cpp R -utilsgtk.cpp R +utilsgtk.cpp R L utilsres.cpp R wave.cpp R -window.cpp R +window.cpp R L gsockmot.c X S accel.cpp X diff --git a/distrib/msw/tmake/gtk.t b/distrib/msw/tmake/gtk.t index 5bdc9e97ca..7c204d2217 100644 --- a/distrib/msw/tmake/gtk.t +++ b/distrib/msw/tmake/gtk.t @@ -44,7 +44,12 @@ $project{"GTK_SOURCES"} .= "gtk/" . $file . " "; $project{"GUIOBJS"} .= $fileobj . " "; - $project{"GUIDEPS"} .= $filedep . " " + $project{"GUIDEPS"} .= $filedep . " "; + + if ( $wxGTK{$file} =~ /\bL\b/ ) { + $project{"GUI_LOWLEVEL_OBJS"} .= $fileobj . " "; + $project{"GUI_LOWLEVEL_DEPS"} .= $filedep . " "; + } } foreach $file (sort keys %wxUNIX) { @@ -64,7 +69,7 @@ $project{"HTMLOBJS"} .= $fileobj . " "; $project{"HTMLDEPS"} .= $filedep . " " } - + #! find all our headers foreach $file (sort keys %wxWXINCLUDE) { $project{"GTK_HEADERS"} .= $file . " " @@ -116,6 +121,12 @@ GUIOBJS = \ GUIDEPS = \ #$ ExpandList("GUIDEPS"); +GUI_LOWLEVEL_OBJS = \ + #$ ExpandList("GUI_LOWLEVEL_OBJS"); + +GUI_LOWLEVEL_DEPS = \ + #$ ExpandList("GUI_LOWLEVEL_DEPS"); + UNIXOBJS = \ #$ ExpandList("UNIXOBJS"); diff --git a/include/wx/app.h b/include/wx/app.h index 5538e053bd..4eb77ccecf 100644 --- a/include/wx/app.h +++ b/include/wx/app.h @@ -198,11 +198,11 @@ public: // object) - this log object is used by default by all wxLogXXX() // functions. virtual wxLog *CreateLogTarget() -#if wxUSE_GUI - { return new wxLogGui; } -#else // !GUI - { return new wxLogStderr; } -#endif // wxUSE_GUI + #if wxUSE_GUI && wxUSE_LOGGUI + { return new wxLogGui; } + #else // !GUI + { return new wxLogStderr; } + #endif // wxUSE_GUI #endif // wxUSE_LOG #if wxUSE_GUI diff --git a/include/wx/button.h b/include/wx/button.h index 31d4e12d0a..4a67b06532 100644 --- a/include/wx/button.h +++ b/include/wx/button.h @@ -1,6 +1,8 @@ #ifndef _WX_BUTTON_H_BASE_ #define _WX_BUTTON_H_BASE_ +#if wxUSE_BUTTON + #if defined(__WXMSW__) #include "wx/msw/button.h" #elif defined(__WXMOTIF__) @@ -17,5 +19,7 @@ #include "wx/stubs/button.h" #endif +#endif // wxUSE_BUTTON + #endif // _WX_BUTTON_H_BASE_ diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h new file mode 100644 index 0000000000..5d144f010d --- /dev/null +++ b/include/wx/chkconf.h @@ -0,0 +1,70 @@ +/* + * Name: wx/chkconf.h + * Purpose: check the config settings for consistency + * Author: Vadim Zeitlin + * Modified by: + * Created: 09.08.00 + * RCS-ID: $Id$ + * Copyright: (c) 2000 Vadim Zeitlin + * Licence: wxWindows license + */ + +/* + this global setting determintes what should we do if the setting FOO + requires BAR and BAR is not set: we can either silently define BAR + (default, recommended) or give an error and abort (mainly useful for + developpers only) + */ +#define wxABORT_ON_CONFIG_ERROR + +#if wxUSE_BUTTON || \ + wxUSE_CARET || \ + wxUSE_COMBOBOX || \ + wxUSE_BMPBUTTON || \ + wxUSE_CHECKBOX || \ + wxUSE_CHECKLISTBOX || \ + wxUSE_CHOICE || \ + wxUSE_GAUGE || \ + wxUSE_GRID || \ + wxUSE_NEW_GRID || \ + wxUSE_IMAGLIST || \ + wxUSE_LISTBOX || \ + wxUSE_LISTCTRL || \ + wxUSE_NOTEBOOK || \ + wxUSE_RADIOBOX || \ + wxUSE_RADIOBTN || \ + wxUSE_SASH || \ + wxUSE_SCROLLBAR || \ + wxUSE_SLIDER || \ + wxUSE_SPINBTN || \ + wxUSE_SPINCTRL || \ + wxUSE_SPLITTER || \ + wxUSE_STATBMP || \ + wxUSE_STATBOX || \ + wxUSE_STATLINE || \ + wxUSE_STATUSBAR || \ + wxUSE_TAB_DIALOG || \ + wxUSE_TOOLBAR || \ + wxUSE_TOOLTIPS || \ + wxUSE_TREECTRL + #if !wxUSE_CONTROLS + #if wxABORT_ON_CONFIG_ERROR + #error "wxUSE_CONTROLS unset but some controls used" + #else + #undef wxUSE_CONTROLS + #define wxUSE_CONTROLS 1 + #endif + #endif +#endif /* controls */ + +#if wxUSE_STOPWATCH + #if !wxUSE_LONGLONG + #if wxABORT_ON_CONFIG_ERROR + #error "wxUSE_STOPWATCH requires wxUSE_LONGLONG" + #else + #undef wxUSE_LONGLONG + #define wxUSE_LONGLONG 1 + #endif + #endif +#endif /* wxUSE_STOPWATCH */ + diff --git a/include/wx/choice.h b/include/wx/choice.h index b0d2a70770..c40cf757e2 100644 --- a/include/wx/choice.h +++ b/include/wx/choice.h @@ -20,6 +20,8 @@ #pragma interface "choicebase.h" #endif +#if wxUSE_CHOICE + #include "wx/ctrlsub.h" // the base class // ---------------------------------------------------------------------------- @@ -74,5 +76,7 @@ public: #include "wx/stubs/choice.h" #endif +#endif // wxUSE_CHOICE + #endif // _WX_CHOICE_H_BASE_ diff --git a/include/wx/control.h b/include/wx/control.h index 7b1d491309..fd76b603a0 100644 --- a/include/wx/control.h +++ b/include/wx/control.h @@ -20,6 +20,8 @@ #pragma interface "controlbase.h" #endif +#if wxUSE_CONTROLS + #include "wx/window.h" // base class // ---------------------------------------------------------------------------- @@ -71,5 +73,7 @@ protected: #include "wx/stubs/control.h" #endif +#endif // wxUSE_CONTROLS + #endif // _WX_CONTROL_H_BASE_ diff --git a/include/wx/ctrlsub.h b/include/wx/ctrlsub.h index b785bea964..228386641b 100644 --- a/include/wx/ctrlsub.h +++ b/include/wx/ctrlsub.h @@ -16,6 +16,8 @@ #pragma interface "controlwithitems.h" #endif +#if wxUSE_CONTROLS + #include "wx/control.h" // base class // ---------------------------------------------------------------------------- @@ -93,6 +95,7 @@ protected: wxClientDataType m_clientDataItemsType; }; +#endif // wxUSE_CONTROLS + #endif // _WX_CTRLSUB_H_BASE_ - diff --git a/include/wx/dialog.h b/include/wx/dialog.h index 78e89ce307..26bc53b83f 100644 --- a/include/wx/dialog.h +++ b/include/wx/dialog.h @@ -27,12 +27,16 @@ public: void SetReturnCode(int returnCode) { m_returnCode = returnCode; } int GetReturnCode() const { return m_returnCode; } +#if wxUSE_STATTEXT && wxUSE_TEXTCTRL // splits text up at newlines and places the // lines into a vertical wxBoxSizer wxSizer *CreateTextSizer( const wxString &message ); +#endif // wxUSE_STATTEXT && wxUSE_TEXTCTRL +#if wxUSE_BUTTON // places buttons into a horizontal wxBoxSizer wxSizer *CreateButtonSizer( long flags ); +#endif // wxUSE_BUTTON protected: // the return code from modal dialog diff --git a/include/wx/dirdlg.h b/include/wx/dirdlg.h index 7298d81612..3c4d2e4acd 100644 --- a/include/wx/dirdlg.h +++ b/include/wx/dirdlg.h @@ -1,6 +1,8 @@ #ifndef _WX_DIRDLG_H_BASE_ #define _WX_DIRDLG_H_BASE_ +#if wxUSE_DIRDLG + // ---------------------------------------------------------------------------- // constants // ---------------------------------------------------------------------------- @@ -29,5 +31,7 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString; #include "wx/stubs/dirdlg.h" #endif +#endif // wxUSE_DIRDLG + #endif // _WX_DIRDLG_H_BASE_ diff --git a/include/wx/encconv.h b/include/wx/encconv.h index 13dc535342..9e67c21141 100644 --- a/include/wx/encconv.h +++ b/include/wx/encconv.h @@ -15,6 +15,9 @@ #endif #include "wx/defs.h" + +#if wxUSE_FONTMAP + #include "wx/object.h" #include "wx/fontenc.h" #include "wx/dynarray.h" @@ -147,5 +150,6 @@ class WXDLLEXPORT wxEncodingConverter : public wxObject }; +#endif // wxUSE_FONTMAP #endif // _WX_ENCCONV_H_ diff --git a/include/wx/filedlg.h b/include/wx/filedlg.h index b35e63d016..c9af434ef7 100644 --- a/include/wx/filedlg.h +++ b/include/wx/filedlg.h @@ -1,6 +1,8 @@ #ifndef _WX_FILEDLG_H_BASE_ #define _WX_FILEDLG_H_BASE_ +#if wxUSE_FILEDLG + enum { wxOPEN = 1, @@ -27,6 +29,7 @@ enum #include "wx/stubs/filedlg.h" #endif +#endif // wxUSE_FILEDLG #endif // _WX_FILEDLG_H_BASE_ diff --git a/include/wx/fontdlg.h b/include/wx/fontdlg.h index f4e88317c2..a7fe76f87d 100644 --- a/include/wx/fontdlg.h +++ b/include/wx/fontdlg.h @@ -1,6 +1,8 @@ #ifndef _WX_FONTDLG_H_BASE_ #define _WX_FONTDLG_H_BASE_ +#if wxUSE_FONTDLG + #if defined(__WXMSW__) #include "wx/msw/fontdlg.h" #elif defined(__WXMOTIF__) @@ -25,5 +27,7 @@ # define sm_classwxFontDialog sm_classwxGenericFontDialog #endif +#endif // wxUSE_FONTDLG + #endif // _WX_FONTDLG_H_BASE_ diff --git a/include/wx/fontmap.h b/include/wx/fontmap.h index 43285146c0..9331241a2a 100644 --- a/include/wx/fontmap.h +++ b/include/wx/fontmap.h @@ -20,7 +20,10 @@ // headers // ---------------------------------------------------------------------------- +#if wxUSE_FONTMAP + #include "wx/fontenc.h" // for wxFontEncoding + #if wxUSE_GUI #include "wx/fontutil.h" // for wxNativeEncodingInfo #endif // wxUSE_GUI @@ -185,4 +188,6 @@ protected: // the default font mapper for wxWindows programs WXDLLEXPORT_DATA(extern wxFontMapper *) wxTheFontMapper; +#endif // wxUSE_FONTMAP + #endif // _WX_FONTMAPPER_H_ diff --git a/include/wx/frame.h b/include/wx/frame.h index 6f5ca2de91..da6fa02d1b 100644 --- a/include/wx/frame.h +++ b/include/wx/frame.h @@ -101,8 +101,10 @@ public: // menu bar functions // ------------------ +#if wxUSE_MENUS virtual void SetMenuBar(wxMenuBar *menubar) = 0; virtual wxMenuBar *GetMenuBar() const { return m_frameMenuBar; } +#endif // wxUSE_MENUS // call this to simulate a menu command bool Command(int id) { return ProcessCommand(id); } @@ -173,9 +175,11 @@ public: // so should be there for all platforms void OnActivate(wxActivateEvent &WXUNUSED(event)) { } +#if wxUSE_MENUS // send wxUpdateUIEvents for all menu items (called from OnIdle()) void DoMenuUpdates(); void DoMenuUpdates(wxMenu* menu, wxWindow* focusWin); +#endif // wxUSE_MENUS protected: // the frame main menu/status/tool bars @@ -185,7 +189,9 @@ protected: // main menubar, statusbar and toolbar (if any) void DeleteAllBars(); +#if wxUSE_MENUS wxMenuBar *m_frameMenuBar; +#endif // wxUSE_MENUS #if wxUSE_STATUSBAR // override to update status bar position (or anything else) when diff --git a/include/wx/generic/dirctrlg.h b/include/wx/generic/dirctrlg.h index 427983e15e..3f51fb20b6 100644 --- a/include/wx/generic/dirctrlg.h +++ b/include/wx/generic/dirctrlg.h @@ -9,7 +9,7 @@ // Created: 21/3/2000 // RCS-ID: $Id$ // Copyright: (c) Julian Smart -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_DIRCTRL_H_ @@ -19,6 +19,8 @@ #pragma interface "dirctrlg.h" #endif +#if wxUSE_DIRDLG + #include "wx/treectrl.h" #include "wx/dirdlg.h" #include "wx/choice.h" @@ -243,5 +245,7 @@ protected: }; +#endif // wxUSE_DIRDLG + #endif // _WX_DIRCTRLG_H_ diff --git a/include/wx/generic/gridg.h b/include/wx/generic/gridg.h index 9e0278cfab..81c3caf0c6 100644 --- a/include/wx/generic/gridg.h +++ b/include/wx/generic/gridg.h @@ -19,6 +19,9 @@ #endif #include "wx/defs.h" + +#if wxUSE_GRID + #include "wx/panel.h" #include "wx/string.h" #include "wx/scrolbar.h" @@ -420,5 +423,7 @@ typedef void (wxEvtHandler::*wxGridEventFunction)(wxGridEvent&); #define EVT_GRID_LABEL_LCLICK(fn) { wxEVT_GRID_LABEL_LCLICK, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxGridEventFunction) &fn, NULL }, #define EVT_GRID_LABEL_RCLICK(fn) { wxEVT_GRID_LABEL_RCLICK, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxGridEventFunction) &fn, NULL }, +#endif // wxUSE_GRID + #endif // __GRIDH_G__ diff --git a/include/wx/generic/laywin.h b/include/wx/generic/laywin.h index db428595fd..a8e0464831 100644 --- a/include/wx/generic/laywin.h +++ b/include/wx/generic/laywin.h @@ -194,8 +194,10 @@ class WXDLLEXPORT wxLayoutAlgorithm: public wxObject public: wxLayoutAlgorithm() {} +#if wxUSE_MDI_ARCHITECTURE // The MDI client window is sized to whatever's left over. bool LayoutMDIFrame(wxMDIParentFrame* frame, wxRect* rect = (wxRect*) NULL); +#endif // wxUSE_MDI_ARCHITECTURE // mainWindow is sized to whatever's left over. This function for backward // compatibility; use LayoutWindow. diff --git a/include/wx/generic/panelg.h b/include/wx/generic/panelg.h index eda2bd5abd..9122e11b66 100644 --- a/include/wx/generic/panelg.h +++ b/include/wx/generic/panelg.h @@ -71,9 +71,11 @@ public: // to the dialog via validators. virtual void InitDialog(); +#if wxUSE_BUTTON // a default button is activated when Enter is pressed wxButton *GetDefaultItem() const { return m_btnDefault; } void SetDefaultItem(wxButton *btn) { m_btnDefault = btn; } +#endif // wxUSE_BUTTON // implementation from now on // -------------------------- @@ -107,8 +109,10 @@ protected: // the child which had the focus last time this panel was activated wxWindow *m_winLastFocused; +#if wxUSE_BUTTON // a default button or NULL wxButton *m_btnDefault; +#endif // wxUSE_BUTTON private: DECLARE_DYNAMIC_CLASS(wxPanel) diff --git a/include/wx/generic/treectlg.h b/include/wx/generic/treectlg.h index 17e4e295ed..39a82f5d71 100644 --- a/include/wx/generic/treectlg.h +++ b/include/wx/generic/treectlg.h @@ -16,6 +16,8 @@ #pragma interface "treectlg.h" #endif +#if wxUSE_TREECTRL + #include "wx/defs.h" #include "wx/string.h" #include "wx/object.h" @@ -426,5 +428,7 @@ public: #endif +#endif // wxUSE_TREECTRL + #endif // _GENERIC_TREECTRL_H_ diff --git a/include/wx/gtk/frame.h b/include/wx/gtk/frame.h index 34cb29433b..d037bdda5e 100644 --- a/include/wx/gtk/frame.h +++ b/include/wx/gtk/frame.h @@ -69,7 +69,9 @@ public: virtual void MakeModal(bool modal = TRUE); virtual void Restore(); +#if wxUSE_MENUS virtual void SetMenuBar( wxMenuBar *menuBar ); +#endif // wxUSE_MENUS #if wxUSE_STATUSBAR virtual void PositionStatusBar(); diff --git a/include/wx/gtk/window.h b/include/wx/gtk/window.h index 914a9a045a..cd5fe6607a 100644 --- a/include/wx/gtk/window.h +++ b/include/wx/gtk/window.h @@ -86,7 +86,9 @@ public: const wxFont *theFont = (const wxFont *) NULL) const; +#if wxUSE_MENUS virtual bool DoPopupMenu( wxMenu *menu, int x, int y ); +#endif // wxUSE_MENUS virtual void SetScrollbar( int orient, int pos, int thumbVisible, int range, bool refresh = TRUE ); diff --git a/include/wx/gtk1/frame.h b/include/wx/gtk1/frame.h index 34cb29433b..d037bdda5e 100644 --- a/include/wx/gtk1/frame.h +++ b/include/wx/gtk1/frame.h @@ -69,7 +69,9 @@ public: virtual void MakeModal(bool modal = TRUE); virtual void Restore(); +#if wxUSE_MENUS virtual void SetMenuBar( wxMenuBar *menuBar ); +#endif // wxUSE_MENUS #if wxUSE_STATUSBAR virtual void PositionStatusBar(); diff --git a/include/wx/gtk1/window.h b/include/wx/gtk1/window.h index 914a9a045a..cd5fe6607a 100644 --- a/include/wx/gtk1/window.h +++ b/include/wx/gtk1/window.h @@ -86,7 +86,9 @@ public: const wxFont *theFont = (const wxFont *) NULL) const; +#if wxUSE_MENUS virtual bool DoPopupMenu( wxMenu *menu, int x, int y ); +#endif // wxUSE_MENUS virtual void SetScrollbar( int orient, int pos, int thumbVisible, int range, bool refresh = TRUE ); diff --git a/include/wx/listctrl.h b/include/wx/listctrl.h index 2165244e32..2ec3897e3c 100644 --- a/include/wx/listctrl.h +++ b/include/wx/listctrl.h @@ -16,6 +16,8 @@ #pragma interface "listctrlbase.h" #endif +#if wxUSE_LISTCTRL + // ---------------------------------------------------------------------------- // types // ---------------------------------------------------------------------------- @@ -316,5 +318,7 @@ typedef void (wxEvtHandler::*wxListEventFunction)(wxListEvent&); #define EVT_LIST_ITEM_MIDDLE_CLICK(id, fn) { wxEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxListEventFunction) & fn, (wxObject *) NULL }, #define EVT_LIST_ITEM_ACTIVATED(id, fn) { wxEVT_COMMAND_LIST_ITEM_ACTIVATED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxListEventFunction) & fn, (wxObject *) NULL }, +#endif // wxUSE_LISTCTRL + #endif // _WX_LISTCTRL_H_BASE_ diff --git a/include/wx/log.h b/include/wx/log.h index 6c2e4cdd51..bbd5839c1b 100644 --- a/include/wx/log.h +++ b/include/wx/log.h @@ -266,6 +266,8 @@ protected: #if wxUSE_GUI +#if wxUSE_TEXTCTRL + // log everything to a text window (GUI only of course) class WXDLLEXPORT wxLogTextCtrl : public wxLog { @@ -280,9 +282,14 @@ private: wxTextCtrl *m_pTextCtrl; }; +#endif // wxUSE_TEXTCTRL + // ---------------------------------------------------------------------------- // GUI log target, the default one for wxWindows programs // ---------------------------------------------------------------------------- + +#if wxUSE_LOGGUI + class WXDLLEXPORT wxLogGui : public wxLog { public: @@ -305,12 +312,17 @@ protected: m_bWarnings; // any warnings? }; +#endif // wxUSE_LOGGUI + // ---------------------------------------------------------------------------- // (background) log window: this class forwards all log messages to the log // target which was active when it was instantiated, but also collects them // to the log window. This window has it's own menu which allows the user to // close it, clear the log contents or save it to the file. // ---------------------------------------------------------------------------- + +#if wxUSE_LOGWINDOW + class WXDLLEXPORT wxLogWindow : public wxLog { public: @@ -364,6 +376,8 @@ private: wxLogFrame *m_pLogFrame; // the log frame }; +#endif // wxUSE_LOGWINDOW + #endif // wxUSE_GUI // ---------------------------------------------------------------------------- diff --git a/include/wx/sizer.h b/include/wx/sizer.h index c9ac671daf..0e8c9dc821 100644 --- a/include/wx/sizer.h +++ b/include/wx/sizer.h @@ -26,13 +26,9 @@ // classes //--------------------------------------------------------------------------- -class wxStaticBox; -class wxNotebook; - class wxSizerItem; class wxSizer; class wxBoxSizer; -class wxStaticBoxSizer; //--------------------------------------------------------------------------- // wxSizerItem @@ -69,7 +65,7 @@ public: bool IsWindow(); bool IsSizer(); bool IsSpacer(); - + void SetInitSize( int x, int y ) { m_minSize.x = x; m_minSize.y = y; } void SetOption( int option ) @@ -145,29 +141,29 @@ public: { DoSetMinSize( width, height ); } void SetMinSize( wxSize size ) { DoSetMinSize( size.x, size.y ); } - + /* Searches recursively */ bool SetItemMinSize( wxWindow *window, int width, int height ) { return DoSetItemMinSize( window, width, height ); } bool SetItemMinSize( wxWindow *window, wxSize size ) { return DoSetItemMinSize( window, size.x, size.y ); } - + /* Searches recursively */ bool SetItemMinSize( wxSizer *sizer, int width, int height ) { return DoSetItemMinSize( sizer, width, height ); } bool SetItemMinSize( wxSizer *sizer, wxSize size ) { return DoSetItemMinSize( sizer, size.x, size.y ); } - + bool SetItemMinSize( int pos, int width, int height ) { return DoSetItemMinSize( pos, width, height ); } bool SetItemMinSize( int pos, wxSize size ) { return DoSetItemMinSize( pos, size.x, size.y ); } - + wxSize GetSize() { return m_size; } wxPoint GetPosition() { return m_position; } - + /* Calculate the minimal size or return m_minSize if bigger. */ wxSize GetMinSize(); @@ -191,12 +187,12 @@ protected: wxList m_children; wxSize GetMinWindowSize( wxWindow *window ); - + virtual void DoSetMinSize( int width, int height ); virtual bool DoSetItemMinSize( wxWindow *window, int width, int height ); virtual bool DoSetItemMinSize( wxSizer *sizer, int width, int height ); virtual bool DoSetItemMinSize( int pos, int width, int height ); - + private: DECLARE_CLASS(wxSizer); }; @@ -210,7 +206,7 @@ class WXDLLEXPORT wxGridSizer: public wxSizer public: wxGridSizer( int rows, int cols, int vgap, int hgap ); wxGridSizer( int cols, int vgap = 0, int hgap = 0 ); - + void RecalcSizes(); wxSize CalcMin(); @@ -222,15 +218,15 @@ public: int GetRows() { return m_rows; } int GetVGap() { return m_vgap; } int GetHGap() { return m_hgap; } - + protected: int m_rows; int m_cols; int m_vgap; int m_hgap; - + void SetItemBounds( wxSizerItem *item, int x, int y, int w, int h ); - + private: DECLARE_CLASS(wxGridSizer); }; @@ -245,10 +241,10 @@ public: wxFlexGridSizer( int rows, int cols, int vgap, int hgap ); wxFlexGridSizer( int cols, int vgap = 0, int hgap = 0 ); ~wxFlexGridSizer(); - + void RecalcSizes(); wxSize CalcMin(); - + void AddGrowableRow( size_t idx ); void RemoveGrowableRow( size_t idx ); void AddGrowableCol( size_t idx ); @@ -259,9 +255,9 @@ protected: int *m_colWidths; wxArrayInt m_growableRows; wxArrayInt m_growableCols; - + void CreateArrays(); - + private: DECLARE_CLASS(wxFlexGridSizer); }; @@ -288,7 +284,7 @@ protected: int m_minHeight; int m_fixedWidth; int m_fixedHeight; - + private: DECLARE_CLASS(wxBoxSizer); }; @@ -297,6 +293,10 @@ private: // wxStaticBoxSizer //--------------------------------------------------------------------------- +#if wxUSE_STATBOX + +class WXDLLEXPORT wxStaticBox; + class WXDLLEXPORT wxStaticBoxSizer: public wxBoxSizer { public: @@ -310,17 +310,21 @@ public: protected: wxStaticBox *m_staticBox; - + private: DECLARE_CLASS(wxStaticBoxSizer); }; +#endif // wxUSE_STATBOX + //--------------------------------------------------------------------------- // wxNotebookSizer //--------------------------------------------------------------------------- #if wxUSE_NOTEBOOK +class WXDLLEXPORT wxNotebook; + class WXDLLEXPORT wxNotebookSizer: public wxSizer { public: @@ -334,12 +338,12 @@ public: protected: wxNotebook *m_notebook; - + private: DECLARE_CLASS(wxNotebookSizer); }; -#endif +#endif // wxUSE_NOTEBOOK #endif diff --git a/include/wx/stattext.h b/include/wx/stattext.h index 48ea950c52..e42bcc1ed4 100644 --- a/include/wx/stattext.h +++ b/include/wx/stattext.h @@ -1,6 +1,8 @@ #ifndef _WX_STATTEXT_H_BASE_ #define _WX_STATTEXT_H_BASE_ +#if wxUSE_STATTEXT + #if defined(__WXMSW__) #include "wx/msw/stattext.h" #elif defined(__WXMOTIF__) @@ -17,5 +19,7 @@ #include "wx/stubs/stattext.h" #endif +#endif // wxUSE_STATTEXT + #endif // _WX_STATTEXT_H_BASE_ diff --git a/include/wx/tbarbase.h b/include/wx/tbarbase.h index aa19f52861..0cff961f3d 100644 --- a/include/wx/tbarbase.h +++ b/include/wx/tbarbase.h @@ -22,6 +22,8 @@ #include "wx/defs.h" +#if wxUSE_TOOLBAR + #include "wx/bitmap.h" #include "wx/list.h" #include "wx/control.h" @@ -466,6 +468,8 @@ private: DECLARE_EVENT_TABLE() }; +#endif // wxUSE_TOOLBAR + #endif // _WX_TBARBASE_H_ diff --git a/include/wx/textctrl.h b/include/wx/textctrl.h index 02434c3377..87c7ed631c 100644 --- a/include/wx/textctrl.h +++ b/include/wx/textctrl.h @@ -15,11 +15,15 @@ // ---------------------------------------------------------------------------- // headers // ---------------------------------------------------------------------------- + #ifdef __GNUG__ #pragma interface "textctrlbase.h" #endif #include "wx/defs.h" + +#if wxUSE_TEXTCTRL + #include "wx/control.h" // the base class // 16-bit Borland 4.0 doesn't seem to allow multiple inheritance with wxWindow @@ -189,5 +193,7 @@ private: #include "wx/stubs/textctrl.h" #endif +#endif // wxUSE_TEXTCTRL + #endif // _WX_TEXTCTRL_H_BASE_ diff --git a/include/wx/textfile.h b/include/wx/textfile.h index 0f9ec816a3..d8777bf8ef 100644 --- a/include/wx/textfile.h +++ b/include/wx/textfile.h @@ -25,14 +25,8 @@ #define wxUSE_TEXTFILE 0 #endif // wxUSE_FILE -#if wxUSE_TEXTFILE - -#include "wx/string.h" -#include "wx/file.h" -#include "wx/dynarray.h" - // ---------------------------------------------------------------------------- -// wxTextFile +// constants // ---------------------------------------------------------------------------- // the line termination type @@ -45,6 +39,16 @@ enum wxTextFileType wxTextFileType_Os2 // 'CR' 'LF' }; +#if wxUSE_TEXTFILE + +#include "wx/string.h" +#include "wx/file.h" +#include "wx/dynarray.h" + +// ---------------------------------------------------------------------------- +// wxTextFile +// ---------------------------------------------------------------------------- + WX_DEFINE_EXPORTED_ARRAY(wxTextFileType, ArrayFileType); class WXDLLEXPORT wxTextFile @@ -184,6 +188,12 @@ private: // copy ctor/assignment operator not implemented wxTextFile(const wxTextFile&); wxTextFile& operator=(const wxTextFile&); + + // suppress the gcc warning: 'class defines only private constructors and + // has no friends' +#ifdef __GNUG__ + friend class wxTextFileDummyFriend; +#endif // gcc }; #endif // wxUSE_TEXTFILE diff --git a/include/wx/timer.h b/include/wx/timer.h index 7ea894d04a..d3e1b82ddb 100644 --- a/include/wx/timer.h +++ b/include/wx/timer.h @@ -22,7 +22,7 @@ #include "wx/longlong.h" #include "wx/event.h" -#if wxUSE_GUI +#if wxUSE_GUI && wxUSE_TIMER // ---------------------------------------------------------------------------- // wxTimer @@ -181,12 +181,14 @@ typedef void (wxEvtHandler::*wxTimerEventFunction)(wxTimerEvent&); #define EVT_TIMER(id, func) { wxEVT_TIMER, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTimerEventFunction) & func, NULL}, -#endif // wxUSE_GUI +#endif // wxUSE_GUI && wxUSE_TIMER // ---------------------------------------------------------------------------- // wxStopWatch: measure time intervals with up to 1ms resolution // ---------------------------------------------------------------------------- +#if wxUSE_STOPWATCH + class WXDLLEXPORT wxStopWatch { public: @@ -208,6 +210,9 @@ private: long m_pause; // the time of the last Pause() or 0 }; +#endif // wxUSE_STOPWATCH + +#if wxUSE_LONGLONG // Starts a global timer // -- DEPRECATED: use wxStopWatch instead @@ -217,6 +222,8 @@ void WXDLLEXPORT wxStartTimer(); // -- DEPRECATED: use wxStopWatch instead long WXDLLEXPORT wxGetElapsedTime(bool resetTimer = TRUE); +#endif // wxUSE_LONGLONG + // ---------------------------------------------------------------------------- // global time functions // ---------------------------------------------------------------------------- @@ -227,8 +234,10 @@ extern long WXDLLEXPORT wxGetLocalTime(); // Get number of seconds since GMT 00:00:00, Jan 1st 1970. extern long WXDLLEXPORT wxGetUTCTime(); +#if wxUSE_LONGLONG // Get number of milliseconds since local time 00:00:00 Jan 1st 1970 extern wxLongLong WXDLLEXPORT wxGetLocalTimeMillis(); +#endif // wxUSE_LONGLONG #define wxGetCurrentTime() wxGetLocalTime() diff --git a/include/wx/treebase.h b/include/wx/treebase.h index 4d9320be93..586ae36099 100644 --- a/include/wx/treebase.h +++ b/include/wx/treebase.h @@ -20,6 +20,8 @@ // headers // ---------------------------------------------------------------------------- +#if wxUSE_TREECTRL + #include "wx/control.h" #include "wx/event.h" @@ -280,6 +282,8 @@ typedef void (wxEvtHandler::*wxTreeEventFunction)(wxTreeEvent&); #define EVT_TREE_ITEM_RIGHT_CLICK(id, fn) { wxEVT_COMMAND_TREE_ITEM_RIGHT_CLICK, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL }, #define EVT_TREE_ITEM_MIDDLE_CLICK(id, fn) { wxEVT_COMMAND_TREE_ITEM_MIDDLE_CLICK, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL }, +#endif // wxUSE_TREECTRL + #endif // _WX_TREEBASE_H_ diff --git a/include/wx/window.h b/include/wx/window.h index 3410f7d3b5..f4fc98faed 100644 --- a/include/wx/window.h +++ b/include/wx/window.h @@ -556,10 +556,12 @@ public: void UpdateWindowUI(); +#if wxUSE_MENUS bool PopupMenu( wxMenu *menu, const wxPoint& pos ) { return DoPopupMenu(menu, pos.x, pos.y); } bool PopupMenu( wxMenu *menu, int x, int y ) { return DoPopupMenu(menu, x, y); } +#endif // wxUSE_MENUS // scrollbars // ---------- @@ -831,7 +833,9 @@ protected: virtual void DoSetToolTip( wxToolTip *tip ); #endif // wxUSE_TOOLTIPS +#if wxUSE_MENUS virtual bool DoPopupMenu( wxMenu *menu, int x, int y ) = 0; +#endif // wxUSE_MENUS // client data accessors virtual void DoSetClientObject( wxClientData *data ); diff --git a/include/wx/wizard.h b/include/wx/wizard.h index ec311b7cb9..8c454a2e6f 100644 --- a/include/wx/wizard.h +++ b/include/wx/wizard.h @@ -14,6 +14,8 @@ #ifndef _WX_WIZARD_H_ #define _WX_WIZARD_H_ +#if wxUSE_WIZARDDLG + // ---------------------------------------------------------------------------- // headers and other simple declarations // ---------------------------------------------------------------------------- @@ -188,4 +190,6 @@ typedef void (wxEvtHandler::*wxWizardEventFunction)(wxWizardEvent&); // unless the event handler vetoes the event #define EVT_WIZARD_CANCEL(id, fn) { wxEVT_WIZARD_CANCEL, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxWizardEventFunction) & fn, (wxObject *)NULL }, +#endif // wxUSE_WIZARDDLG + #endif // _WX_WIZARD_H_ diff --git a/samples/configure b/samples/configure index ebbe38a6eb..32c944ae89 100755 --- a/samples/configure +++ b/samples/configure @@ -700,6 +700,7 @@ trap 'rm -fr `echo " typetest/Makefile validate/Makefile sockets/Makefile + univ/Makefile wizard/Makefile html/Makefile html/about/Makefile @@ -844,6 +845,7 @@ CONFIG_FILES=\${CONFIG_FILES-"Makefile typetest/Makefile validate/Makefile sockets/Makefile + univ/Makefile wizard/Makefile html/Makefile html/about/Makefile diff --git a/samples/configure.in b/samples/configure.in index 94f8876d06..9580ef7d30 100644 --- a/samples/configure.in +++ b/samples/configure.in @@ -68,6 +68,7 @@ AC_OUTPUT([ typetest/Makefile validate/Makefile sockets/Makefile + univ/Makefile wizard/Makefile html/Makefile html/about/Makefile diff --git a/setup.h.in b/setup.h.in index 4ed1d58ae8..c8f73686f0 100644 --- a/setup.h.in +++ b/setup.h.in @@ -185,11 +185,36 @@ */ #define wxUSE_VALIDATORS 0 +/* + * Use wxControl + */ +#define wxUSE_CONTROLS 0 + /* * Use accelerators */ #define wxUSE_ACCEL 0 +/* + * Use wxFileDialog + */ +#define wxUSE_FILEDLG 0 + +/* + * Use wxFontDialog + */ +#define wxUSE_FONTDLG 0 + +/* + * Use wxMessageDialog (and wxMessageBox) + */ +#define wxUSE_MSGDLG 0 + +/* + * Use wxNumberEntryDialog + */ +#define wxUSE_NUMBERDLG 0 + /* * Use wxTextEntryDialog */ @@ -205,16 +230,45 @@ */ #define wxUSE_PROGRESSDLG 0 +/* + * Use chooser dialog + */ +#define wxUSE_CHOICEDLG 0 + +/* + * Use colour picker dialog + */ +#define wxUSE_COLOURDLG 0 + /* * Use directory chooser dialog */ #define wxUSE_DIRDLG 0 +/* + * Use property sheet classes + */ +#define wxUSE_PROPSHEET 0 + +/* + * Use wxWizard + */ +#define wxUSE_WIZARDDLG 0 + +/* + * Use splash screen + */ +#define wxUSE_SPLASH 0 + /* * Joystick support (Linux/GTK only) */ #define wxUSE_JOYSTICK 0 +/* + * Use this control + */ +#define wxUSE_BUTTON 0 /* * Use this control */ @@ -264,6 +318,10 @@ * Use this control */ #define wxUSE_LISTCTRL 0 +/* + * Use wxMenuBar, wxMenuItem and wxMenu + */ +#define wxUSE_MENUS 0 /* * Use this control */ @@ -327,6 +385,11 @@ /* compatibility */ #define wxUSE_TABDIALOG wxUSE_TAB_DIALOG +/* + * Use wxTextCtrl + */ +#define wxUSE_TEXTCTRL 0 + /* * Use wxToollBar */ @@ -344,7 +407,7 @@ #define wxUSE_TOOLBAR_SIMPLE 0 #if defined(__WXWINE__) || defined(__GNUWIN32__) || defined(__WXPM__) -#define wxUSE_OWNER_DRAWN 1 +#define wxUSE_OWNER_DRAWN 1 #if wxUSE_TOOLBAR #define wxUSE_BUTTONBAR 1 #endif @@ -360,6 +423,14 @@ */ #define wxUSE_LONGLONG 0 +/* + * Use wxCmdLineParser class + */ +#define wxUSE_CMDLINE_PARSER 0 +/* + * Use wxDateTime + */ +#define wxUSE_DATETIME 0 /* * Use wxFile class */ @@ -372,6 +443,18 @@ * Use log classes and logging functions */ #define wxUSE_LOG 0 +/* + * Use log window + */ +#define wxUSE_LOGWINDOW 0 +/* + * Use standard GUI logger + */ +#define wxUSE_LOGGUI 0 +/* + * Use wxStopWatch + */ +#define wxUSE_STOPWATCH 0 /* * Use time and date classes */ @@ -384,6 +467,10 @@ * Use config system */ #define wxUSE_CONFIG 0 +/* + * Use font mapping/conversion classes + */ +#define wxUSE_FONTMAP 0 /* * Use intl system */ @@ -414,6 +501,11 @@ */ #define wxUSE_DYNLIB_CLASS 0 +/* + * Use wxTimer + */ +#define wxUSE_TIMER 0 + /* * Use font metric files in GetTextExtent for wxPostScriptDC * Use consistent PostScript fonts for AFM and printing (!) @@ -589,7 +681,7 @@ * A class that shows info window when app is busy * (works exactly like wxBusyCursor) */ -#define wxUSE_BUSYINFO 0 +#define wxUSE_BUSYINFO 0 /* * Zip stream for accessing files stored inside .zip archives @@ -610,7 +702,7 @@ * PNM image format support */ #define wxUSE_PNM 0 - + /* * Disable this if your compiler can't cope * with omission of prototype parameters. @@ -793,4 +885,7 @@ /* Define this if you are using gtk and gdk contains support for X11R6 XIM */ #undef HAVE_XIM +/* now check the settings self consistency */ +#include "wx/chkconf.h" + #endif /* __WX_SETUP_H__ */ diff --git a/src/common/choiccmn.cpp b/src/common/choiccmn.cpp index 2e0e59eb66..06345dbdc6 100644 --- a/src/common/choiccmn.cpp +++ b/src/common/choiccmn.cpp @@ -28,6 +28,8 @@ #pragma hdrstop #endif +#if wxUSE_CHOICE + #ifndef WX_PRECOMP #include "wx/choice.h" #endif @@ -60,3 +62,6 @@ void wxChoiceBase::Command(wxCommandEvent& event) SetSelection(event.m_commandInt); (void)ProcessEvent(event); } + +#endif // wxUSE_CHOICE + diff --git a/src/common/cmdline.cpp b/src/common/cmdline.cpp index 965d1143de..183450244b 100644 --- a/src/common/cmdline.cpp +++ b/src/common/cmdline.cpp @@ -28,6 +28,8 @@ #pragma hdrstop #endif +#if wxUSE_CMDLINE_PARSER + #ifndef WX_PRECOMP #include "wx/string.h" #include "wx/log.h" @@ -912,3 +914,5 @@ static wxString GetTypeName(wxCmdLineParamType type) return s; } + +#endif // wxUSE_CMDLINE_PARSER diff --git a/src/common/ctrlcmn.cpp b/src/common/ctrlcmn.cpp index 479e92c1f5..ee8cb56910 100644 --- a/src/common/ctrlcmn.cpp +++ b/src/common/ctrlcmn.cpp @@ -28,6 +28,8 @@ #pragma hdrstop #endif +#if wxUSE_CONTROLS + #ifndef WX_PRECOMP #include "wx/control.h" #include "wx/log.h" @@ -93,3 +95,5 @@ void wxControlBase::InitCommandEvent(wxCommandEvent& event) const } } +#endif // wxUSE_CONTROLS + diff --git a/src/common/ctrlsub.cpp b/src/common/ctrlsub.cpp index 09cff4de8e..9f069d5318 100644 --- a/src/common/ctrlsub.cpp +++ b/src/common/ctrlsub.cpp @@ -28,6 +28,8 @@ #pragma hdrstop #endif +#if wxUSE_CONTROLS + #ifndef WX_PRECOMP #include "wx/ctrlsub.h" #endif @@ -92,3 +94,4 @@ void *wxControlWithItems::GetClientData(int n) const return DoGetItemClientData(n); } +#endif // wxUSE_CONTROLS diff --git a/src/common/datetime.cpp b/src/common/datetime.cpp index 5c212e190e..8c292e4de7 100644 --- a/src/common/datetime.cpp +++ b/src/common/datetime.cpp @@ -63,6 +63,8 @@ #pragma hdrstop #endif +#if !defined(wxUSE_DATETIME) || wxUSE_DATETIME + #ifndef WX_PRECOMP #include "wx/string.h" #include "wx/intl.h" @@ -3598,4 +3600,4 @@ size_t wxDateTimeWorkDays::DoGetHolidaysInRange(const wxDateTime& dtStart, return holidays.GetCount(); } - +#endif // wxUSE_DATETIME diff --git a/src/common/dlgcmn.cpp b/src/common/dlgcmn.cpp index d16c32fd0f..650cc4b770 100644 --- a/src/common/dlgcmn.cpp +++ b/src/common/dlgcmn.cpp @@ -43,6 +43,8 @@ // wxDialogBase //-------------------------------------------------------------------------- +#if wxUSE_STATTEXT && wxUSE_TEXTCTRL + wxSizer *wxDialogBase::CreateTextSizer( const wxString &message ) { wxBoxSizer *box = new wxBoxSizer( wxVERTICAL ); @@ -86,6 +88,10 @@ wxSizer *wxDialogBase::CreateTextSizer( const wxString &message ) return box; } +#endif // wxUSE_STATTEXT && wxUSE_TEXTCTRL + +#if wxUSE_BUTTON + wxSizer *wxDialogBase::CreateButtonSizer( long flags ) { wxBoxSizer *box = new wxBoxSizer( wxHORIZONTAL ); @@ -174,3 +180,4 @@ wxSizer *wxDialogBase::CreateButtonSizer( long flags ) return box; } +#endif // wxUSE_BUTTON diff --git a/src/common/dobjcmn.cpp b/src/common/dobjcmn.cpp index 820989a6f4..868b9c2a58 100644 --- a/src/common/dobjcmn.cpp +++ b/src/common/dobjcmn.cpp @@ -27,6 +27,8 @@ #pragma hdrstop #endif +#if wxUSE_DATAOBJ + #ifndef WX_PRECOMP #include "wx/app.h" #include "wx/debug.h" @@ -364,5 +366,6 @@ wxDragResult wxFileDropTarget::OnData(wxCoord x, wxCoord y, wxDragResult def) return OnDropFiles(x, y, dobj->GetFilenames()) ? def : wxDragNone; } -#endif +#endif // wxUSE_DRAG_AND_DROP +#endif // wxUSE_DATAOBJ diff --git a/src/common/encconv.cpp b/src/common/encconv.cpp index 5336da7bf1..dc59348b11 100644 --- a/src/common/encconv.cpp +++ b/src/common/encconv.cpp @@ -18,6 +18,8 @@ #pragma hdrstop #endif +#if wxUSE_FONTMAP + #include "wx/encconv.h" #include @@ -446,3 +448,5 @@ wxFontEncodingArray wxEncodingConverter::GetAllEquivalents(wxFontEncoding enc) return arr; } + +#endif // wxUSE_FONTMAP diff --git a/src/common/fontmap.cpp b/src/common/fontmap.cpp index 18a61b6768..f44703c1cc 100644 --- a/src/common/fontmap.cpp +++ b/src/common/fontmap.cpp @@ -28,6 +28,8 @@ #pragma hdrstop #endif +#if wxUSE_FONTMAP + #ifndef WX_PRECOMP #include "wx/app.h" #include "wx/log.h" @@ -54,12 +56,14 @@ // ---------------------------------------------------------------------------- // the config paths we use +#if wxUSE_CONFIG static const wxChar* FONTMAPPER_ROOT_PATH = wxT("/wxWindows/FontMapper"); static const wxChar* FONTMAPPER_CHARSET_PATH = wxT("Charsets"); static const wxChar* FONTMAPPER_CHARSET_ALIAS_PATH = wxT("Aliases"); #if wxUSE_GUI static const wxChar* FONTMAPPER_FONT_FROM_ENCODING_PATH = wxT("Encodings"); #endif // wxUSE_GUI +#endif // wxUSE_CONFIG // encodings supported by GetEncodingDescription static wxFontEncoding gs_encodings[] = @@ -746,3 +750,5 @@ bool wxFontMapper::IsEncodingAvailable(wxFontEncoding encoding, } #endif // wxUSE_GUI + +#endif // wxUSE_FONTMAP diff --git a/src/common/framecmn.cpp b/src/common/framecmn.cpp index c7678d5b5f..1280fd569c 100644 --- a/src/common/framecmn.cpp +++ b/src/common/framecmn.cpp @@ -60,7 +60,9 @@ END_EVENT_TABLE() wxFrameBase::wxFrameBase() { +#if wxUSE_MENUS m_frameMenuBar = NULL; +#endif // wxUSE_MENUS #if wxUSE_TOOLBAR m_frameToolBar = NULL; @@ -94,11 +96,13 @@ wxFrame *wxFrameBase::New(wxWindow *parent, void wxFrameBase::DeleteAllBars() { +#if wxUSE_MENUS if ( m_frameMenuBar ) { delete m_frameMenuBar; m_frameMenuBar = (wxMenuBar *) NULL; } +#endif // wxUSE_MENUS #if wxUSE_STATUSBAR if ( m_frameStatusBar ) @@ -192,6 +196,7 @@ void wxFrameBase::MakeModal(bool modal) bool wxFrameBase::ProcessCommand(int id) { +#if wxUSE_MENUS wxMenuBar *bar = GetMenuBar(); if ( !bar ) return FALSE; @@ -209,6 +214,9 @@ bool wxFrameBase::ProcessCommand(int id) } return GetEventHandler()->ProcessEvent(commandEvent); +#else // !wxUSE_MENUS + return FALSE; +#endif // wxUSE_MENUS/!wxUSE_MENUS } // ---------------------------------------------------------------------------- @@ -419,9 +427,13 @@ wxToolBar* wxFrameBase::OnCreateToolBar(long style, void wxFrameBase::OnIdle(wxIdleEvent& WXUNUSED(event) ) { +#if wxUSE_MENUS DoMenuUpdates(); +#endif // wxUSE_MENUS } +#if wxUSE_MENUS + // update all menus void wxFrameBase::DoMenuUpdates() { @@ -465,3 +477,5 @@ void wxFrameBase::DoMenuUpdates(wxMenu* menu, wxWindow* WXUNUSED(focusWin)) node = node->GetNext(); } } + +#endif // wxUSE_MENUS diff --git a/src/common/lboxcmn.cpp b/src/common/lboxcmn.cpp index 642b324e9b..7031381bf3 100644 --- a/src/common/lboxcmn.cpp +++ b/src/common/lboxcmn.cpp @@ -28,6 +28,8 @@ #pragma hdrstop #endif +#if wxUSE_LISTBOX + #ifndef WX_PRECOMP #include "wx/listbox.h" #endif @@ -96,3 +98,5 @@ void wxListBoxBase::SetFirstItem(const wxString& s) DoSetFirstItem(n); } + +#endif // wxUSE_LISTBOX diff --git a/src/common/log.cpp b/src/common/log.cpp index 837956d26a..036daf6190 100644 --- a/src/common/log.cpp +++ b/src/common/log.cpp @@ -745,12 +745,12 @@ void wxOnAssert(const wxChar *szFile, int nLine, const wxChar *szMsg) // send it to the normal log destination wxLogDebug(szBuf); -#if wxUSE_GUI || defined(__WXMSW__) +#if (wxUSE_GUI && wxUSE_MSGDLG) || defined(__WXMSW__) // this message is intentionally not translated - it is for // developpers only wxStrcat(szBuf, wxT("\nDo you want to stop the program?\nYou can also choose [Cancel] to suppress further warnings.")); -#if wxUSE_GUI +#if wxUSE_GUI && wxUSE_MSGDLG switch ( wxMessageBox(szBuf, wxT("Debug"), wxYES_NO | wxCANCEL | wxICON_STOP ) ) { case wxYES: @@ -763,7 +763,7 @@ void wxOnAssert(const wxChar *szFile, int nLine, const wxChar *szMsg) //case wxNO: nothing to do } -#else // !GUI, but MSW +#else // no wxMessageBox, but we still have the native MessageBox switch ( ::MessageBox(NULL, szBuf, _T("Debug"), MB_YESNOCANCEL | MB_ICONSTOP ) ) { case IDYES: @@ -778,9 +778,9 @@ void wxOnAssert(const wxChar *szFile, int nLine, const wxChar *szMsg) } #endif // GUI or MSW -#else // !GUI +#else // no message box Trap(); -#endif // GUI/!GUI +#endif // message boxes } s_bInAssert = FALSE; diff --git a/src/common/menucmn.cpp b/src/common/menucmn.cpp index fd1cc38a1e..6f634e545c 100644 --- a/src/common/menucmn.cpp +++ b/src/common/menucmn.cpp @@ -24,12 +24,14 @@ // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" -#include - #ifdef __BORLANDC__ #pragma hdrstop #endif +#if wxUSE_MENUS + +#include + #ifndef WX_PRECOMP #include "wx/menu.h" #endif @@ -643,3 +645,4 @@ wxString wxMenuBarBase::GetHelpString(int id) const return item->GetHelp(); } +#endif // wxUSE_MENUS diff --git a/src/common/sizer.cpp b/src/common/sizer.cpp index 0802fea039..8bd73ef15b 100644 --- a/src/common/sizer.cpp +++ b/src/common/sizer.cpp @@ -32,7 +32,9 @@ IMPLEMENT_ABSTRACT_CLASS(wxSizer, wxObject); IMPLEMENT_ABSTRACT_CLASS(wxGridSizer, wxSizer); IMPLEMENT_ABSTRACT_CLASS(wxFlexGridSizer, wxGridSizer); IMPLEMENT_ABSTRACT_CLASS(wxBoxSizer, wxSizer); +#if wxUSE_STATBOX IMPLEMENT_ABSTRACT_CLASS(wxStaticBoxSizer, wxBoxSizer); +#endif #if wxUSE_NOTEBOOK IMPLEMENT_ABSTRACT_CLASS(wxNotebookSizer, wxSizer); #endif @@ -942,6 +944,8 @@ wxSize wxBoxSizer::CalcMin() // wxStaticBoxSizer //--------------------------------------------------------------------------- +#if wxUSE_STATBOX + wxStaticBoxSizer::wxStaticBoxSizer( wxStaticBox *box, int orient ) : wxBoxSizer( orient ) { @@ -991,6 +995,8 @@ wxSize wxStaticBoxSizer::CalcMin() return ret; } +#endif // wxUSE_STATBOX + //--------------------------------------------------------------------------- // wxNotebookSizer //--------------------------------------------------------------------------- diff --git a/src/common/tbarbase.cpp b/src/common/tbarbase.cpp index f66ce0f3b1..6f0053607b 100644 --- a/src/common/tbarbase.cpp +++ b/src/common/tbarbase.cpp @@ -28,6 +28,8 @@ #pragma hdrstop #endif +#if wxUSE_TOOLBAR + #ifndef WX_PRECOMP #include "wx/wx.h" #endif @@ -39,19 +41,15 @@ #include #endif -#if wxUSE_TOOLBAR - #include "wx/tbarbase.h" // ---------------------------------------------------------------------------- // wxWindows macros // ---------------------------------------------------------------------------- -#if !USE_SHARED_LIBRARY - BEGIN_EVENT_TABLE(wxToolBarBase, wxControl) - EVT_IDLE(wxToolBarBase::OnIdle) - END_EVENT_TABLE() -#endif +BEGIN_EVENT_TABLE(wxToolBarBase, wxControl) + EVT_IDLE(wxToolBarBase::OnIdle) +END_EVENT_TABLE() #include "wx/listimpl.cpp" diff --git a/src/common/textcmn.cpp b/src/common/textcmn.cpp index 0ce243a141..2763a8ad7f 100644 --- a/src/common/textcmn.cpp +++ b/src/common/textcmn.cpp @@ -12,10 +12,11 @@ // ============================================================================ // declarations // ============================================================================ + #ifdef __GNUG__ #pragma implementation "textctrlbase.h" #endif - + // for compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -23,6 +24,8 @@ #pragma hdrstop #endif +#if wxUSE_TEXTCTRL + #ifndef WX_PRECOMP #include "wx/intl.h" #include "wx/log.h" @@ -207,3 +210,5 @@ int wxTextCtrlBase::underflow() #endif // NO_TEXT_WINDOW_STREAM +#endif // wxUSE_TEXTCTRL + diff --git a/src/common/timercmn.cpp b/src/common/timercmn.cpp index f1173ff163..5441294941 100644 --- a/src/common/timercmn.cpp +++ b/src/common/timercmn.cpp @@ -76,7 +76,7 @@ // wxWin macros // ---------------------------------------------------------------------------- -#if wxUSE_GUI +#if wxUSE_GUI && wxUSE_TIMER IMPLEMENT_DYNAMIC_CLASS(wxTimerEvent, wxEvent) #endif // wxUSE_GUI @@ -103,7 +103,7 @@ // wxTimerBase // ---------------------------------------------------------------------------- -#if wxUSE_GUI +#if wxUSE_GUI && wxUSE_TIMER void wxTimerBase::Notify() { @@ -121,6 +121,8 @@ void wxTimerBase::Notify() // wxStopWatch // ---------------------------------------------------------------------------- +#if wxUSE_LONGLONG + void wxStopWatch::Start(long t) { m_t0 = wxGetLocalTimeMillis() - t; @@ -137,10 +139,14 @@ long wxStopWatch::Time() const return (m_pause ? m_pause : GetElapsedTime()); } +#endif // wxUSE_LONGLONG + // ---------------------------------------------------------------------------- // old timer functions superceded by wxStopWatch // ---------------------------------------------------------------------------- +#if wxUSE_LONGLONG + static wxLongLong wxStartTime = 0l; // starts the global timer @@ -161,6 +167,7 @@ long wxGetElapsedTime(bool resetTimer) return (newTime - oldTime).GetLo(); } +#endif // wxUSE_LONGLONG // ---------------------------------------------------------------------------- // the functions to get the current time and timezone info @@ -246,6 +253,7 @@ long wxGetUTCTime() return -1; } +#if wxUSE_LONGLONG // Get local time as milliseconds since 00:00:00, Jan 1st 1970 wxLongLong wxGetLocalTimeMillis() @@ -314,3 +322,6 @@ wxLongLong wxGetLocalTimeMillis() #endif // time functions } + +#endif // wxUSE_LONGLONG + diff --git a/src/common/treebase.cpp b/src/common/treebase.cpp index 3925dcfcff..87fc151495 100644 --- a/src/common/treebase.cpp +++ b/src/common/treebase.cpp @@ -25,9 +25,11 @@ #include "wx/wxprec.h" #ifdef __BORLANDC__ -#pragma hdrstop + #pragma hdrstop #endif +#if wxUSE_TREECTRL + #include "wx/treebase.h" #include "wx/settings.h" #include "wx/log.h" @@ -50,4 +52,5 @@ wxTreeEvent::wxTreeEvent(wxEventType commandType, int id) m_itemOld = 0; } +#endif // wxUSE_TREECTRL diff --git a/src/common/utilscmn.cpp b/src/common/utilscmn.cpp index 49c15f3284..fb7467d46b 100644 --- a/src/common/utilscmn.cpp +++ b/src/common/utilscmn.cpp @@ -661,10 +661,12 @@ wxFindWindowByName1 (const wxString& title, wxWindow * parent) int wxFindMenuItemId (wxFrame * frame, const wxString& menuString, const wxString& itemString) { +#if wxUSE_MENUS wxMenuBar *menuBar = frame->GetMenuBar (); - if (!menuBar) - return -1; - return menuBar->FindMenuItem (menuString, itemString); + if (menuBar) + return menuBar->FindMenuItem (menuString, itemString); +#endif // wxUSE_MENUS + return -1; } #endif // wxUSE_GUI @@ -873,6 +875,8 @@ whereami(name) * since otherwise the generic code may be pulled in unnecessarily. */ +#if wxUSE_MSGDLG + int wxMessageBox(const wxString& message, const wxString& caption, long style, wxWindow *parent, int WXUNUSED(x), int WXUNUSED(y) ) { @@ -896,7 +900,10 @@ int wxMessageBox(const wxString& message, const wxString& caption, long style, return wxCANCEL; } +#endif // wxUSE_MSGDLG + #if wxUSE_TEXTDLG + wxString wxGetTextFromUser(const wxString& message, const wxString& caption, const wxString& defaultValue, wxWindow *parent, int x, int y, bool WXUNUSED(centre) ) @@ -929,6 +936,8 @@ wxString wxGetPasswordFromUser(const wxString& message, #endif // wxUSE_TEXTDLG +#if wxUSE_COLOURDLG + wxColour wxGetColourFromUser(wxWindow *parent, const wxColour& colInit) { wxColourData data; @@ -949,6 +958,8 @@ wxColour wxGetColourFromUser(wxWindow *parent, const wxColour& colInit) return colRet; } +#endif // wxUSE_COLOURDLG + // ---------------------------------------------------------------------------- // missing C RTL functions (FIXME shouldn't be here at all) // ---------------------------------------------------------------------------- diff --git a/src/common/wincmn.cpp b/src/common/wincmn.cpp index e40b8f23c4..735f89037b 100644 --- a/src/common/wincmn.cpp +++ b/src/common/wincmn.cpp @@ -409,7 +409,11 @@ wxSize wxWindowBase::DoGetBestSize() const node = node->GetNext() ) { wxWindow *win = node->GetData(); - if ( win->IsTopLevel() || wxDynamicCast(win, wxStatusBar) ) + if ( win->IsTopLevel() +#if wxUSE_STATUSBAR + || wxDynamicCast(win, wxStatusBar) +#endif // wxUSE_STATUSBAR + ) { // dialogs and frames lie in different top level windows - // don't deal with them here; as for the status bars, they @@ -1256,6 +1260,7 @@ void wxWindowBase::GetPositionConstraint(int *x, int *y) const // of control classes. void wxWindowBase::UpdateWindowUI() { +#if wxUSE_CONTROLS wxUpdateUIEvent event(GetId()); event.m_eventObject = this; @@ -1269,10 +1274,12 @@ void wxWindowBase::UpdateWindowUI() wxControl *control = wxDynamicCast(this, wxControl); if ( control ) { +#if wxUSE_TEXTCTRL wxTextCtrl *text = wxDynamicCast(control, wxTextCtrl); if ( text ) text->SetValue(event.GetText()); else +#endif // wxUSE_TEXTCTRL control->SetLabel(event.GetText()); } } @@ -1295,6 +1302,7 @@ void wxWindowBase::UpdateWindowUI() } #endif // wxUSE_RADIOBTN } +#endif // wxUSE_CONTROLS } // ---------------------------------------------------------------------------- @@ -1404,6 +1412,7 @@ void wxWindowBase::OnInitDialog( wxInitDialogEvent &WXUNUSED(event) ) // process Ctrl-Alt-mclick void wxWindowBase::OnMiddleClick( wxMouseEvent& event ) { +#if wxUSE_MSGDLG if ( event.ControlDown() && event.AltDown() ) { // don't translate these strings @@ -1448,6 +1457,7 @@ void wxWindowBase::OnMiddleClick( wxMouseEvent& event ) (wxWindow *)this); } else +#endif // wxUSE_MSGDLG { event.Skip(); } diff --git a/src/generic/caret.cpp b/src/generic/caret.cpp index 3371a270cd..7ccba3ffdf 100644 --- a/src/generic/caret.cpp +++ b/src/generic/caret.cpp @@ -28,6 +28,8 @@ #pragma hdrstop #endif +#if wxUSE_CARET + #ifndef WX_PRECOMP #include "wx/window.h" #include "wx/dcclient.h" @@ -205,3 +207,5 @@ void wxCaret::DoDraw(wxDC *dc) dc->DrawRectangle( m_x, m_y, m_width, m_height ); #endif // 0/1 } + +#endif // wxUSE_CARET diff --git a/src/generic/choicdgg.cpp b/src/generic/choicdgg.cpp index f2c529666a..1dad616b3e 100644 --- a/src/generic/choicdgg.cpp +++ b/src/generic/choicdgg.cpp @@ -20,6 +20,8 @@ #pragma hdrstop #endif +#if wxUSE_CHOICEDLG + #ifndef WX_PRECOMP #include #include "wx/utils.h" @@ -315,3 +317,4 @@ void wxSingleChoiceDialog::OnListBoxDClick(wxCommandEvent& WXUNUSED(event)) EndModal(wxID_OK); } +#endif // wxUSE_CHOICEDLG diff --git a/src/generic/colrdlgg.cpp b/src/generic/colrdlgg.cpp index e4b06443bb..dd2749b84c 100644 --- a/src/generic/colrdlgg.cpp +++ b/src/generic/colrdlgg.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: colrdlgg.cpp +// Name: generic/colrdlgg.cpp // Purpose: Choice dialogs // Author: Julian Smart // Modified by: @@ -17,22 +17,22 @@ #include "wx/wxprec.h" #ifdef __BORLANDC__ -#pragma hdrstop + #pragma hdrstop #endif +#if wxUSE_COLOURDLG + #ifndef WX_PRECOMP -#include -#include -#include "wx/utils.h" -#include "wx/intl.h" -#include "wx/dialog.h" -#include "wx/listbox.h" -#include "wx/button.h" -#include "wx/stattext.h" -#include "wx/layout.h" -#include "wx/dcclient.h" -#include "wx/slider.h" -#include "wx/sizer.h" + #include "wx/utils.h" + #include "wx/intl.h" + #include "wx/dialog.h" + #include "wx/listbox.h" + #include "wx/button.h" + #include "wx/stattext.h" + #include "wx/layout.h" + #include "wx/dcclient.h" + #include "wx/slider.h" + #include "wx/sizer.h" #endif #if wxUSE_STATLINE @@ -504,4 +504,5 @@ void wxGenericColourDialog::OnBlueSlider(wxCommandEvent& WXUNUSED(event)) PaintCustomColour(dc); } +#endif // wxUSE_COLOURDLG diff --git a/src/generic/dirctrlg.cpp b/src/generic/dirctrlg.cpp index 2a98d67f83..54e9f6da57 100644 --- a/src/generic/dirctrlg.cpp +++ b/src/generic/dirctrlg.cpp @@ -20,7 +20,7 @@ #pragma hdrstop #endif -#include "wx/defs.h" +#if wxUSE_GRID #include "wx/utils.h" #include "wx/dialog.h" @@ -1244,3 +1244,5 @@ wxString wxGenericDirDialog::GetPath(void) const { return m_dirCtrl->GetPath(); } + +#endif // wxUSE_GRID diff --git a/src/generic/dragimgg.cpp b/src/generic/dragimgg.cpp index 37071c5a03..49baa7d526 100644 --- a/src/generic/dragimgg.cpp +++ b/src/generic/dragimgg.cpp @@ -28,6 +28,8 @@ #pragma hdrstop #endif +#if wxUSE_DRAGIMAGE + #ifndef WX_PRECOMP #include #include "wx/setup.h" @@ -497,3 +499,4 @@ wxRect wxGenericDragImage::GetImageRect(const wxPoint& pos) const } } +#endif // wxUSE_DRAGIMAGE diff --git a/src/generic/filedlgg.cpp b/src/generic/filedlgg.cpp index bc72174e98..563fb3e7c0 100644 --- a/src/generic/filedlgg.cpp +++ b/src/generic/filedlgg.cpp @@ -20,6 +20,8 @@ #pragma hdrstop #endif +#if wxUSE_FILEDLG + #ifndef __UNIX__ #error wxFileDialog currently only supports unix #endif @@ -1310,3 +1312,5 @@ public: }; IMPLEMENT_DYNAMIC_CLASS(wxFileDialogGenericModule, wxModule) + +#endif // wxUSE_FILEDLG diff --git a/src/generic/gridg.cpp b/src/generic/gridg.cpp index cb590108cb..3f28058a14 100644 --- a/src/generic/gridg.cpp +++ b/src/generic/gridg.cpp @@ -25,6 +25,8 @@ #pragma hdrstop #endif +#if wxUSE_GRID + #ifndef WX_PRECOMP #include "wx/utils.h" #include "wx/dcclient.h" @@ -2852,3 +2854,4 @@ void *wxGenericGrid::GetCellData(int row, int col) return rc; } +#endif // wxUSE_GRID diff --git a/src/generic/laywin.cpp b/src/generic/laywin.cpp index 409814e682..3e8df62f23 100644 --- a/src/generic/laywin.cpp +++ b/src/generic/laywin.cpp @@ -176,6 +176,8 @@ void wxSashLayoutWindow::OnCalculateLayout(wxCalculateLayoutEvent& event) * wxLayoutAlgorithm */ +#if wxUSE_MDI_ARCHITECTURE + // Lays out windows for an MDI frame. The MDI client area gets what's left // over. bool wxLayoutAlgorithm::LayoutMDIFrame(wxMDIParentFrame* frame, wxRect* r) @@ -213,6 +215,8 @@ bool wxLayoutAlgorithm::LayoutMDIFrame(wxMDIParentFrame* frame, wxRect* r) return TRUE; } +#endif // wxUSE_MDI_ARCHITECTURE + // Layout algorithm for any window. mainWindow gets what's left over. bool wxLayoutAlgorithm::LayoutWindow(wxWindow* parent, wxWindow* mainWindow) { diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp index 607477e3eb..1e2205e217 100644 --- a/src/generic/listctrl.cpp +++ b/src/generic/listctrl.cpp @@ -19,6 +19,8 @@ #pragma hdrstop #endif +#if wxUSE_LISTCTRL + #include "wx/dcscreen.h" #include "wx/app.h" #include "wx/listctrl.h" @@ -3728,3 +3730,5 @@ void wxListCtrl::SetFocus() if ( FindFocus() != this ) m_mainWin->SetFocus(); } + +#endif // wxUSE_LISTCTRL diff --git a/src/generic/logg.cpp b/src/generic/logg.cpp index 1790b09bf5..a4e1cd77d2 100644 --- a/src/generic/logg.cpp +++ b/src/generic/logg.cpp @@ -31,6 +31,8 @@ #error "This file can't be compiled without GUI!" #endif +#if wxUSE_LOGGUI || wxUSE_LOGWINDOW + #ifndef WX_PRECOMP #include "wx/app.h" #include "wx/button.h" @@ -247,7 +249,7 @@ void wxLogGui::Flush() titleFormat = _("%s Information"); style = wxICON_INFORMATION; } - + wxString title; title.Printf(titleFormat, appName.c_str()); @@ -1052,3 +1054,4 @@ static int OpenLogFile(wxFile& file, wxString *pFilename) #endif // wxUSE_FILE +#endif // !(wxUSE_LOGGUI || wxUSE_LOGWINDOW) diff --git a/src/generic/msgdlgg.cpp b/src/generic/msgdlgg.cpp index ec65ed52bf..bcc22210e8 100644 --- a/src/generic/msgdlgg.cpp +++ b/src/generic/msgdlgg.cpp @@ -20,6 +20,8 @@ #pragma hdrstop #endif +#if wxUSE_MSGDLG + #ifndef WX_PRECOMP #include "wx/utils.h" #include "wx/dialog.h" @@ -127,4 +129,5 @@ void wxGenericMessageDialog::OnCancel(wxCommandEvent& WXUNUSED(event)) } } +#endif // wxUSE_MSGDLG diff --git a/src/generic/numdlgg.cpp b/src/generic/numdlgg.cpp index 96bbc485bf..f5ca446453 100644 --- a/src/generic/numdlgg.cpp +++ b/src/generic/numdlgg.cpp @@ -29,6 +29,8 @@ #pragma hdrstop #endif +#if wxUSE_NUMBERDLG + #ifndef WX_PRECOMP #include @@ -206,3 +208,5 @@ long wxGetNumberFromUser(const wxString& msg, return dialog.GetValue(); } + +#endif // wxUSE_NUMBERDLG diff --git a/src/generic/panelg.cpp b/src/generic/panelg.cpp index 346a2c82e6..8308e93e30 100644 --- a/src/generic/panelg.cpp +++ b/src/generic/panelg.cpp @@ -65,7 +65,9 @@ END_EVENT_TABLE() void wxPanel::Init() { m_winLastFocused = (wxWindow *)NULL; +#if wxUSE_BUTTON m_btnDefault = (wxButton *)NULL; +#endif // wxUSE_BUTTON } bool wxPanel::Create(wxWindow *parent, wxWindowID id, diff --git a/src/generic/prop.cpp b/src/generic/prop.cpp index 7175580382..9b3792b717 100644 --- a/src/generic/prop.cpp +++ b/src/generic/prop.cpp @@ -6,7 +6,7 @@ // Created: 04/01/98 // RCS-ID: $Id$ // Copyright: (c) Julian Smart -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ @@ -20,6 +20,8 @@ #pragma hdrstop #endif +#if wxUSE_PROPSHEET + #ifndef WX_PRECOMP #include "wx/wx.h" #endif @@ -564,7 +566,7 @@ void wxPropertyValue::WritePropertyType(wxString& stream) // Write as any oth expr->WritePropertyType(stream); expr = expr->m_next; if (expr) - stream.Append( wxT(", ") ); + stream.Append( wxT(", ") ); } stream.Append( wxT("]") ); } @@ -1006,14 +1008,14 @@ void wxPropertySheet::RemoveProperty(const wxString& name) if(node) { wxProperty *prop = (wxProperty *)node->Data(); - delete prop; + delete prop; m_properties.DeleteNode(node); } -} +} bool wxPropertySheet::HasProperty(const wxString& name) const { - return (GetProperty(name)?TRUE:FALSE); + return (GetProperty(name)?TRUE:FALSE); } // Clear all properties @@ -1095,10 +1097,10 @@ wxPropertyValidator::~wxPropertyValidator(void) {} bool wxPropertyValidator::StringToFloat (wxChar *s, float *number) { - double num; - bool ok = StringToDouble (s, &num); - *number = (float) num; - return ok; + double num; + bool ok = StringToDouble (s, &num); + *number = (float) num; + return ok; } bool wxPropertyValidator::StringToDouble (wxChar *s, double *number) { @@ -1106,20 +1108,20 @@ bool wxPropertyValidator::StringToDouble (wxChar *s, double *number) { wxChar *value_ptr; *number = wxStrtod (s, &value_ptr); if (value_ptr) { - int len = wxStrlen (value_ptr); - for (int i = 0; i < len; i++) { - ok = (wxIsspace (value_ptr[i]) != 0); - if (!ok) return FALSE; - } + int len = wxStrlen (value_ptr); + for (int i = 0; i < len; i++) { + ok = (wxIsspace (value_ptr[i]) != 0); + if (!ok) return FALSE; + } } return ok; } bool wxPropertyValidator::StringToInt (wxChar *s, int *number) { - long num; - bool ok = StringToLong (s, &num); - *number = (int) num; - return ok; + long num; + bool ok = StringToLong (s, &num); + *number = (int) num; + return ok; } bool wxPropertyValidator::StringToLong (wxChar *s, long *number) { @@ -1127,31 +1129,33 @@ bool wxPropertyValidator::StringToLong (wxChar *s, long *number) { wxChar *value_ptr; *number = wxStrtol (s, &value_ptr, 10); if (value_ptr) { - int len = wxStrlen (value_ptr); - for (int i = 0; i < len; i++) { - ok = (wxIsspace (value_ptr[i]) != 0); - if (!ok) return FALSE; - } + int len = wxStrlen (value_ptr); + for (int i = 0; i < len; i++) { + ok = (wxIsspace (value_ptr[i]) != 0); + if (!ok) return FALSE; + } } return ok; } wxChar *wxPropertyValidator::FloatToString (float number) { - static wxChar buf[20]; - wxSprintf (buf, wxT("%.6g"), number); - return buf; + static wxChar buf[20]; + wxSprintf (buf, wxT("%.6g"), number); + return buf; } wxChar *wxPropertyValidator::DoubleToString (double number) { - static wxChar buf[20]; - wxSprintf (buf, wxT("%.6g"), number); - return buf; + static wxChar buf[20]; + wxSprintf (buf, wxT("%.6g"), number); + return buf; } wxChar *wxPropertyValidator::IntToString (int number) { - return ::IntToString (number); + return ::IntToString (number); } wxChar *wxPropertyValidator::LongToString (long number) { - return ::LongToString (number); + return ::LongToString (number); } + +#endif // wxUSE_PROPSHEET diff --git a/src/generic/propform.cpp b/src/generic/propform.cpp index c403aad691..4f1b06f67f 100644 --- a/src/generic/propform.cpp +++ b/src/generic/propform.cpp @@ -6,7 +6,7 @@ // Created: 04/01/98 // RCS-ID: $Id$ // Copyright: (c) Julian Smart -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ @@ -20,6 +20,8 @@ #pragma hdrstop #endif +#if wxUSE_PROPSHEET + #ifndef WX_PRECOMP #include "wx/wx.h" #endif @@ -39,11 +41,11 @@ IMPLEMENT_DYNAMIC_CLASS(wxPropertyFormView, wxPropertyView) BEGIN_EVENT_TABLE(wxPropertyFormView, wxPropertyView) -EVT_BUTTON(wxID_OK, wxPropertyFormView::OnOk) -EVT_BUTTON(wxID_CANCEL, wxPropertyFormView::OnCancel) -EVT_BUTTON(wxID_HELP, wxPropertyFormView::OnHelp) -EVT_BUTTON(wxID_PROP_REVERT, wxPropertyFormView::OnRevert) -EVT_BUTTON(wxID_PROP_UPDATE, wxPropertyFormView::OnUpdate) +EVT_BUTTON(wxID_OK, wxPropertyFormView::OnOk) +EVT_BUTTON(wxID_CANCEL, wxPropertyFormView::OnCancel) +EVT_BUTTON(wxID_HELP, wxPropertyFormView::OnHelp) +EVT_BUTTON(wxID_PROP_REVERT, wxPropertyFormView::OnRevert) +EVT_BUTTON(wxID_PROP_UPDATE, wxPropertyFormView::OnUpdate) END_EVENT_TABLE() bool wxPropertyFormView::sm_dialogCancelled = FALSE; @@ -52,11 +54,11 @@ wxPropertyFormView::wxPropertyFormView(wxWindow *propPanel, long flags):wxProper { m_propertyWindow = propPanel; m_managedWindow = NULL; - + m_windowCloseButton = NULL; m_windowCancelButton = NULL; m_windowHelpButton = NULL; - + m_detailedEditing = FALSE; } @@ -67,7 +69,7 @@ wxPropertyFormView::~wxPropertyFormView(void) void wxPropertyFormView::ShowView(wxPropertySheet *ps, wxWindow *panel) { m_propertySheet = ps; - + AssociatePanel(panel); // CreateControls(); // UpdatePropertyList(); @@ -84,7 +86,7 @@ bool wxPropertyFormView::Check(void) { if (!m_propertySheet) return FALSE; - + wxNode *node = m_propertySheet->GetProperties().First(); while (node) { @@ -105,7 +107,7 @@ bool wxPropertyFormView::TransferToPropertySheet(void) { if (!m_propertySheet) return FALSE; - + wxNode *node = m_propertySheet->GetProperties().First(); while (node) { @@ -125,7 +127,7 @@ bool wxPropertyFormView::TransferToDialog(void) { if (!m_propertySheet) return FALSE; - + wxNode *node = m_propertySheet->GetProperties().First(); while (node) { @@ -145,7 +147,7 @@ bool wxPropertyFormView::AssociateNames(void) { if (!m_propertySheet || !m_propertyWindow) return FALSE; - + wxNode *node = m_propertyWindow->GetChildren().First(); while (node) { @@ -177,17 +179,17 @@ void wxPropertyFormView::OnOk(wxCommandEvent& WXUNUSED(event)) // Retrieve the value if any if (!Check()) return; - + sm_dialogCancelled = FALSE; TransferToPropertySheet(); - + m_managedWindow->Close(TRUE); } void wxPropertyFormView::OnCancel(wxCommandEvent& WXUNUSED(event)) { sm_dialogCancelled = TRUE; - + m_managedWindow->Close(TRUE); } @@ -210,10 +212,10 @@ void wxPropertyFormView::OnCommand(wxWindow& win, wxCommandEvent& event) { if (!m_propertySheet) return; - + if (win.GetName() == wxT("")) return; - + if (wxStrcmp(win.GetName(), wxT("ok")) == 0) OnOk(event); else if (wxStrcmp(win.GetName(), wxT("cancel")) == 0) @@ -264,7 +266,7 @@ void wxPropertyFormView::OnDoubleClick(wxControl *item) { if (!m_propertySheet) return; - + // Find a validator to route the command to. wxNode *node = m_propertySheet->GetProperties().First(); while (node) @@ -413,20 +415,20 @@ IMPLEMENT_DYNAMIC_CLASS(wxRealFormValidator, wxPropertyFormValidator) /// /// Real number form validator -/// -bool wxRealFormValidator::OnCheckValue( wxProperty *property, wxPropertyFormView *WXUNUSED(view), +/// +bool wxRealFormValidator::OnCheckValue( wxProperty *property, wxPropertyFormView *WXUNUSED(view), wxWindow *parentWindow) { if (m_realMin == 0.0 && m_realMax == 0.0) return TRUE; - + // The item used for viewing the real number: should be a text item. wxWindow *m_propertyWindow = property->GetWindow(); if (!m_propertyWindow || !m_propertyWindow->IsKindOf(CLASSINFO(wxTextCtrl))) return FALSE; - + wxString value(((wxTextCtrl *)m_propertyWindow)->GetValue()); - + float val = 0.0; if (!StringToFloat(WXSTRINGCAST value, &val)) { @@ -435,7 +437,7 @@ bool wxRealFormValidator::OnCheckValue( wxProperty *property, wxPropertyFormView wxMessageBox(buf, wxT("Property value error"), wxOK | wxICON_EXCLAMATION, parentWindow); return FALSE; } - + if (val < m_realMin || val > m_realMax) { wxChar buf[200]; @@ -446,32 +448,32 @@ bool wxRealFormValidator::OnCheckValue( wxProperty *property, wxPropertyFormView return TRUE; } -bool wxRealFormValidator::OnRetrieveValue(wxProperty *property, wxPropertyFormView *WXUNUSED(view), +bool wxRealFormValidator::OnRetrieveValue(wxProperty *property, wxPropertyFormView *WXUNUSED(view), wxWindow *WXUNUSED(parentWindow) ) { // The item used for viewing the real number: should be a text item. wxWindow *m_propertyWindow = property->GetWindow(); if (!m_propertyWindow || !m_propertyWindow->IsKindOf(CLASSINFO(wxTextCtrl))) return FALSE; - + wxString value(((wxTextCtrl *)m_propertyWindow)->GetValue()); - + if (value.Length() == 0) return FALSE; - + float f = (float)wxAtof((const wxChar *)value); property->GetValue() = f; return TRUE; } -bool wxRealFormValidator::OnDisplayValue(wxProperty *property, wxPropertyFormView *WXUNUSED(view), +bool wxRealFormValidator::OnDisplayValue(wxProperty *property, wxPropertyFormView *WXUNUSED(view), wxWindow *WXUNUSED(parentWindow) ) { // The item used for viewing the real number: should be a text item. wxWindow *m_propertyWindow = property->GetWindow(); if (!m_propertyWindow || !m_propertyWindow->IsKindOf(CLASSINFO(wxTextCtrl))) return FALSE; - + wxTextCtrl *textItem = (wxTextCtrl *)m_propertyWindow; textItem->SetValue(FloatToString(property->GetValue().RealValue())); return TRUE; @@ -479,26 +481,26 @@ bool wxRealFormValidator::OnDisplayValue(wxProperty *property, wxPropertyFormVie /// /// Integer validator -/// +/// IMPLEMENT_DYNAMIC_CLASS(wxIntegerFormValidator, wxPropertyFormValidator) -bool wxIntegerFormValidator::OnCheckValue(wxProperty *property, wxPropertyFormView *WXUNUSED(view), +bool wxIntegerFormValidator::OnCheckValue(wxProperty *property, wxPropertyFormView *WXUNUSED(view), wxWindow *parentWindow) { if (m_integerMin == 0.0 && m_integerMax == 0.0) return TRUE; - + // The item used for viewing the real number: should be a text item or a slider wxWindow *m_propertyWindow = property->GetWindow(); if (!m_propertyWindow) return FALSE; - + long val = 0; - + if (m_propertyWindow->IsKindOf(CLASSINFO(wxTextCtrl))) { wxString value(((wxTextCtrl *)m_propertyWindow)->GetValue()); - + if (!StringToLong(WXSTRINGCAST value, &val)) { wxChar buf[200]; @@ -513,7 +515,7 @@ bool wxIntegerFormValidator::OnCheckValue(wxProperty *property, wxPropertyFormVi } else return FALSE; - + if (val < m_integerMin || val > m_integerMax) { char buf[200]; @@ -524,21 +526,21 @@ bool wxIntegerFormValidator::OnCheckValue(wxProperty *property, wxPropertyFormVi return TRUE; } -bool wxIntegerFormValidator::OnRetrieveValue(wxProperty *property, wxPropertyFormView *WXUNUSED(view), +bool wxIntegerFormValidator::OnRetrieveValue(wxProperty *property, wxPropertyFormView *WXUNUSED(view), wxWindow *WXUNUSED(parentWindow)) { // The item used for viewing the real number: should be a text item or a slider wxWindow *m_propertyWindow = property->GetWindow(); if (!m_propertyWindow) return FALSE; - + if (m_propertyWindow->IsKindOf(CLASSINFO(wxTextCtrl))) { wxString value(((wxTextCtrl *)m_propertyWindow)->GetValue()); - + if (value.Length() == 0) return FALSE; - + long i = wxAtol((const wxChar *)value); property->GetValue() = i; } @@ -548,18 +550,18 @@ bool wxIntegerFormValidator::OnRetrieveValue(wxProperty *property, wxPropertyFor } else return FALSE; - + return TRUE; } -bool wxIntegerFormValidator::OnDisplayValue( wxProperty *property, wxPropertyFormView *WXUNUSED(view), +bool wxIntegerFormValidator::OnDisplayValue( wxProperty *property, wxPropertyFormView *WXUNUSED(view), wxWindow *WXUNUSED(parentWindow)) { // The item used for viewing the real number: should be a text item or a slider wxWindow *m_propertyWindow = property->GetWindow(); if (!m_propertyWindow) return FALSE; - + if (m_propertyWindow->IsKindOf(CLASSINFO(wxTextCtrl))) { wxTextCtrl *textItem = (wxTextCtrl *)m_propertyWindow; @@ -576,42 +578,42 @@ bool wxIntegerFormValidator::OnDisplayValue( wxProperty *property, wxPropertyFor /// /// Boolean validator -/// +/// IMPLEMENT_DYNAMIC_CLASS(wxBoolFormValidator, wxPropertyFormValidator) -bool wxBoolFormValidator::OnCheckValue(wxProperty *property, wxPropertyFormView *WXUNUSED(view), +bool wxBoolFormValidator::OnCheckValue(wxProperty *property, wxPropertyFormView *WXUNUSED(view), wxWindow *WXUNUSED(parentWindow)) { // The item used for viewing the boolean: should be a checkbox wxWindow *m_propertyWindow = property->GetWindow(); if (!m_propertyWindow || !m_propertyWindow->IsKindOf(CLASSINFO(wxCheckBox))) return FALSE; - + return TRUE; } -bool wxBoolFormValidator::OnRetrieveValue(wxProperty *property, wxPropertyFormView *WXUNUSED(view), +bool wxBoolFormValidator::OnRetrieveValue(wxProperty *property, wxPropertyFormView *WXUNUSED(view), wxWindow *WXUNUSED(parentWindow) ) { // The item used for viewing the boolean: should be a checkbox. wxWindow *m_propertyWindow = property->GetWindow(); if (!m_propertyWindow || !m_propertyWindow->IsKindOf(CLASSINFO(wxCheckBox))) return FALSE; - + wxCheckBox *checkBox = (wxCheckBox *)m_propertyWindow; - + property->GetValue() = (bool)checkBox->GetValue(); return TRUE; } -bool wxBoolFormValidator::OnDisplayValue(wxProperty *property, wxPropertyFormView *WXUNUSED(view), +bool wxBoolFormValidator::OnDisplayValue(wxProperty *property, wxPropertyFormView *WXUNUSED(view), wxWindow *WXUNUSED(parentWindow)) { // The item used for viewing the boolean: should be a checkbox. wxWindow *m_propertyWindow = property->GetWindow(); if (!m_propertyWindow || !m_propertyWindow->IsKindOf(CLASSINFO(wxCheckBox))) return FALSE; - + wxCheckBox *checkBox = (wxCheckBox *)m_propertyWindow; checkBox->SetValue((bool)property->GetValue().BoolValue()); return TRUE; @@ -619,7 +621,7 @@ bool wxBoolFormValidator::OnDisplayValue(wxProperty *property, wxPropertyFormVie /// /// String validator -/// +/// IMPLEMENT_DYNAMIC_CLASS(wxStringFormValidator, wxPropertyFormValidator) wxStringFormValidator::wxStringFormValidator(wxStringList *list, long flags): @@ -628,12 +630,12 @@ wxPropertyFormValidator(flags) m_strings = list; } -bool wxStringFormValidator::OnCheckValue(wxProperty *property, wxPropertyFormView *WXUNUSED(view), +bool wxStringFormValidator::OnCheckValue(wxProperty *property, wxPropertyFormView *WXUNUSED(view), wxWindow *parentWindow ) { if (!m_strings) return TRUE; - + // The item used for viewing the string: should be a text item, choice item or listbox. wxWindow *m_propertyWindow = property->GetWindow(); if (!m_propertyWindow) @@ -658,7 +660,7 @@ bool wxStringFormValidator::OnCheckValue(wxProperty *property, wxPropertyFormVie return TRUE; } -bool wxStringFormValidator::OnRetrieveValue(wxProperty *property, wxPropertyFormView *WXUNUSED(view), +bool wxStringFormValidator::OnRetrieveValue(wxProperty *property, wxPropertyFormView *WXUNUSED(view), wxWindow *WXUNUSED(parentWindow) ) { // The item used for viewing the string: should be a text item, choice item or listbox. @@ -696,7 +698,7 @@ bool wxStringFormValidator::OnRetrieveValue(wxProperty *property, wxPropertyForm return TRUE; } -bool wxStringFormValidator::OnDisplayValue(wxProperty *property, wxPropertyFormView *WXUNUSED(view), +bool wxStringFormValidator::OnDisplayValue(wxProperty *property, wxPropertyFormView *WXUNUSED(view), wxWindow *WXUNUSED(parentWindow) ) { // The item used for viewing the string: should be a text item, choice item or listbox. @@ -755,3 +757,4 @@ bool wxStringFormValidator::OnDisplayValue(wxProperty *property, wxPropertyFormV return TRUE; } +#endif // wxUSE_PROPSHEET diff --git a/src/generic/proplist.cpp b/src/generic/proplist.cpp index d5f5dcd9c4..66d2f30ca0 100644 --- a/src/generic/proplist.cpp +++ b/src/generic/proplist.cpp @@ -28,6 +28,8 @@ #pragma hdrstop #endif +#if wxUSE_PROPSHEET + #ifndef WX_PRECOMP #include "wx/window.h" #include "wx/font.h" @@ -1880,3 +1882,4 @@ static wxBitmap *GetCrossBitmap() return s_crossBitmap; } +#endif // wxUSE_PROPSHEET diff --git a/src/generic/splash.cpp b/src/generic/splash.cpp index e274dd0a45..a1af795bb9 100644 --- a/src/generic/splash.cpp +++ b/src/generic/splash.cpp @@ -20,6 +20,8 @@ #pragma hdrstop #endif +#if wxUSE_SPLASH + #ifndef WX_PRECOMP #include "wx/wx.h" #endif @@ -156,3 +158,4 @@ void wxSplashScreenWindow::OnChar(wxKeyEvent& event) GetParent()->Close(TRUE); } +#endif // wxUSE_SPLASH diff --git a/src/generic/statusbr.cpp b/src/generic/statusbr.cpp index 753ff1677b..09c9c4a780 100644 --- a/src/generic/statusbr.cpp +++ b/src/generic/statusbr.cpp @@ -20,7 +20,7 @@ #pragma hdrstop #endif -//#if !defined(__WIN32__) || !wxUSE_NATIVE_STATUSBAR +#if wxUSE_STATUSBAR #ifndef WX_PRECOMP #include "wx/setup.h" @@ -359,4 +359,4 @@ void wxStatusBarGeneric::SetMinHeight(int height) } } -//#endif // Win32 && wxUSE_NATIVE_STATUSBAR +#endif // wxUSE_STATUSBAR diff --git a/src/generic/textdlgg.cpp b/src/generic/textdlgg.cpp index d34210a7c9..9b6a5b965e 100644 --- a/src/generic/textdlgg.cpp +++ b/src/generic/textdlgg.cpp @@ -28,6 +28,8 @@ #pragma hdrstop #endif +#if wxUSE_TEXTDLG + #ifndef WX_PRECOMP #include @@ -119,3 +121,5 @@ void wxTextEntryDialog::OnOK(wxCommandEvent& WXUNUSED(event) ) EndModal(wxID_OK); } + +#endif // wxUSE_TEXTDLG diff --git a/src/generic/treectlg.cpp b/src/generic/treectlg.cpp index 76bf9030ab..a47e80ef99 100644 --- a/src/generic/treectlg.cpp +++ b/src/generic/treectlg.cpp @@ -25,9 +25,11 @@ #include "wx/wxprec.h" #ifdef __BORLANDC__ -#pragma hdrstop + #pragma hdrstop #endif +#if wxUSE_TREECTRL + #include "wx/generic/treectlg.h" #include "wx/imaglist.h" #include "wx/settings.h" @@ -2530,3 +2532,4 @@ void wxGenericTreeCtrl::RefreshLine( wxGenericTreeItem *item ) Refresh( TRUE, &rect ); } +#endif // wxUSE_TREECTRL diff --git a/src/generic/wizard.cpp b/src/generic/wizard.cpp index cd776451c2..589cd19ccb 100644 --- a/src/generic/wizard.cpp +++ b/src/generic/wizard.cpp @@ -28,6 +28,8 @@ #pragma hdrstop #endif +#if wxUSE_WIZARDDLG + #ifndef WX_PRECOMP #include "wx/dynarray.h" #include "wx/intl.h" @@ -389,3 +391,4 @@ wxWizardEvent::wxWizardEvent(wxEventType type, int id, bool direction) m_direction = direction; } +#endif // wxUSE_WIZARDDLG diff --git a/src/gtk/files.lst b/src/gtk/files.lst index f09570863b..4f6ed3adec 100644 --- a/src/gtk/files.lst +++ b/src/gtk/files.lst @@ -1,4 +1,4 @@ -# This file was automatically generated by tmake at 15:57, 2000/08/04 +# This file was automatically generated by tmake at 14:01, 2000/08/11 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE GTK.T! ALL_SOURCES = \ generic/busyinfo.cpp \ @@ -972,6 +972,56 @@ GUIDEPS = \ win_gtk.d \ window.d +GUI_LOWLEVEL_OBJS = \ + app.o \ + bitmap.o \ + brush.o \ + colour.o \ + cursor.o \ + data.o \ + dc.o \ + dcclient.o \ + dcmemory.o \ + dcscreen.o \ + dialog.o \ + font.o \ + frame.o \ + gdiobj.o \ + icon.o \ + main.o \ + palette.o \ + pen.o \ + region.o \ + settings.o \ + utilsgtk.o \ + win_gtk.o \ + window.o + +GUI_LOWLEVEL_DEPS = \ + app.d \ + bitmap.d \ + brush.d \ + colour.d \ + cursor.d \ + data.d \ + dc.d \ + dcclient.d \ + dcmemory.d \ + dcscreen.d \ + dialog.d \ + font.d \ + frame.d \ + gdiobj.d \ + icon.d \ + main.d \ + palette.d \ + pen.d \ + region.d \ + settings.d \ + utilsgtk.d \ + win_gtk.d \ + window.d + UNIXOBJS = \ dialup.o \ dir.o \ diff --git a/src/gtk/frame.cpp b/src/gtk/frame.cpp index 8773d721d2..7e43cb16bf 100644 --- a/src/gtk/frame.cpp +++ b/src/gtk/frame.cpp @@ -146,6 +146,7 @@ static gint gtk_frame_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WX return TRUE; } +#if wxUSE_MENUS //----------------------------------------------------------------------------- // "child_attached" of menu bar //----------------------------------------------------------------------------- @@ -169,6 +170,7 @@ static void gtk_menu_detached_callback( GtkWidget *WXUNUSED(widget), GtkWidget * win->m_menuBarDetached = TRUE; win->GtkUpdateSize(); } +#endif // wxUSE_MENUS #if wxUSE_TOOLBAR //----------------------------------------------------------------------------- @@ -612,6 +614,7 @@ void wxFrame::DoGetClientSize( int *width, int *height ) const wxWindow::DoGetClientSize( width, height ); if (height) { +#if wxUSE_MENUS /* menu bar */ if (m_frameMenuBar) { @@ -620,6 +623,7 @@ void wxFrame::DoGetClientSize( int *width, int *height ) const else (*height) -= wxPLACE_HOLDER; } +#endif // wxUSE_MENUS #if wxUSE_STATUSBAR /* status bar */ @@ -663,6 +667,7 @@ void wxFrame::DoSetClientSize( int width, int height ) { wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") ); +#if wxUSE_MENUS /* menu bar */ if (m_frameMenuBar) { @@ -671,6 +676,7 @@ void wxFrame::DoSetClientSize( int width, int height ) else height += wxPLACE_HOLDER; } +#endif // wxUSE_MENUS #if wxUSE_STATUSBAR /* status bar */ @@ -759,6 +765,7 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), * this hurts in the eye, but I don't want to call SetSize() * because I don't want to call any non-native functions here. */ +#if wxUSE_MENUS if (m_frameMenuBar) { int xx = m_miniEdge; @@ -775,6 +782,7 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), xx, yy, ww, hh ); client_area_y_offset += hh; } +#endif // wxUSE_MENUS #if wxUSE_TOOLBAR if ((m_frameToolBar) && @@ -782,6 +790,7 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), { int xx = m_miniEdge; int yy = m_miniEdge + m_miniTitle; +#if wxUSE_MENUS if (m_frameMenuBar) { if (!m_menuBarDetached) @@ -789,6 +798,7 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), else yy += wxPLACE_HOLDER; } +#endif // wxUSE_MENUS m_frameToolBar->m_x = xx; m_frameToolBar->m_y = yy; @@ -848,7 +858,7 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), xx, yy, ww, hh ); gtk_widget_draw( m_frameStatusBar->m_widget, (GdkRectangle*) NULL ); } -#endif +#endif // wxUSE_STATUSBAR m_sizeSet = TRUE; @@ -857,6 +867,7 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), event.SetEventObject( this ); GetEventHandler()->ProcessEvent( event ); +#if wxUSE_STATUSBAR // send size event to status bar if (m_frameStatusBar) { @@ -864,6 +875,7 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), event2.SetEventObject( m_frameStatusBar ); m_frameStatusBar->GetEventHandler()->ProcessEvent( event2 ); } +#endif // wxUSE_STATUSBAR m_resizing = FALSE; } @@ -888,7 +900,9 @@ void wxFrame::OnInternalIdle() return; } +#if wxUSE_MENUS if (m_frameMenuBar) m_frameMenuBar->OnInternalIdle(); +#endif // wxUSE_MENUS #if wxUSE_TOOLBAR if (m_frameToolBar) m_frameToolBar->OnInternalIdle(); #endif @@ -903,6 +917,8 @@ void wxFrame::OnInternalIdle() // menu/tool/status bar stuff // ---------------------------------------------------------------------------- +#if wxUSE_MENUS + void wxFrame::SetMenuBar( wxMenuBar *menuBar ) { wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") ); @@ -959,7 +975,10 @@ void wxFrame::SetMenuBar( wxMenuBar *menuBar ) m_sizeSet = FALSE; } +#endif // wxUSE_MENUS + #if wxUSE_TOOLBAR + wxToolBar* wxFrame::CreateToolBar( long style, wxWindowID id, const wxString& name ) { wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") ); diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp index aa212c4d05..ff9c0e8e08 100644 --- a/src/gtk/window.cpp +++ b/src/gtk/window.cpp @@ -1530,7 +1530,7 @@ static gint gtk_window_focus_in_callback( GtkWidget *widget, GdkEvent *WXUNUSED( gdk_im_begin(win->m_ic, win->m_wxwindow->window); #endif -#ifdef wxUSE_CARET +#if wxUSE_CARET // caret needs to be informed about focus change wxCaret *caret = win->GetCaret(); if ( caret ) @@ -1588,7 +1588,7 @@ static gint gtk_window_focus_out_callback( GtkWidget *widget, GdkEvent *WXUNUSED gdk_im_end(); #endif -#ifdef wxUSE_CARET +#if wxUSE_CARET // caret needs to be informed about focus change wxCaret *caret = win->GetCaret(); if ( caret ) @@ -3351,6 +3351,8 @@ void wxWindow::ApplyWidgetStyle() // Pop-up menu stuff //----------------------------------------------------------------------------- +#if wxUSE_MENUS + static void gtk_pop_hide_callback( GtkWidget *WXUNUSED(widget), bool* is_waiting ) { *is_waiting = FALSE; @@ -3421,6 +3423,8 @@ bool wxWindow::DoPopupMenu( wxMenu *menu, int x, int y ) return TRUE; } +#endif // wxUSE_MENUS + #if wxUSE_DRAG_AND_DROP void wxWindow::SetDropTarget( wxDropTarget *dropTarget ) diff --git a/src/gtk1/files.lst b/src/gtk1/files.lst index f09570863b..4f6ed3adec 100644 --- a/src/gtk1/files.lst +++ b/src/gtk1/files.lst @@ -1,4 +1,4 @@ -# This file was automatically generated by tmake at 15:57, 2000/08/04 +# This file was automatically generated by tmake at 14:01, 2000/08/11 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE GTK.T! ALL_SOURCES = \ generic/busyinfo.cpp \ @@ -972,6 +972,56 @@ GUIDEPS = \ win_gtk.d \ window.d +GUI_LOWLEVEL_OBJS = \ + app.o \ + bitmap.o \ + brush.o \ + colour.o \ + cursor.o \ + data.o \ + dc.o \ + dcclient.o \ + dcmemory.o \ + dcscreen.o \ + dialog.o \ + font.o \ + frame.o \ + gdiobj.o \ + icon.o \ + main.o \ + palette.o \ + pen.o \ + region.o \ + settings.o \ + utilsgtk.o \ + win_gtk.o \ + window.o + +GUI_LOWLEVEL_DEPS = \ + app.d \ + bitmap.d \ + brush.d \ + colour.d \ + cursor.d \ + data.d \ + dc.d \ + dcclient.d \ + dcmemory.d \ + dcscreen.d \ + dialog.d \ + font.d \ + frame.d \ + gdiobj.d \ + icon.d \ + main.d \ + palette.d \ + pen.d \ + region.d \ + settings.d \ + utilsgtk.d \ + win_gtk.d \ + window.d + UNIXOBJS = \ dialup.o \ dir.o \ diff --git a/src/gtk1/frame.cpp b/src/gtk1/frame.cpp index 8773d721d2..7e43cb16bf 100644 --- a/src/gtk1/frame.cpp +++ b/src/gtk1/frame.cpp @@ -146,6 +146,7 @@ static gint gtk_frame_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WX return TRUE; } +#if wxUSE_MENUS //----------------------------------------------------------------------------- // "child_attached" of menu bar //----------------------------------------------------------------------------- @@ -169,6 +170,7 @@ static void gtk_menu_detached_callback( GtkWidget *WXUNUSED(widget), GtkWidget * win->m_menuBarDetached = TRUE; win->GtkUpdateSize(); } +#endif // wxUSE_MENUS #if wxUSE_TOOLBAR //----------------------------------------------------------------------------- @@ -612,6 +614,7 @@ void wxFrame::DoGetClientSize( int *width, int *height ) const wxWindow::DoGetClientSize( width, height ); if (height) { +#if wxUSE_MENUS /* menu bar */ if (m_frameMenuBar) { @@ -620,6 +623,7 @@ void wxFrame::DoGetClientSize( int *width, int *height ) const else (*height) -= wxPLACE_HOLDER; } +#endif // wxUSE_MENUS #if wxUSE_STATUSBAR /* status bar */ @@ -663,6 +667,7 @@ void wxFrame::DoSetClientSize( int width, int height ) { wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") ); +#if wxUSE_MENUS /* menu bar */ if (m_frameMenuBar) { @@ -671,6 +676,7 @@ void wxFrame::DoSetClientSize( int width, int height ) else height += wxPLACE_HOLDER; } +#endif // wxUSE_MENUS #if wxUSE_STATUSBAR /* status bar */ @@ -759,6 +765,7 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), * this hurts in the eye, but I don't want to call SetSize() * because I don't want to call any non-native functions here. */ +#if wxUSE_MENUS if (m_frameMenuBar) { int xx = m_miniEdge; @@ -775,6 +782,7 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), xx, yy, ww, hh ); client_area_y_offset += hh; } +#endif // wxUSE_MENUS #if wxUSE_TOOLBAR if ((m_frameToolBar) && @@ -782,6 +790,7 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), { int xx = m_miniEdge; int yy = m_miniEdge + m_miniTitle; +#if wxUSE_MENUS if (m_frameMenuBar) { if (!m_menuBarDetached) @@ -789,6 +798,7 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), else yy += wxPLACE_HOLDER; } +#endif // wxUSE_MENUS m_frameToolBar->m_x = xx; m_frameToolBar->m_y = yy; @@ -848,7 +858,7 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), xx, yy, ww, hh ); gtk_widget_draw( m_frameStatusBar->m_widget, (GdkRectangle*) NULL ); } -#endif +#endif // wxUSE_STATUSBAR m_sizeSet = TRUE; @@ -857,6 +867,7 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), event.SetEventObject( this ); GetEventHandler()->ProcessEvent( event ); +#if wxUSE_STATUSBAR // send size event to status bar if (m_frameStatusBar) { @@ -864,6 +875,7 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), event2.SetEventObject( m_frameStatusBar ); m_frameStatusBar->GetEventHandler()->ProcessEvent( event2 ); } +#endif // wxUSE_STATUSBAR m_resizing = FALSE; } @@ -888,7 +900,9 @@ void wxFrame::OnInternalIdle() return; } +#if wxUSE_MENUS if (m_frameMenuBar) m_frameMenuBar->OnInternalIdle(); +#endif // wxUSE_MENUS #if wxUSE_TOOLBAR if (m_frameToolBar) m_frameToolBar->OnInternalIdle(); #endif @@ -903,6 +917,8 @@ void wxFrame::OnInternalIdle() // menu/tool/status bar stuff // ---------------------------------------------------------------------------- +#if wxUSE_MENUS + void wxFrame::SetMenuBar( wxMenuBar *menuBar ) { wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") ); @@ -959,7 +975,10 @@ void wxFrame::SetMenuBar( wxMenuBar *menuBar ) m_sizeSet = FALSE; } +#endif // wxUSE_MENUS + #if wxUSE_TOOLBAR + wxToolBar* wxFrame::CreateToolBar( long style, wxWindowID id, const wxString& name ) { wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") ); diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp index aa212c4d05..ff9c0e8e08 100644 --- a/src/gtk1/window.cpp +++ b/src/gtk1/window.cpp @@ -1530,7 +1530,7 @@ static gint gtk_window_focus_in_callback( GtkWidget *widget, GdkEvent *WXUNUSED( gdk_im_begin(win->m_ic, win->m_wxwindow->window); #endif -#ifdef wxUSE_CARET +#if wxUSE_CARET // caret needs to be informed about focus change wxCaret *caret = win->GetCaret(); if ( caret ) @@ -1588,7 +1588,7 @@ static gint gtk_window_focus_out_callback( GtkWidget *widget, GdkEvent *WXUNUSED gdk_im_end(); #endif -#ifdef wxUSE_CARET +#if wxUSE_CARET // caret needs to be informed about focus change wxCaret *caret = win->GetCaret(); if ( caret ) @@ -3351,6 +3351,8 @@ void wxWindow::ApplyWidgetStyle() // Pop-up menu stuff //----------------------------------------------------------------------------- +#if wxUSE_MENUS + static void gtk_pop_hide_callback( GtkWidget *WXUNUSED(widget), bool* is_waiting ) { *is_waiting = FALSE; @@ -3421,6 +3423,8 @@ bool wxWindow::DoPopupMenu( wxMenu *menu, int x, int y ) return TRUE; } +#endif // wxUSE_MENUS + #if wxUSE_DRAG_AND_DROP void wxWindow::SetDropTarget( wxDropTarget *dropTarget ) diff --git a/src/unix/fontenum.cpp b/src/unix/fontenum.cpp index a9960f0709..5cd8a26981 100644 --- a/src/unix/fontenum.cpp +++ b/src/unix/fontenum.cpp @@ -73,11 +73,13 @@ static char **CreateFontList(wxChar spacing, wxNativeEncodingInfo info; wxGetNativeFontEncoding(encoding, &info); +#if wxUSE_FONTMAP if ( !wxTestFontEncoding(info) ) { // ask font mapper for a replacement (void)wxTheFontMapper->GetAltForEncoding(encoding, &info); } +#endif // wxUSE_FONTMAP wxString pattern; pattern.Printf(wxT("-*-*-*-*-*-*-*-*-*-*-%c-*-%s-%s"), diff --git a/src/unix/fontutil.cpp b/src/unix/fontutil.cpp index 036c84272d..fb312dec78 100644 --- a/src/unix/fontutil.cpp +++ b/src/unix/fontutil.cpp @@ -260,7 +260,9 @@ wxNativeFont wxLoadQueryNearestFont(int pointSize, if ( !wxGetNativeFontEncoding(encoding, &info) || !wxTestFontEncoding(info) ) { +#if wxUSE_FONTMAP if ( !wxTheFontMapper->GetAltForEncoding(encoding, &info) ) +#endif // wxUSE_FONTMAP { // unspported encoding - replace it with the default // diff --git a/src/unix/threadpsx.cpp b/src/unix/threadpsx.cpp index f0a19482a0..8ecf072004 100644 --- a/src/unix/threadpsx.cpp +++ b/src/unix/threadpsx.cpp @@ -847,7 +847,7 @@ void wxThread::Sleep(unsigned long milliseconds) int wxThread::GetCPUCount() { -#if defined(__LINUX__) +#if defined(__LINUX__) && wxUSE_FFILE // read from proc (can't use wxTextFile here because it's a special file: // it has 0 size but still can be read from) wxLogNull nolog; diff --git a/src/unix/utilsunx.cpp b/src/unix/utilsunx.cpp index b2fa90d046..7b1d173afc 100644 --- a/src/unix/utilsunx.cpp +++ b/src/unix/utilsunx.cpp @@ -303,6 +303,8 @@ void wxHandleProcessTermination(wxEndProcessData *proc_data) // wxStream classes to support IO redirection in wxExecute // ---------------------------------------------------------------------------- +#if wxUSE_STREAMS + class wxProcessFileInputStream : public wxInputStream { public: @@ -399,12 +401,14 @@ size_t wxProcessFileOutputStream::OnSysWrite(const void *buffer, size_t bufsize) return ret; } +#endif // wxUSE_STREAMS + long wxExecute(wxChar **argv, bool sync, wxProcess *process) { // for the sync execution, we return -1 to indicate failure, but for async - // cse we return 0 which is never a valid PID + // case we return 0 which is never a valid PID long errorRetCode = sync ? -1 : 0; wxCHECK_MSG( *argv, errorRetCode, wxT("can't exec empty command") ); @@ -557,16 +561,18 @@ long wxExecute(wxChar **argv, // pipe initialization: construction of the wxStreams if ( process && process->IsRedirected() ) { +#if wxUSE_STREAMS // These two streams are relative to this process. wxOutputStream *outStream = new wxProcessFileOutputStream(pipeIn[1]); wxInputStream *inStream = new wxProcessFileInputStream(pipeOut[0]); wxInputStream *errStream = new wxProcessFileInputStream(pipeErr[0]); + process->SetPipeStreams(inStream, outStream, errStream); +#endif // wxUSE_STREAMS + close(pipeIn[0]); // close reading side close(pipeOut[1]); // close writing side close(pipeErr[1]); // close writing side - - process->SetPipeStreams(inStream, outStream, errStream); } #if wxUSE_GUI