From 452b62435318df15ace8c53c29897139195848e9 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Wed, 23 Aug 2006 10:15:43 +0000 Subject: [PATCH] set wxUSE_TOOLBAR_NATIVE to 0 when --enable-universal is used git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40767 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- configure | 6 ++++-- configure.in | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/configure b/configure index 9dd85c1933..8ca8b7d679 100755 --- a/configure +++ b/configure @@ -44813,8 +44813,10 @@ _ACEOF USES_CONTROLS=1 - wxUSE_TOOLBAR_NATIVE="yes" - if test "$wxUSE_TOOLBAR_NATIVE" = "yes"; then + if test "$wxUSE_UNIVERSAL" = "yes"; then + wxUSE_TOOLBAR_NATIVE="no" + else + wxUSE_TOOLBAR_NATIVE="yes" cat >>confdefs.h <<\_ACEOF #define wxUSE_TOOLBAR_NATIVE 1 _ACEOF diff --git a/configure.in b/configure.in index 1ff734b886..4fa6060386 100644 --- a/configure.in +++ b/configure.in @@ -6607,8 +6607,10 @@ if test "$wxUSE_TOOLBAR" = "yes"; then AC_DEFINE(wxUSE_TOOLBAR) USES_CONTROLS=1 - wxUSE_TOOLBAR_NATIVE="yes" - if test "$wxUSE_TOOLBAR_NATIVE" = "yes"; then + if test "$wxUSE_UNIVERSAL" = "yes"; then + wxUSE_TOOLBAR_NATIVE="no" + else + wxUSE_TOOLBAR_NATIVE="yes" AC_DEFINE(wxUSE_TOOLBAR_NATIVE) fi -- 2.45.2