Don't include pbt.h from wxMSW code unnecessarily.

The contents of this header is available from winuser.h (included by
windows.h) since at least 15 years and pbt.h itself is not included in the
latest Platform SDK releases (8+) so simply don't include it and also don't
test for its availability in configure.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69863 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2011-11-29 19:27:14 +00:00
parent 8a4e043aef
commit f1a6c1d024
3 changed files with 0 additions and 62 deletions

55
configure vendored
View File

@ -29969,61 +29969,6 @@ fi
WXCONFIG_RESFLAGS="--define __WIN32__ --define __WIN95__ --define __GNUWIN32__ $WINDRES_CPU_DEFINE"
WIN32INSTALL=win32install
{ echo "$as_me:$LINENO: checking for pbt.h" >&5
echo $ECHO_N "checking for pbt.h... $ECHO_C" >&6; }
if test "${ac_cv_header_pbt_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <pbt.h>
_ACEOF
rm -f conftest.$ac_objext
if { (ac_try="$ac_compile"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
ac_cv_header_pbt_h=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_header_pbt_h=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_header_pbt_h" >&5
echo "${ECHO_T}$ac_cv_header_pbt_h" >&6; }
if test $ac_cv_header_pbt_h = yes; then
:
else
cat >>confdefs.h <<\_ACEOF
#define NEED_PBT_H 1
_ACEOF
fi
fi
if test "$wxUSE_GUI" = "yes"; then

View File

@ -2931,9 +2931,6 @@ if test "$USE_WIN32" = 1 ; then
dnl install Win32-specific files in "make install"
WIN32INSTALL=win32install
dnl pbt.h is missing on Wine at least
AC_CHECK_HEADER([pbt.h],, [AC_DEFINE(NEED_PBT_H)], [ ])
fi
if test "$wxUSE_GUI" = "yes"; then

View File

@ -113,10 +113,6 @@
#include <windowsx.h>
#endif
#if !defined __WXWINCE__ && !defined NEED_PBT_H
#include <pbt.h>
#endif
#if defined(__WXWINCE__)
#include "wx/msw/wince/missing.h"
#ifdef __POCKETPC__