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

diff --git a/configure b/configure
index 9dd85c193372a94a879b21067a8251add795de21..8ca8b7d679acbda2e00ea1e2b5a13584e8dde941 100755 (executable)
--- 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 1ff734b886846924026d433825cf02e63699e673..4fa6060386be8c0ff4571c32d1980eb2ab2f07bd 100644 (file)
--- 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