wxUSE_TIPWINDOW may be set even if wxUSE_POPUPWIN is unset

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12868 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/configure b/configure
index e7173795771a869f16b3e3ba922299b52b733ab9..f9b23f300027a3e0db27234e511e14238d3722ca 100755 (executable)
--- a/configure
+++ b/configure
@@ -18298,18 +18298,18 @@ if test "$wxUSE_POPUPWIN" = "yes"; then
 EOF
 
 
-            if test "$wxUSE_TIPWINDOW" = "yes"; then
-                cat >> confdefs.h <<\EOF
-#define wxUSE_TIPWINDOW 1
-EOF
-
-            fi
-
             USES_CONTROLS=1
         fi
     fi
 fi
 
+if test "$wxUSE_TIPWINDOW" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_TIPWINDOW 1
+EOF
+
+fi
+
 if test "$USES_CONTROLS" = 1; then
     cat >> confdefs.h <<\EOF
 #define wxUSE_CONTROLS 1

diff --git a/configure.in b/configure.in
index 39567626971a4e7d743b88ec910101b69802daa1..a3bfcb7fa6cb1c340b2aaece39fd754e1b4b5aa0 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -4513,15 +4513,15 @@ if test "$wxUSE_POPUPWIN" = "yes"; then
         else
             AC_DEFINE(wxUSE_POPUPWIN)
 
-            if test "$wxUSE_TIPWINDOW" = "yes"; then
-                AC_DEFINE(wxUSE_TIPWINDOW)
-            fi
-
             USES_CONTROLS=1
         fi
     fi
 fi
 
+if test "$wxUSE_TIPWINDOW" = "yes"; then
+    AC_DEFINE(wxUSE_TIPWINDOW)
+fi
+
 if test "$USES_CONTROLS" = 1; then
     AC_DEFINE(wxUSE_CONTROLS)
 fi