define wxUSE_ACTIVEX, not (non existent) wxUSE_OLE_ACTIVEX

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

diff --git a/configure b/configure
index ff88144a4b95e72d644f09ed8c7a5fc1e164ae3b..08d853f7d271f5fcdb16979b8a5a56e695b9cda1 100755 (executable)
--- a/configure
+++ b/configure
@@ -52148,7 +52148,7 @@ _ACEOF
 _ACEOF
 
                 cat >>confdefs.h <<\_ACEOF
 _ACEOF
 
                 cat >>confdefs.h <<\_ACEOF

-#define wxUSE_OLE_ACTIVEX 1
+#define wxUSE_ACTIVEX 1

 _ACEOF
 
                 SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS oleauto"
 _ACEOF
 
                 SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS oleauto"

diff --git a/configure.in b/configure.in
index d4915cad14458615a97b825186f0175be96349da..18be81f7f95b2d928307c865fa4d381e3a8252fd 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -6585,7 +6585,7 @@ if test "$USE_WIN32" = 1 -a \( "$wxUSE_DATAOBJ"       = "yes" \
             if test "$wxUSE_OLE" = "yes" ; then
                 AC_DEFINE(wxUSE_OLE)
                 AC_DEFINE(wxUSE_OLE_AUTOMATION)
             if test "$wxUSE_OLE" = "yes" ; then
                 AC_DEFINE(wxUSE_OLE)
                 AC_DEFINE(wxUSE_OLE_AUTOMATION)

-                AC_DEFINE(wxUSE_OLE_ACTIVEX)
+                AC_DEFINE(wxUSE_ACTIVEX)

                 SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS oleauto"
             fi
         fi
                 SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS oleauto"
             fi
         fi