Fix joystick detection in configure under OS X.

Don't compare toolkit with OSX which is never used for it, compare it with
OSX_COCOA instead.

Closes #15692.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@75257 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2013-11-21 00:08:07 +00:00
parent 16e9e595c5
commit d8e58ed8af
3 changed files with 6 additions and 2 deletions

2
configure vendored
View File

@@ -35512,7 +35512,7 @@ if test "$wxUSE_GUI" = "yes" -a "$wxUSE_JOYSTICK" = "yes"; then
if test "$TOOLKIT" = "MSW"; then
wxUSE_JOYSTICK=yes
elif test "$TOOLKIT" = "OSX" -o "$TOOLKIT" = "COCOA"; then
elif test "$TOOLKIT" = "OSX_COCOA" -o "$TOOLKIT" = "COCOA"; then
if test "$USE_DARWIN" = 1; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking headers have declarations needed for joystick support" >&5
$as_echo_n "checking headers have declarations needed for joystick support... " >&6; }

View File

@@ -6331,7 +6331,7 @@ if test "$wxUSE_GUI" = "yes" -a "$wxUSE_JOYSTICK" = "yes"; then
wxUSE_JOYSTICK=yes
dnl mac only available on darwin
elif test "$TOOLKIT" = "OSX" -o "$TOOLKIT" = "COCOA"; then
elif test "$TOOLKIT" = "OSX_COCOA" -o "$TOOLKIT" = "COCOA"; then
if test "$USE_DARWIN" = 1; then
dnl check for a bug in the headers, some have bad setEventCallout
AC_MSG_CHECKING([headers have declarations needed for joystick support])

View File

@@ -595,6 +595,10 @@ wxMSW:
- Make "%lu" work with size_t arguments under Win64 (laro).
- Fix wxRegion::Offset() with shared objects (Joost Nieuwenhuijse).
wxOSX:
- Fix incorrect joystick detection in configure (Lauri Nurmi).
3.0.0: (released 2013-11-11)
----------------------------