From a45d7ab72381f8b7f89967ce9e5bbaa70b6a3d1c Mon Sep 17 00:00:00 2001 From: Gilles Depeyrot Date: Sat, 16 Jun 2001 21:13:35 +0000 Subject: [PATCH] disable toggle button under Mac OS X (not yet implemented) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10600 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- configure | 11 +++++++++-- configure.in | 9 ++++++++- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 79f5a64c67..f2e49f4c2c 100755 --- a/configure +++ b/configure @@ -15592,10 +15592,17 @@ EOF fi if test "$wxUSE_TOGGLEBTN" = "yes"; then - cat >> confdefs.h <<\EOF + if test "$wxUSE_MAC" = 1; then + echo "configure: warning: Toggle button is not yet supported under Mac OS X" 1>&2 + wxUSE_TOGGLEBTN=no + fi + + if test "$wxUSE_TOGGLEBTN" = "yes"; then + cat >> confdefs.h <<\EOF #define wxUSE_TOGGLEBTN 1 EOF + fi fi if test "$wxUSE_TOOLBAR_SIMPLE" = "yes"; then @@ -15909,7 +15916,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:15913: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:15920: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 diff --git a/configure.in b/configure.in index a03cf4e229..db7b9261ab 100644 --- a/configure.in +++ b/configure.in @@ -3929,7 +3929,14 @@ if test "$wxUSE_TABDIALOG" = "yes"; then fi if test "$wxUSE_TOGGLEBTN" = "yes"; then - AC_DEFINE(wxUSE_TOGGLEBTN) + if test "$wxUSE_MAC" = 1; then + AC_MSG_WARN([Toggle button is not yet supported under Mac OS X]) + wxUSE_TOGGLEBTN=no + fi + + if test "$wxUSE_TOGGLEBTN" = "yes"; then + AC_DEFINE(wxUSE_TOGGLEBTN) + fi fi if test "$wxUSE_TOOLBAR_SIMPLE" = "yes"; then -- 2.45.2