From: Robert Roebling Date: Sun, 8 Nov 1998 16:42:20 +0000 (+0000) Subject: Compile and build fixes for wxGTK and wxMotif X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/d18ed59a36637b9dbb3694a083d45bf3cc41ee08 Compile and build fixes for wxGTK and wxMotif Removed somw more warnings git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@970 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/configure b/configure index c06de7d29e..82963b2499 100755 --- a/configure +++ b/configure @@ -38,8 +38,6 @@ ac_help="$ac_help ac_help="$ac_help **--with-zlib use zlib for LZW comression" ac_help="$ac_help -**--with-gdk_imlib use Raster's gdk_imlib (Image library)" -ac_help="$ac_help **--with-libpng use libpng (PNG image format)" ac_help="$ac_help **--with-odbc use iODBC and wxODBC classes" @@ -680,6 +678,8 @@ SEARCH_INCLUDE="\ /usr/lpp/Xamples/include \ \ /usr/local/include/gtk \ + /usr/local/include/Xm \ + /usr/local/include/qt \ /usr/X11R6/include/Xm \ /usr/X11/include/Xm \ /usr/include/qt \ @@ -4366,7 +4366,6 @@ DEFAULT_wxUSE_APPLE_IEEE=1 DEFAULT_wxUSE_IOSTREAMH=1 DEFAULT_wxUSE_ZLIB=1 -DEFAULT_wxUSE_GDK_IMLIB=1 DEFAULT_wxUSE_LIBPNG=1 DEFAULT_wxUSE_ODBC=0 @@ -4419,7 +4418,7 @@ DEFAULT_wxUSE_WCSRTOMBS=0 echo $ac_n "checking "for gtk"""... $ac_c" 1>&6 -echo "configure:4423: checking "for gtk"" >&5 +echo "configure:4422: checking "for gtk"" >&5 # Check whether --with-gtk or --without-gtk was given. if test "${with_gtk+set}" = set; then withval="$with_gtk" @@ -4449,7 +4448,7 @@ fi echo $ac_n "checking "for qt"""... $ac_c" 1>&6 -echo "configure:4453: checking "for qt"" >&5 +echo "configure:4452: checking "for qt"" >&5 # Check whether --with-qt or --without-qt was given. if test "${with_qt+set}" = set; then withval="$with_qt" @@ -4479,7 +4478,7 @@ fi echo $ac_n "checking "for motif"""... $ac_c" 1>&6 -echo "configure:4483: checking "for motif"" >&5 +echo "configure:4482: checking "for motif"" >&5 # Check whether --with-motif or --without-motif was given. if test "${with_motif+set}" = set; then withval="$with_motif" @@ -4510,7 +4509,7 @@ fi echo $ac_n "checking "for shared"""... $ac_c" 1>&6 -echo "configure:4514: checking "for shared"" >&5 +echo "configure:4513: checking "for shared"" >&5 # Check whether --with-shared or --without-shared was given. if test "${with_shared+set}" = set; then withval="$with_shared" @@ -4540,7 +4539,7 @@ fi echo $ac_n "checking "for optimise"""... $ac_c" 1>&6 -echo "configure:4544: checking "for optimise"" >&5 +echo "configure:4543: checking "for optimise"" >&5 # Check whether --with-optimise or --without-optimise was given. if test "${with_optimise+set}" = set; then withval="$with_optimise" @@ -4570,7 +4569,7 @@ fi echo $ac_n "checking "for debug_flag"""... $ac_c" 1>&6 -echo "configure:4574: checking "for debug_flag"" >&5 +echo "configure:4573: checking "for debug_flag"" >&5 # Check whether --with-debug_flag or --without-debug_flag was given. if test "${with_debug_flag+set}" = set; then withval="$with_debug_flag" @@ -4600,7 +4599,7 @@ fi echo $ac_n "checking "for debug_info"""... $ac_c" 1>&6 -echo "configure:4604: checking "for debug_info"" >&5 +echo "configure:4603: checking "for debug_info"" >&5 # Check whether --with-debug_info or --without-debug_info was given. if test "${with_debug_info+set}" = set; then withval="$with_debug_info" @@ -4630,7 +4629,7 @@ fi echo $ac_n "checking "for mem_tracing"""... $ac_c" 1>&6 -echo "configure:4634: checking "for mem_tracing"" >&5 +echo "configure:4633: checking "for mem_tracing"" >&5 # Check whether --with-mem_tracing or --without-mem_tracing was given. if test "${with_mem_tracing+set}" = set; then withval="$with_mem_tracing" @@ -4660,7 +4659,7 @@ fi echo $ac_n "checking "for dmalloc"""... $ac_c" 1>&6 -echo "configure:4664: checking "for dmalloc"" >&5 +echo "configure:4663: checking "for dmalloc"" >&5 # Check whether --with-dmalloc or --without-dmalloc was given. if test "${with_dmalloc+set}" = set; then withval="$with_dmalloc" @@ -4690,7 +4689,7 @@ fi echo $ac_n "checking "for profile"""... $ac_c" 1>&6 -echo "configure:4694: checking "for profile"" >&5 +echo "configure:4693: checking "for profile"" >&5 # Check whether --with-profile or --without-profile was given. if test "${with_profile+set}" = set; then withval="$with_profile" @@ -4720,7 +4719,7 @@ fi echo $ac_n "checking "for apple_ieee"""... $ac_c" 1>&6 -echo "configure:4724: checking "for apple_ieee"" >&5 +echo "configure:4723: checking "for apple_ieee"" >&5 # Check whether --with-apple_ieee or --without-apple_ieee was given. if test "${with_apple_ieee+set}" = set; then withval="$with_apple_ieee" @@ -4751,7 +4750,7 @@ fi echo $ac_n "checking "for zlib"""... $ac_c" 1>&6 -echo "configure:4755: checking "for zlib"" >&5 +echo "configure:4754: checking "for zlib"" >&5 # Check whether --with-zlib or --without-zlib was given. if test "${with_zlib+set}" = set; then withval="$with_zlib" @@ -4780,38 +4779,8 @@ fi -echo $ac_n "checking "for gdk_imlib"""... $ac_c" 1>&6 -echo "configure:4785: checking "for gdk_imlib"" >&5 -# Check whether --with-gdk_imlib or --without-gdk_imlib was given. -if test "${with_gdk_imlib+set}" = set; then - withval="$with_gdk_imlib" - if test "x$with_gdk_imlib" = xyes; then - ac_cv_use_gdk_imlib='wxUSE_GDK_IMLIB="1"' -else - ac_cv_use_gdk_imlib='wxUSE_GDK_IMLIB="0"' -fi -else - - LINE=`grep "wxUSE_GDK_IMLIB" ${OSTYPE}.system.cache` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - ac_cv_use_gdk_imlib='wxUSE_GDK_IMLIB='$DEFAULT_wxUSE_GDK_IMLIB - -fi - -eval "$ac_cv_use_gdk_imlib" -echo $ac_cv_use_gdk_imlib >> ${OSTYPE}.system.cache.tmp -if test "$wxUSE_GDK_IMLIB" = 1; then - echo "$ac_t""yes" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - - - echo $ac_n "checking "for libpng"""... $ac_c" 1>&6 -echo "configure:4815: checking "for libpng"" >&5 +echo "configure:4784: checking "for libpng"" >&5 # Check whether --with-libpng or --without-libpng was given. if test "${with_libpng+set}" = set; then withval="$with_libpng" @@ -4841,7 +4810,7 @@ fi echo $ac_n "checking "for odbc"""... $ac_c" 1>&6 -echo "configure:4845: checking "for odbc"" >&5 +echo "configure:4814: checking "for odbc"" >&5 # Check whether --with-odbc or --without-odbc was given. if test "${with_odbc+set}" = set; then withval="$with_odbc" @@ -4871,7 +4840,7 @@ fi echo $ac_n "checking "for opengl"""... $ac_c" 1>&6 -echo "configure:4875: checking "for opengl"" >&5 +echo "configure:4844: checking "for opengl"" >&5 # Check whether --with-opengl or --without-opengl was given. if test "${with_opengl+set}" = set; then withval="$with_opengl" @@ -4902,7 +4871,7 @@ fi echo $ac_n "checking "for gauge"""... $ac_c" 1>&6 -echo "configure:4906: checking "for gauge"" >&5 +echo "configure:4875: checking "for gauge"" >&5 # Check whether --with-gauge or --without-gauge was given. if test "${with_gauge+set}" = set; then withval="$with_gauge" @@ -4932,7 +4901,7 @@ fi echo $ac_n "checking "for combobox"""... $ac_c" 1>&6 -echo "configure:4936: checking "for combobox"" >&5 +echo "configure:4905: checking "for combobox"" >&5 # Check whether --with-combobox or --without-combobox was given. if test "${with_combobox+set}" = set; then withval="$with_combobox" @@ -4962,7 +4931,7 @@ fi echo $ac_n "checking "for scrollbar"""... $ac_c" 1>&6 -echo "configure:4966: checking "for scrollbar"" >&5 +echo "configure:4935: checking "for scrollbar"" >&5 # Check whether --with-scrollbar or --without-scrollbar was given. if test "${with_scrollbar+set}" = set; then withval="$with_scrollbar" @@ -4992,7 +4961,7 @@ fi echo $ac_n "checking "for listctrl"""... $ac_c" 1>&6 -echo "configure:4996: checking "for listctrl"" >&5 +echo "configure:4965: checking "for listctrl"" >&5 # Check whether --with-listctrl or --without-listctrl was given. if test "${with_listctrl+set}" = set; then withval="$with_listctrl" @@ -5022,7 +4991,7 @@ fi echo $ac_n "checking "for treectrl"""... $ac_c" 1>&6 -echo "configure:5026: checking "for treectrl"" >&5 +echo "configure:4995: checking "for treectrl"" >&5 # Check whether --with-treectrl or --without-treectrl was given. if test "${with_treectrl+set}" = set; then withval="$with_treectrl" @@ -5052,7 +5021,7 @@ fi echo $ac_n "checking "for grid"""... $ac_c" 1>&6 -echo "configure:5056: checking "for grid"" >&5 +echo "configure:5025: checking "for grid"" >&5 # Check whether --with-grid or --without-grid was given. if test "${with_grid+set}" = set; then withval="$with_grid" @@ -5082,7 +5051,7 @@ fi echo $ac_n "checking "for tab_dialog"""... $ac_c" 1>&6 -echo "configure:5086: checking "for tab_dialog"" >&5 +echo "configure:5055: checking "for tab_dialog"" >&5 # Check whether --with-tab_dialog or --without-tab_dialog was given. if test "${with_tab_dialog+set}" = set; then withval="$with_tab_dialog" @@ -5112,7 +5081,7 @@ fi echo $ac_n "checking "for notebook"""... $ac_c" 1>&6 -echo "configure:5116: checking "for notebook"" >&5 +echo "configure:5085: checking "for notebook"" >&5 # Check whether --with-notebook or --without-notebook was given. if test "${with_notebook+set}" = set; then withval="$with_notebook" @@ -5143,7 +5112,7 @@ fi echo $ac_n "checking "for timedate"""... $ac_c" 1>&6 -echo "configure:5147: checking "for timedate"" >&5 +echo "configure:5116: checking "for timedate"" >&5 # Check whether --with-timedate or --without-timedate was given. if test "${with_timedate+set}" = set; then withval="$with_timedate" @@ -5173,7 +5142,7 @@ fi echo $ac_n "checking "for fraction"""... $ac_c" 1>&6 -echo "configure:5177: checking "for fraction"" >&5 +echo "configure:5146: checking "for fraction"" >&5 # Check whether --with-fraction or --without-fraction was given. if test "${with_fraction+set}" = set; then withval="$with_fraction" @@ -5203,7 +5172,7 @@ fi echo $ac_n "checking "for log"""... $ac_c" 1>&6 -echo "configure:5207: checking "for log"" >&5 +echo "configure:5176: checking "for log"" >&5 # Check whether --with-log or --without-log was given. if test "${with_log+set}" = set; then withval="$with_log" @@ -5233,7 +5202,7 @@ fi echo $ac_n "checking "for intl"""... $ac_c" 1>&6 -echo "configure:5237: checking "for intl"" >&5 +echo "configure:5206: checking "for intl"" >&5 # Check whether --with-intl or --without-intl was given. if test "${with_intl+set}" = set; then withval="$with_intl" @@ -5263,7 +5232,7 @@ fi echo $ac_n "checking "for config"""... $ac_c" 1>&6 -echo "configure:5267: checking "for config"" >&5 +echo "configure:5236: checking "for config"" >&5 # Check whether --with-config or --without-config was given. if test "${with_config+set}" = set; then withval="$with_config" @@ -5293,7 +5262,7 @@ fi echo $ac_n "checking "for streams"""... $ac_c" 1>&6 -echo "configure:5297: checking "for streams"" >&5 +echo "configure:5266: checking "for streams"" >&5 # Check whether --with-streams or --without-streams was given. if test "${with_streams+set}" = set; then withval="$with_streams" @@ -5323,7 +5292,7 @@ fi echo $ac_n "checking "for serial"""... $ac_c" 1>&6 -echo "configure:5327: checking "for serial"" >&5 +echo "configure:5296: checking "for serial"" >&5 # Check whether --with-serial or --without-serial was given. if test "${with_serial+set}" = set; then withval="$with_serial" @@ -5353,7 +5322,7 @@ fi echo $ac_n "checking "for file"""... $ac_c" 1>&6 -echo "configure:5357: checking "for file"" >&5 +echo "configure:5326: checking "for file"" >&5 # Check whether --with-file or --without-file was given. if test "${with_file+set}" = set; then withval="$with_file" @@ -5383,7 +5352,7 @@ fi echo $ac_n "checking "for textfile"""... $ac_c" 1>&6 -echo "configure:5387: checking "for textfile"" >&5 +echo "configure:5356: checking "for textfile"" >&5 # Check whether --with-textfile or --without-textfile was given. if test "${with_textfile+set}" = set; then withval="$with_textfile" @@ -5414,7 +5383,7 @@ fi echo $ac_n "checking "for afmfonts"""... $ac_c" 1>&6 -echo "configure:5418: checking "for afmfonts"" >&5 +echo "configure:5387: checking "for afmfonts"" >&5 # Check whether --with-afmfonts or --without-afmfonts was given. if test "${with_afmfonts+set}" = set; then withval="$with_afmfonts" @@ -5444,7 +5413,7 @@ fi echo $ac_n "checking "for normalized"""... $ac_c" 1>&6 -echo "configure:5448: checking "for normalized"" >&5 +echo "configure:5417: checking "for normalized"" >&5 # Check whether --with-normalized or --without-normalized was given. if test "${with_normalized+set}" = set; then withval="$with_normalized" @@ -5474,7 +5443,7 @@ fi echo $ac_n "checking "for postscript"""... $ac_c" 1>&6 -echo "configure:5478: checking "for postscript"" >&5 +echo "configure:5447: checking "for postscript"" >&5 # Check whether --with-postscript or --without-postscript was given. if test "${with_postscript+set}" = set; then withval="$with_postscript" @@ -5505,7 +5474,7 @@ fi echo $ac_n "checking "for unicode"""... $ac_c" 1>&6 -echo "configure:5509: checking "for unicode"" >&5 +echo "configure:5478: checking "for unicode"" >&5 # Check whether --with-unicode or --without-unicode was given. if test "${with_unicode+set}" = set; then withval="$with_unicode" @@ -5535,7 +5504,7 @@ fi echo $ac_n "checking "for wcsrtombs"""... $ac_c" 1>&6 -echo "configure:5539: checking "for wcsrtombs"" >&5 +echo "configure:5508: checking "for wcsrtombs"" >&5 # Check whether --with-wcsrtombs or --without-wcsrtombs was given. if test "${with_wcsrtombs+set}" = set; then withval="$with_wcsrtombs" @@ -5566,7 +5535,7 @@ fi echo $ac_n "checking "for wxresources"""... $ac_c" 1>&6 -echo "configure:5570: checking "for wxresources"" >&5 +echo "configure:5539: checking "for wxresources"" >&5 # Check whether --with-wxresources or --without-wxresources was given. if test "${with_wxresources+set}" = set; then withval="$with_wxresources" @@ -5596,7 +5565,7 @@ fi echo $ac_n "checking "for prologio"""... $ac_c" 1>&6 -echo "configure:5600: checking "for prologio"" >&5 +echo "configure:5569: checking "for prologio"" >&5 # Check whether --with-prologio or --without-prologio was given. if test "${with_prologio+set}" = set; then withval="$with_prologio" @@ -5626,7 +5595,7 @@ fi echo $ac_n "checking "for RPC"""... $ac_c" 1>&6 -echo "configure:5630: checking "for RPC"" >&5 +echo "configure:5599: checking "for RPC"" >&5 # Check whether --with-rpc or --without-rpc was given. if test "${with_rpc+set}" = set; then withval="$with_rpc" @@ -5657,7 +5626,7 @@ fi echo $ac_n "checking "for IPC"""... $ac_c" 1>&6 -echo "configure:5661: checking "for IPC"" >&5 +echo "configure:5630: checking "for IPC"" >&5 # Check whether --with-ipc or --without-ipc was given. if test "${with_ipc+set}" = set; then withval="$with_ipc" @@ -5687,7 +5656,7 @@ fi echo $ac_n "checking "for resources"""... $ac_c" 1>&6 -echo "configure:5691: checking "for resources"" >&5 +echo "configure:5660: checking "for resources"" >&5 # Check whether --with-resources or --without-resources was given. if test "${with_resources+set}" = set; then withval="$with_resources" @@ -5717,7 +5686,7 @@ fi echo $ac_n "checking "for clipboard"""... $ac_c" 1>&6 -echo "configure:5721: checking "for clipboard"" >&5 +echo "configure:5690: checking "for clipboard"" >&5 # Check whether --with-clipboard or --without-clipboard was given. if test "${with_clipboard+set}" = set; then withval="$with_clipboard" @@ -5747,7 +5716,7 @@ fi echo $ac_n "checking "for dnd"""... $ac_c" 1>&6 -echo "configure:5751: checking "for dnd"" >&5 +echo "configure:5720: checking "for dnd"" >&5 # Check whether --with-dnd or --without-dnd was given. if test "${with_dnd+set}" = set; then withval="$with_dnd" @@ -5777,7 +5746,7 @@ fi echo $ac_n "checking "for constrains"""... $ac_c" 1>&6 -echo "configure:5781: checking "for constrains"" >&5 +echo "configure:5750: checking "for constrains"" >&5 # Check whether --with-constraints or --without-constraints was given. if test "${with_constraints+set}" = set; then withval="$with_constraints" @@ -5808,7 +5777,7 @@ fi echo $ac_n "checking "for mdi"""... $ac_c" 1>&6 -echo "configure:5812: checking "for mdi"" >&5 +echo "configure:5781: checking "for mdi"" >&5 # Check whether --with-mdi or --without-mdi was given. if test "${with_mdi+set}" = set; then withval="$with_mdi" @@ -5838,7 +5807,7 @@ fi echo $ac_n "checking "for docview"""... $ac_c" 1>&6 -echo "configure:5842: checking "for docview"" >&5 +echo "configure:5811: checking "for docview"" >&5 # Check whether --with-docview or --without-docview was given. if test "${with_docview+set}" = set; then withval="$with_docview" @@ -5868,7 +5837,7 @@ fi echo $ac_n "checking "for printarch"""... $ac_c" 1>&6 -echo "configure:5872: checking "for printarch"" >&5 +echo "configure:5841: checking "for printarch"" >&5 # Check whether --with-printarch or --without-printarch was given. if test "${with_printarch+set}" = set; then withval="$with_printarch" @@ -5948,7 +5917,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:5952: checking for $ac_word" >&5 +echo "configure:5921: 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 @@ -5979,7 +5948,7 @@ fi min_gtk_version=1.0.4 echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6 -echo "configure:5983: checking for GTK - version >= $min_gtk_version" >&5 +echo "configure:5952: checking for GTK - version >= $min_gtk_version" >&5 no_gtk="" if test "$GTK_CONFIG" != "no" ; then GTK_CFLAGS=`$GTK_CONFIG --cflags` @@ -5992,7 +5961,7 @@ echo "configure:5983: checking for GTK - version >= $min_gtk_version" >&5 echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < @@ -6014,7 +5983,7 @@ main () } EOF -if { (eval echo configure:6018: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5987: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then : else @@ -6053,7 +6022,7 @@ fi if test "$wxUSE_QT" = 1; then echo $ac_n "checking for Qt includes""... $ac_c" 1>&6 -echo "configure:6057: checking for Qt includes" >&5 +echo "configure:6026: checking for Qt includes" >&5 ac_find_includes= for ac_dir in $SEARCH_INCLUDE; @@ -6067,7 +6036,7 @@ for ac_dir in $SEARCH_INCLUDE; if test "$ac_find_includes" != "" ; then echo "$ac_t""found $ac_find_includes" 1>&6 echo $ac_n "checking for Qt library""... $ac_c" 1>&6 -echo "configure:6071: checking for Qt library" >&5 +echo "configure:6040: checking for Qt library" >&5 ac_find_libraries= for ac_dir in $SEARCH_LIB; @@ -6117,7 +6086,7 @@ fi if test "$wxUSE_MOTIF" = 1; then echo $ac_n "checking for Motif/Lesstif includes""... $ac_c" 1>&6 -echo "configure:6121: checking for Motif/Lesstif includes" >&5 +echo "configure:6090: checking for Motif/Lesstif includes" >&5 ac_find_includes= for ac_dir in $SEARCH_INCLUDE; @@ -6131,7 +6100,7 @@ for ac_dir in $SEARCH_INCLUDE; if test "$ac_find_includes" != "" ; then echo "$ac_t""found $ac_find_includes" 1>&6 echo $ac_n "checking for Motif or Lesstif library""... $ac_c" 1>&6 -echo "configure:6135: checking for Motif or Lesstif library" >&5 +echo "configure:6104: checking for Motif or Lesstif library" >&5 ac_find_libraries= for ac_dir in $SEARCH_LIB; @@ -6275,13 +6244,6 @@ EOF fi -if test "$wxUSE_GDK_IMLIB" = 1 ; then - cat >> confdefs.h <> confdefs.h <&6 -echo "configure:6585: checking for main in -ldl" >&5 +echo "configure:6547: checking for main in -ldl" >&5 ac_lib_var=`echo dl'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6589,14 +6551,14 @@ else ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6562: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6620,34 +6582,34 @@ fi -wxwxUSE_THREADS=1 +wxUSE_THREADS=1 THREADS_LINK="" UNIX_THREAD="gtk/threadno.cpp" echo $ac_n "checking "for threads"""... $ac_c" 1>&6 -echo "configure:6630: checking "for threads"" >&5 +echo "configure:6592: checking "for threads"" >&5 # Check whether --with-threads or --without-threads was given. if test "${with_threads+set}" = set; then withval="$with_threads" if test "x$with_threads" = xyes; then - ac_cv_use_threads='wxwxUSE_THREADS="1"' + ac_cv_use_threads='wxUSE_THREADS="1"' else - ac_cv_use_threads='wxwxUSE_THREADS="0"' + ac_cv_use_threads='wxUSE_THREADS="0"' fi else - LINE=`grep "wxwxUSE_THREADS" ${OSTYPE}.system.cache` + LINE=`grep "wxUSE_THREADS" ${OSTYPE}.system.cache` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" fi - ac_cv_use_threads='wxwxUSE_THREADS='$DEFAULT_wxwxUSE_THREADS + ac_cv_use_threads='wxUSE_THREADS='$DEFAULT_wxUSE_THREADS fi eval "$ac_cv_use_threads" echo $ac_cv_use_threads >> ${OSTYPE}.system.cache.tmp -if test "$wxwxUSE_THREADS" = 1; then +if test "$wxUSE_THREADS" = 1; then echo "$ac_t""yes" 1>&6 else echo "$ac_t""no" 1>&6 @@ -6655,12 +6617,12 @@ fi -if test "$wxwxUSE_THREADS" = "1"; then +if test "$wxUSE_THREADS" = "1"; then UNIX_THREAD="gtk/threadno.cpp" echo $ac_n "checking for pthread_create in -lpthread-0.7""... $ac_c" 1>&6 -echo "configure:6664: checking for pthread_create in -lpthread-0.7" >&5 +echo "configure:6626: checking for pthread_create in -lpthread-0.7" >&5 ac_lib_var=`echo pthread-0.7'_'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 @@ -6668,7 +6630,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpthread-0.7 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6645: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6703,17 +6665,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:6707: checking for sys/prctl.h" >&5 +echo "configure:6669: 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:6717: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6679: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -6739,7 +6701,7 @@ fi echo $ac_n "checking for pthread_setcanceltype in -lpthread""... $ac_c" 1>&6 -echo "configure:6743: checking for pthread_setcanceltype in -lpthread" >&5 +echo "configure:6705: checking for pthread_setcanceltype in -lpthread" >&5 ac_lib_var=`echo pthread'_'pthread_setcanceltype | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6747,7 +6709,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpthread $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6724: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6785,7 +6747,7 @@ fi fi echo $ac_n "checking for pthread_setcanceltype in -lpthreads""... $ac_c" 1>&6 -echo "configure:6789: checking for pthread_setcanceltype in -lpthreads" >&5 +echo "configure:6751: checking for pthread_setcanceltype in -lpthreads" >&5 ac_lib_var=`echo pthreads'_'pthread_setcanceltype | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6793,7 +6755,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpthreads $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6770: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6829,14 +6791,18 @@ fi fi +if test "$wxUSE_MOTIF" = "1"; then + UNIX_THREAD="motif/thread.cpp" +fi + if test -z "$UNIX_THREAD"; then - wxwxUSE_THREADS=0 + wxUSE_THREADS=0 fi cat >> confdefs.h <<\EOF -#define wxwxUSE_THREADS 1 +#define wxUSE_THREADS 1 EOF @@ -6848,7 +6814,7 @@ OPENGL_LINK= if test "$wxUSE_OPENGL" = 1; then echo $ac_n "checking for OpenGL includes""... $ac_c" 1>&6 -echo "configure:6852: checking for OpenGL includes" >&5 +echo "configure:6818: checking for OpenGL includes" >&5 ac_find_includes= for ac_dir in $SEARCH_INCLUDE; @@ -6863,7 +6829,7 @@ for ac_dir in $SEARCH_INCLUDE; OPENGL_INCLUDE="-I$ac_find_includes" echo "$ac_t""found $ac_find_includes" 1>&6 echo $ac_n "checking for OpenGL library""... $ac_c" 1>&6 -echo "configure:6867: checking for OpenGL library" >&5 +echo "configure:6833: checking for OpenGL library" >&5 ac_find_libraries= for ac_dir in $SEARCH_LIB; diff --git a/configure.in b/configure.in index 5146813a4e..290d717b78 100644 --- a/configure.in +++ b/configure.in @@ -269,6 +269,8 @@ SEARCH_INCLUDE="\ /usr/lpp/Xamples/include \ \ /usr/local/include/gtk \ + /usr/local/include/Xm \ + /usr/local/include/qt \ /usr/X11R6/include/Xm \ /usr/X11/include/Xm \ /usr/include/qt \ @@ -670,7 +672,6 @@ DEFAULT_wxUSE_APPLE_IEEE=1 DEFAULT_wxUSE_IOSTREAMH=1 DEFAULT_wxUSE_ZLIB=1 -DEFAULT_wxUSE_GDK_IMLIB=1 DEFAULT_wxUSE_LIBPNG=1 DEFAULT_wxUSE_ODBC=0 @@ -780,10 +781,6 @@ AC_OVERRIDES(zlib,zlib, **--with-zlib use zlib for LZW comression, wxUSE_ZLIB) -AC_OVERRIDES(gdk_imlib,gdk_imlib, -**--with-gdk_imlib use Raster's gdk_imlib (Image library), -wxUSE_GDK_IMLIB) - AC_OVERRIDES(libpng,libpng, **--with-libpng use libpng (PNG image format), wxUSE_LIBPNG) @@ -962,19 +959,19 @@ dnl ---------------------------------------------------------------- dnl dnl AC_OVERRIDES(metafile, metafile, dnl **--with-metafile use metafile (no effect), -dnl wxwxUSE_METAFILE) +dnl wxUSE_METAFILE) dnl dnl AC_OVERRIDES(help,help, dnl **--with-help use help (no effect), -dnl wxwxUSE_HELP) +dnl wxUSE_HELP) dnl dnl AC_OVERRIDES(wxgraph,wxgraph, dnl **--with-wxgraph use wxgraph (no effect), -dnl wxwxUSE_WXGRAPH) +dnl wxUSE_WXGRAPH) dnl dnl AC_OVERRIDES(wxtree,wxtree, dnl **--with-wxtree use wxtree (no effect), -dnl wxwxUSE_WXTREE) +dnl wxUSE_WXTREE) dnl dnl AC_OVERRIDES(package,message,helpmessage,variable) dnl @@ -1143,10 +1140,6 @@ if test "$wxUSE_ZLIB" = 1 ; then AC_DEFINE_UNQUOTED(wxUSE_ZLIB,$wxUSE_ZLIB) fi -if test "$wxUSE_GDK_IMLIB" = 1 ; then - AC_DEFINE_UNQUOTED(wxUSE_GDK_IMLIB,$wxUSE_GDK_IMLIB) -fi - if test "$wxUSE_LIBPNG" = 1 ; then AC_DEFINE_UNQUOTED(wxUSE_LIBPNG,$wxUSE_LIBPNG) fi @@ -1362,19 +1355,19 @@ dnl ---------------------------------------------------------------- dnl thread support dnl ---------------------------------------------------------------- -wxwxUSE_THREADS=1 +wxUSE_THREADS=1 THREADS_LINK="" UNIX_THREAD="gtk/threadno.cpp" AC_OVERRIDES(threads,threads, **--without-threads Force disabling threads, -wxwxUSE_THREADS) +wxUSE_THREADS) dnl AC_ARG_WITH(threads, dnl [**--without-threads Force disabling threads ], -dnl [wxwxUSE_THREADS="$withval"]) +dnl [wxUSE_THREADS="$withval"]) -if test "$wxwxUSE_THREADS" = "1"; then +if test "$wxUSE_THREADS" = "1"; then UNIX_THREAD="gtk/threadno.cpp" dnl For glibc 2 users who have the old libc 5 too @@ -1401,17 +1394,21 @@ if test "$wxwxUSE_THREADS" = "1"; then ]) fi +if test "$wxUSE_MOTIF" = "1"; then + UNIX_THREAD="motif/thread.cpp" +fi + if test -z "$UNIX_THREAD"; then - wxwxUSE_THREADS=0 + wxUSE_THREADS=0 fi AC_SUBST(UNIX_THREAD) AC_SUBST(THREADS_LINK) -AC_DEFINE(wxwxUSE_THREADS) +AC_DEFINE(wxUSE_THREADS) dnl defines UNIX_THREAD it contains the source file to use for threads. (GL) dnl defines THREADS_LINK it contains the thread library to link with. (GL) -dnl defines wxwxUSE_THREADS if thread support is activated. (GL) +dnl defines wxUSE_THREADS if thread support is activated. (GL) dnl ---------------------------------------------------------------- dnl search for opengl diff --git a/include/wx/motif/window.h b/include/wx/motif/window.h index 833d47fe4d..50321c953d 100644 --- a/include/wx/motif/window.h +++ b/include/wx/motif/window.h @@ -369,7 +369,7 @@ public: // Does this window want to accept keyboard focus? virtual bool AcceptsFocus() const; - virtual void PrepareDC( wxDC &dc ) {}; + virtual void PrepareDC( wxDC &WXUNUSED(dc) ) {}; public: diff --git a/samples/notebook/test.cpp b/samples/notebook/test.cpp index f86b14b797..e9867c144c 100644 --- a/samples/notebook/test.cpp +++ b/samples/notebook/test.cpp @@ -50,9 +50,6 @@ bool MyApp::OnInit(void) void MyApp::InitTabView(wxNotebook* notebook, wxWindow* window) { - int dialogWidth = 365; - int dialogHeight = 390; - m_okButton = new wxButton(window, wxID_OK, "Close", wxPoint(-1, -1), wxSize(80, 25)); m_cancelButton = new wxButton(window, wxID_CANCEL, "Cancel", wxPoint(-1, -1), wxSize(80, 25)); m_helpButton = new wxButton(window, wxID_HELP, "Help", wxPoint(-1, -1), wxSize(80, 25)); @@ -131,9 +128,6 @@ void MyDialog::OnCloseWindow(wxCloseEvent& WXUNUSED(event) ) void MyDialog::Init(void) { - int dialogWidth = 365; - int dialogHeight = 390; - m_notebook = new wxNotebook(this, ID_NOTEBOOK); wxLayoutConstraints* c = new wxLayoutConstraints; @@ -179,9 +173,6 @@ void MyFrame::OnCloseWindow(wxCloseEvent& WXUNUSED(event) ) void MyFrame::Init(void) { - int dialogWidth = 365; - int dialogHeight = 390; - m_panel = new wxPanel(this, -1, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL|wxCLIP_CHILDREN); // Note, omit the wxTAB_STYLE_COLOUR_INTERIOR, so we will guarantee a match diff --git a/samples/tab/test.cpp b/samples/tab/test.cpp index 734025be6c..5c9fd419e3 100644 --- a/samples/tab/test.cpp +++ b/samples/tab/test.cpp @@ -50,9 +50,6 @@ bool MyApp::OnInit(void) void MyApp::InitTabView(wxPanelTabView* view, wxWindow* window) { - int dialogWidth = 365; - int dialogHeight = 390; - m_okButton = new wxButton(window, wxID_OK, "Close", wxPoint(-1, -1), wxSize(80, 25)); m_cancelButton = new wxButton(window, wxID_CANCEL, "Cancel", wxPoint(-1, -1), wxSize(80, 25)); m_helpButton = new wxButton(window, wxID_HELP, "Help", wxPoint(-1, -1), wxSize(80, 25)); @@ -210,9 +207,6 @@ void MyFrame::OnCloseWindow(wxCloseEvent& WXUNUSED(event) ) void MyFrame::Init(void) { - int dialogWidth = 365; - int dialogHeight = 390; - m_panel = new wxTabbedPanel(this, -1); // Note, omit the wxTAB_STYLE_COLOUR_INTERIOR, so we will guarantee a match diff --git a/samples/treectrl/treetest.cpp b/samples/treectrl/treetest.cpp index 65e281c84e..6c04b00506 100644 --- a/samples/treectrl/treetest.cpp +++ b/samples/treectrl/treetest.cpp @@ -238,7 +238,7 @@ void MyTreeCtrl::OnItemCollapsing(wxTreeEvent& event) } } -void MyTreeCtrl::OnKeyDown(wxTreeEvent& event) +void MyTreeCtrl::OnKeyDown(wxTreeEvent& WXUNUSED(event)) { // show some info about this item wxTreeItemId itemId = GetSelection(); diff --git a/samples/wxsocket/server.cpp b/samples/wxsocket/server.cpp index 2c52190936..d0e11583d2 100644 --- a/samples/wxsocket/server.cpp +++ b/samples/wxsocket/server.cpp @@ -166,7 +166,7 @@ MyFrame::~MyFrame() } // Intercept menu commands -void MyFrame::Menu_Exit(wxCommandEvent& event) +void MyFrame::Menu_Exit(wxCommandEvent& WXUNUSED(event)) { Close(TRUE); } diff --git a/setup/setup.hin b/setup/setup.hin index dcdba6e1c3..7f9e36056d 100644 --- a/setup/setup.hin +++ b/setup/setup.hin @@ -43,10 +43,6 @@ * Use zlib */ #undef wxUSE_ZLIB -/* - * Use gdk_imlib - */ -#undef wxUSE_GDK_IMLIB /* * Use libpng */ diff --git a/src/motif.inc b/src/motif.inc index 5faa67a46d..24a41d4958 100644 --- a/src/motif.inc +++ b/src/motif.inc @@ -10,8 +10,140 @@ LIB_MINOR=1 LIB_CPP_SRC=\ \ - + common/cmndata.cpp \ + common/config.cpp \ + common/date.cpp \ + common/docmdi.cpp \ + common/docview.cpp \ + common/dynarray.cpp \ + common/dynlib.cpp \ + common/event.cpp \ + common/file.cpp \ + common/fileconf.cpp \ + common/filefn.cpp \ + common/gdicmn.cpp \ + common/hash.cpp \ + common/helpbase.cpp \ + common/intl.cpp \ + common/image.cpp \ + common/ipcbase.cpp \ + common/layout.cpp \ + common/list.cpp \ + common/log.cpp \ + common/matrix.cpp \ + common/memory.cpp \ + common/module.cpp \ + common/object.cpp \ + common/postscrp.cpp \ + common/prntbase.cpp \ + common/resource.cpp \ + common/serbase.cpp \ + common/string.cpp \ + common/textfile.cpp \ + common/time.cpp \ + common/timercmn.cpp \ + common/utilscmn.cpp \ + common/wincmn.cpp \ + common/framecmn.cpp \ + common/stream.cpp \ + common/datstrm.cpp \ + common/fstream.cpp \ + common/mstream.cpp \ + common/zstream.cpp \ + common/objstrm.cpp \ + common/sckstrm.cpp \ + common/validate.cpp \ + common/valtext.cpp \ + common/variant.cpp \ + common/wxexpr.cpp \ + common/socket.cpp \ + common/sckaddr.cpp \ + common/sckipc.cpp \ + common/protocol.cpp \ + common/ftp.cpp \ + common/http.cpp \ + common/url.cpp \ + common/tokenzr.cpp \ +\ + motif/accel.cpp \ + motif/app.cpp \ + motif/bitmap.cpp \ + motif/bmpbuttn.cpp \ + motif/brush.cpp \ + motif/button.cpp \ + motif/checkbox.cpp \ + motif/chcklst.cpp \ + motif/choice.cpp \ + motif/clipbrd.cpp \ + motif/colordlg.cpp \ + motif/colour.cpp \ + motif/control.cpp \ + motif/combobox.cpp \ + motif/cursor.cpp \ + motif/data.cpp \ + motif/dc.cpp \ + motif/dcclient.cpp \ + motif/dcmemory.cpp \ + motif/dcscreen.cpp \ + motif/dnd.cpp \ + motif/dirdlg.cpp \ + motif/dialog.cpp \ + motif/filedlg.cpp \ + motif/font.cpp \ + motif/fontdlg.cpp \ + motif/frame.cpp \ + motif/gauge.cpp \ + motif/gdiobj.cpp \ + motif/icon.cpp \ + motif/listbox.cpp \ + motif/main.cpp \ + motif/mdi.cpp \ + motif/menu.cpp \ + motif/menuitem.cpp \ + motif/msgdlg.cpp \ + motif/notebook.cpp \ + motif/palette.cpp \ + motif/pen.cpp \ + motif/print.cpp \ + motif/printdlg.cpp \ + motif/radiobox.cpp \ + motif/radiobut.cpp \ + motif/region.cpp \ + motif/scrolbar.cpp \ + motif/settings.cpp \ + motif/spinbutt.cpp \ + motif/slider.cpp \ + motif/statbox.cpp \ + motif/statbmp.cpp \ + motif/stattext.cpp \ + motif/toolbar.cpp \ + motif/textctrl.cpp \ + motif/timer.cpp \ + motif/utils.cpp \ + motif/utilsexc.cpp \ + motif/window.cpp \ +\ + generic/choicdgg.cpp \ + generic/colrdlgg.cpp \ + generic/fontdlgg.cpp \ + generic/gridg.cpp \ + generic/imaglist.cpp \ + generic/listctrl.cpp \ + generic/laywin.cpp \ + generic/msgdlgg.cpp \ + generic/panelg.cpp \ + generic/printps.cpp \ + generic/prntdlgg.cpp \ + generic/sashwin.cpp \ + generic/scrolwin.cpp \ + generic/splitter.cpp \ + generic/statusbr.cpp \ + generic/tabg.cpp \ + generic/textdlgg.cpp \ + generic/treectrl.cpp + LIB_C_SRC=\ + common/extended.c \ \ png/png.c \ png/pngset.c \ @@ -43,19 +175,3 @@ LIB_C_SRC=\ zlib/infcodes.c \ zlib/infutil.c \ zlib/inffast.c \ -\ - iodbc/dlf.c \ - iodbc/dlproc.c \ - iodbc/herr.c \ - iodbc/henv.c \ - iodbc/hdbc.c \ - iodbc/hstmt.c \ - iodbc/connect.c \ - iodbc/prepare.c \ - iodbc/result.c \ - iodbc/execute.c \ - iodbc/fetch.c \ - iodbc/info.c \ - iodbc/catalog.c \ - iodbc/misc.c \ - iodbc/itrace.c