wxActiveX files are low level as there is no wxUniv equivalent for this functionality (closes #10786 as this resulted in link errors when building wxMedia/Univ before)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60595 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-05-12 08:59:57 +00:00
parent aced1133b1
commit fa245b25f2
10 changed files with 170 additions and 185 deletions
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -1571,6 +1571,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <!-- ====================================================================== -->

 <set var="MSW_LOWLEVEL_SRC" hints="files">
+    src/msw/ole/activex.cpp
    src/msw/app.cpp
    src/msw/bitmap.cpp
    src/msw/brush.cpp
@@ -1617,6 +1618,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
    src/msw/window.cpp
 </set>
 <set var="MSW_LOWLEVEL_HDR" hints="files">
+    wx/msw/ole/activex.h
    wx/msw/popupwin.h
    wx/msw/uxtheme.h
    wx/msw/uxthemep.h
@@ -1671,7 +1673,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
    src/msw/nativewin.cpp
    src/msw/notebook.cpp
    src/msw/ole/access.cpp
-    src/msw/ole/activex.cpp
    src/msw/ownerdrw.cpp
    src/msw/radiobox.cpp
    src/msw/radiobut.cpp
@@ -1744,7 +1745,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
    wx/msw/msvcrt.h
    wx/msw/notebook.h
    wx/msw/ole/access.h
-    wx/msw/ole/activex.h
    wx/msw/ole/dataform.h
    wx/msw/ole/dataobj.h
    wx/msw/ole/dataobj2.h
--- a/build/msw/makefile.bcc
+++ b/build/msw/makefile.bcc
@@ -1533,6 +1533,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  \
 !endif
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 ____CORE_SRC_FILENAMES_OBJECTS =  \
+	$(OBJS)\monodll_activex.obj \
 	$(OBJS)\monodll_app.obj \
 	$(OBJS)\monodll_bitmap.obj \
 	$(OBJS)\monodll_brush.obj \
@@ -1616,7 +1617,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_nativewin.obj \
 	$(OBJS)\monodll_notebook.obj \
 	$(OBJS)\monodll_access.obj \
-	$(OBJS)\monodll_activex.obj \
 	$(OBJS)\monodll_ownerdrw.obj \
 	$(OBJS)\monodll_radiobox.obj \
 	$(OBJS)\monodll_radiobut.obj \
@@ -1775,6 +1775,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 !endif
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 ____CORE_SRC_FILENAMES_OBJECTS =  \
+	$(OBJS)\monodll_activex.obj \
 	$(OBJS)\monodll_app.obj \
 	$(OBJS)\monodll_bitmap.obj \
 	$(OBJS)\monodll_brush.obj \
@@ -2216,6 +2217,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
 !endif
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 ____CORE_SRC_FILENAMES_1_OBJECTS =  \
+	$(OBJS)\monolib_activex.obj \
 	$(OBJS)\monolib_app.obj \
 	$(OBJS)\monolib_bitmap.obj \
 	$(OBJS)\monolib_brush.obj \
@@ -2299,7 +2301,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_nativewin.obj \
 	$(OBJS)\monolib_notebook.obj \
 	$(OBJS)\monolib_access.obj \
-	$(OBJS)\monolib_activex.obj \
 	$(OBJS)\monolib_ownerdrw.obj \
 	$(OBJS)\monolib_radiobox.obj \
 	$(OBJS)\monolib_radiobut.obj \
@@ -2458,6 +2459,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 !endif
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 ____CORE_SRC_FILENAMES_1_OBJECTS =  \
+	$(OBJS)\monolib_activex.obj \
 	$(OBJS)\monolib_app.obj \
 	$(OBJS)\monolib_bitmap.obj \
 	$(OBJS)\monolib_brush.obj \
@@ -2804,6 +2806,7 @@ __coredll___depname = \
 !endif
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 ____CORE_SRC_FILENAMES_2_OBJECTS =  \
+	$(OBJS)\coredll_activex.obj \
 	$(OBJS)\coredll_app.obj \
 	$(OBJS)\coredll_bitmap.obj \
 	$(OBJS)\coredll_brush.obj \
@@ -2887,7 +2890,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_nativewin.obj \
 	$(OBJS)\coredll_notebook.obj \
 	$(OBJS)\coredll_access.obj \
-	$(OBJS)\coredll_activex.obj \
 	$(OBJS)\coredll_ownerdrw.obj \
 	$(OBJS)\coredll_radiobox.obj \
 	$(OBJS)\coredll_radiobut.obj \
@@ -3046,6 +3048,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 !endif
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 ____CORE_SRC_FILENAMES_2_OBJECTS =  \
+	$(OBJS)\coredll_activex.obj \
 	$(OBJS)\coredll_app.obj \
 	$(OBJS)\coredll_bitmap.obj \
 	$(OBJS)\coredll_brush.obj \
@@ -3290,6 +3293,7 @@ __corelib___depname = \
 !endif
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 ____CORE_SRC_FILENAMES_3_OBJECTS =  \
+	$(OBJS)\corelib_activex.obj \
 	$(OBJS)\corelib_app.obj \
 	$(OBJS)\corelib_bitmap.obj \
 	$(OBJS)\corelib_brush.obj \
@@ -3373,7 +3377,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_nativewin.obj \
 	$(OBJS)\corelib_notebook.obj \
 	$(OBJS)\corelib_access.obj \
-	$(OBJS)\corelib_activex.obj \
 	$(OBJS)\corelib_ownerdrw.obj \
 	$(OBJS)\corelib_radiobox.obj \
 	$(OBJS)\corelib_radiobut.obj \
@@ -3532,6 +3535,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 !endif
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 ____CORE_SRC_FILENAMES_3_OBJECTS =  \
+	$(OBJS)\corelib_activex.obj \
 	$(OBJS)\corelib_app.obj \
 	$(OBJS)\corelib_bitmap.obj \
 	$(OBJS)\corelib_brush.obj \
@@ -5805,9 +5809,6 @@ $(OBJS)\monodll_nativewin.obj: ..\..\src\msw\nativewin.cpp
 $(OBJS)\monodll_access.obj: ..\..\src\msw\ole\access.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ole\access.cpp

-$(OBJS)\monodll_activex.obj: ..\..\src\msw\ole\activex.cpp
-	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ole\activex.cpp
-
 $(OBJS)\monodll_ownerdrw.obj: ..\..\src\msw\ownerdrw.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ownerdrw.cpp

@@ -6252,6 +6253,11 @@ $(OBJS)\monodll_xml.obj: ..\..\src\xml\xml.cpp
 $(OBJS)\monodll_xtixml.obj: ..\..\src\common\xtixml.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\xtixml.cpp

+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_activex.obj: ..\..\src\msw\ole\activex.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ole\activex.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_app.obj: ..\..\src\msw\app.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\app.cpp
@@ -8034,9 +8040,6 @@ $(OBJS)\monolib_nativewin.obj: ..\..\src\msw\nativewin.cpp
 $(OBJS)\monolib_access.obj: ..\..\src\msw\ole\access.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ole\access.cpp

-$(OBJS)\monolib_activex.obj: ..\..\src\msw\ole\activex.cpp
-	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ole\activex.cpp
-
 $(OBJS)\monolib_ownerdrw.obj: ..\..\src\msw\ownerdrw.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ownerdrw.cpp

@@ -8481,6 +8484,11 @@ $(OBJS)\monolib_xml.obj: ..\..\src\xml\xml.cpp
 $(OBJS)\monolib_xtixml.obj: ..\..\src\common\xtixml.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\xtixml.cpp

+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_activex.obj: ..\..\src\msw\ole\activex.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ole\activex.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_app.obj: ..\..\src\msw\app.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\app.cpp
@@ -10653,9 +10661,6 @@ $(OBJS)\coredll_nativewin.obj: ..\..\src\msw\nativewin.cpp
 $(OBJS)\coredll_access.obj: ..\..\src\msw\ole\access.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ole\access.cpp

-$(OBJS)\coredll_activex.obj: ..\..\src\msw\ole\activex.cpp
-	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ole\activex.cpp
-
 $(OBJS)\coredll_ownerdrw.obj: ..\..\src\msw\ownerdrw.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ownerdrw.cpp

@@ -10737,6 +10742,11 @@ $(OBJS)\coredll_mono.obj: ..\..\src\univ\themes\mono.cpp
 $(OBJS)\coredll_win32.obj: ..\..\src\univ\themes\win32.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\themes\win32.cpp

+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_activex.obj: ..\..\src\msw\ole\activex.cpp
+	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ole\activex.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_app.obj: ..\..\src\msw\app.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\app.cpp
@@ -12032,9 +12042,6 @@ $(OBJS)\corelib_nativewin.obj: ..\..\src\msw\nativewin.cpp
 $(OBJS)\corelib_access.obj: ..\..\src\msw\ole\access.cpp
 	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ole\access.cpp

-$(OBJS)\corelib_activex.obj: ..\..\src\msw\ole\activex.cpp
-	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ole\activex.cpp
-
 $(OBJS)\corelib_ownerdrw.obj: ..\..\src\msw\ownerdrw.cpp
 	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ownerdrw.cpp

@@ -12116,6 +12123,11 @@ $(OBJS)\corelib_mono.obj: ..\..\src\univ\themes\mono.cpp
 $(OBJS)\corelib_win32.obj: ..\..\src\univ\themes\win32.cpp
 	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\themes\win32.cpp

+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_activex.obj: ..\..\src\msw\ole\activex.cpp
+	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ole\activex.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_app.obj: ..\..\src\msw\app.cpp
 	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\app.cpp
--- a/build/msw/makefile.gcc
+++ b/build/msw/makefile.gcc
@@ -1551,6 +1551,7 @@ endif
 ifeq ($(USE_GUI),1)
 ifeq ($(WXUNIV),0)
 ____CORE_SRC_FILENAMES_OBJECTS =  \
+	$(OBJS)\monodll_activex.o \
 	$(OBJS)\monodll_app.o \
 	$(OBJS)\monodll_bitmap.o \
 	$(OBJS)\monodll_brush.o \
@@ -1634,7 +1635,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_nativewin.o \
 	$(OBJS)\monodll_notebook.o \
 	$(OBJS)\monodll_access.o \
-	$(OBJS)\monodll_activex.o \
 	$(OBJS)\monodll_ownerdrw.o \
 	$(OBJS)\monodll_radiobox.o \
 	$(OBJS)\monodll_radiobut.o \
@@ -1795,6 +1795,7 @@ endif
 ifeq ($(USE_GUI),1)
 ifeq ($(WXUNIV),1)
 ____CORE_SRC_FILENAMES_OBJECTS =  \
+	$(OBJS)\monodll_activex.o \
 	$(OBJS)\monodll_app.o \
 	$(OBJS)\monodll_bitmap.o \
 	$(OBJS)\monodll_brush.o \
@@ -2240,6 +2241,7 @@ endif
 ifeq ($(USE_GUI),1)
 ifeq ($(WXUNIV),0)
 ____CORE_SRC_FILENAMES_1_OBJECTS =  \
+	$(OBJS)\monolib_activex.o \
 	$(OBJS)\monolib_app.o \
 	$(OBJS)\monolib_bitmap.o \
 	$(OBJS)\monolib_brush.o \
@@ -2323,7 +2325,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_nativewin.o \
 	$(OBJS)\monolib_notebook.o \
 	$(OBJS)\monolib_access.o \
-	$(OBJS)\monolib_activex.o \
 	$(OBJS)\monolib_ownerdrw.o \
 	$(OBJS)\monolib_radiobox.o \
 	$(OBJS)\monolib_radiobut.o \
@@ -2484,6 +2485,7 @@ endif
 ifeq ($(USE_GUI),1)
 ifeq ($(WXUNIV),1)
 ____CORE_SRC_FILENAMES_1_OBJECTS =  \
+	$(OBJS)\monolib_activex.o \
 	$(OBJS)\monolib_app.o \
 	$(OBJS)\monolib_bitmap.o \
 	$(OBJS)\monolib_brush.o \
@@ -2844,6 +2846,7 @@ endif
 ifeq ($(USE_GUI),1)
 ifeq ($(WXUNIV),0)
 ____CORE_SRC_FILENAMES_2_OBJECTS =  \
+	$(OBJS)\coredll_activex.o \
 	$(OBJS)\coredll_app.o \
 	$(OBJS)\coredll_bitmap.o \
 	$(OBJS)\coredll_brush.o \
@@ -2927,7 +2930,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_nativewin.o \
 	$(OBJS)\coredll_notebook.o \
 	$(OBJS)\coredll_access.o \
-	$(OBJS)\coredll_activex.o \
 	$(OBJS)\coredll_ownerdrw.o \
 	$(OBJS)\coredll_radiobox.o \
 	$(OBJS)\coredll_radiobut.o \
@@ -3088,6 +3090,7 @@ endif
 ifeq ($(USE_GUI),1)
 ifeq ($(WXUNIV),1)
 ____CORE_SRC_FILENAMES_2_OBJECTS =  \
+	$(OBJS)\coredll_activex.o \
 	$(OBJS)\coredll_app.o \
 	$(OBJS)\coredll_bitmap.o \
 	$(OBJS)\coredll_brush.o \
@@ -3338,6 +3341,7 @@ endif
 ifeq ($(USE_GUI),1)
 ifeq ($(WXUNIV),0)
 ____CORE_SRC_FILENAMES_3_OBJECTS =  \
+	$(OBJS)\corelib_activex.o \
 	$(OBJS)\corelib_app.o \
 	$(OBJS)\corelib_bitmap.o \
 	$(OBJS)\corelib_brush.o \
@@ -3421,7 +3425,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_nativewin.o \
 	$(OBJS)\corelib_notebook.o \
 	$(OBJS)\corelib_access.o \
-	$(OBJS)\corelib_activex.o \
 	$(OBJS)\corelib_ownerdrw.o \
 	$(OBJS)\corelib_radiobox.o \
 	$(OBJS)\corelib_radiobut.o \
@@ -3582,6 +3585,7 @@ endif
 ifeq ($(USE_GUI),1)
 ifeq ($(WXUNIV),1)
 ____CORE_SRC_FILENAMES_3_OBJECTS =  \
+	$(OBJS)\corelib_activex.o \
 	$(OBJS)\corelib_app.o \
 	$(OBJS)\corelib_bitmap.o \
 	$(OBJS)\corelib_brush.o \
@@ -5957,9 +5961,6 @@ $(OBJS)\monodll_nativewin.o: ../../src/msw/nativewin.cpp
 $(OBJS)\monodll_access.o: ../../src/msw/ole/access.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<

-$(OBJS)\monodll_activex.o: ../../src/msw/ole/activex.cpp
-	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
-
 $(OBJS)\monodll_ownerdrw.o: ../../src/msw/ownerdrw.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<

@@ -6404,6 +6405,11 @@ $(OBJS)\monodll_xml.o: ../../src/xml/xml.cpp
 $(OBJS)\monodll_xtixml.o: ../../src/common/xtixml.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<

+ifeq ($(USE_GUI),1)
+$(OBJS)\monodll_activex.o: ../../src/msw/ole/activex.cpp
+	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
+endif
+
 ifeq ($(USE_GUI),1)
 $(OBJS)\monodll_app.o: ../../src/msw/app.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
@@ -8298,9 +8304,6 @@ $(OBJS)\monolib_nativewin.o: ../../src/msw/nativewin.cpp
 $(OBJS)\monolib_access.o: ../../src/msw/ole/access.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<

-$(OBJS)\monolib_activex.o: ../../src/msw/ole/activex.cpp
-	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
-
 $(OBJS)\monolib_ownerdrw.o: ../../src/msw/ownerdrw.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<

@@ -8745,6 +8748,11 @@ $(OBJS)\monolib_xml.o: ../../src/xml/xml.cpp
 $(OBJS)\monolib_xtixml.o: ../../src/common/xtixml.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<

+ifeq ($(USE_GUI),1)
+$(OBJS)\monolib_activex.o: ../../src/msw/ole/activex.cpp
+	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
+endif
+
 ifeq ($(USE_GUI),1)
 $(OBJS)\monolib_app.o: ../../src/msw/app.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
@@ -11029,9 +11037,6 @@ $(OBJS)\coredll_nativewin.o: ../../src/msw/nativewin.cpp
 $(OBJS)\coredll_access.o: ../../src/msw/ole/access.cpp
 	$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<

-$(OBJS)\coredll_activex.o: ../../src/msw/ole/activex.cpp
-	$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
-
 $(OBJS)\coredll_ownerdrw.o: ../../src/msw/ownerdrw.cpp
 	$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<

@@ -11113,6 +11118,11 @@ $(OBJS)\coredll_mono.o: ../../src/univ/themes/mono.cpp
 $(OBJS)\coredll_win32.o: ../../src/univ/themes/win32.cpp
 	$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<

+ifeq ($(USE_GUI),1)
+$(OBJS)\coredll_activex.o: ../../src/msw/ole/activex.cpp
+	$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
+endif
+
 ifeq ($(USE_GUI),1)
 $(OBJS)\coredll_app.o: ../../src/msw/app.cpp
 	$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
@@ -12520,9 +12530,6 @@ $(OBJS)\corelib_nativewin.o: ../../src/msw/nativewin.cpp
 $(OBJS)\corelib_access.o: ../../src/msw/ole/access.cpp
 	$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<

-$(OBJS)\corelib_activex.o: ../../src/msw/ole/activex.cpp
-	$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
-
 $(OBJS)\corelib_ownerdrw.o: ../../src/msw/ownerdrw.cpp
 	$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<

@@ -12604,6 +12611,11 @@ $(OBJS)\corelib_mono.o: ../../src/univ/themes/mono.cpp
 $(OBJS)\corelib_win32.o: ../../src/univ/themes/win32.cpp
 	$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<

+ifeq ($(USE_GUI),1)
+$(OBJS)\corelib_activex.o: ../../src/msw/ole/activex.cpp
+	$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
+endif
+
 ifeq ($(USE_GUI),1)
 $(OBJS)\corelib_app.o: ../../src/msw/app.cpp
 	$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
--- a/build/msw/makefile.vc
+++ b/build/msw/makefile.vc
@@ -1713,6 +1713,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  \
 !endif
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 ____CORE_SRC_FILENAMES_OBJECTS =  \
+	$(OBJS)\monodll_activex.obj \
 	$(OBJS)\monodll_app.obj \
 	$(OBJS)\monodll_bitmap.obj \
 	$(OBJS)\monodll_brush.obj \
@@ -1796,7 +1797,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_nativewin.obj \
 	$(OBJS)\monodll_notebook.obj \
 	$(OBJS)\monodll_access.obj \
-	$(OBJS)\monodll_activex.obj \
 	$(OBJS)\monodll_ownerdrw.obj \
 	$(OBJS)\monodll_radiobox.obj \
 	$(OBJS)\monodll_radiobut.obj \
@@ -1955,6 +1955,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 !endif
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 ____CORE_SRC_FILENAMES_OBJECTS =  \
+	$(OBJS)\monodll_activex.obj \
 	$(OBJS)\monodll_app.obj \
 	$(OBJS)\monodll_bitmap.obj \
 	$(OBJS)\monodll_brush.obj \
@@ -2402,6 +2403,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
 !endif
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 ____CORE_SRC_FILENAMES_1_OBJECTS =  \
+	$(OBJS)\monolib_activex.obj \
 	$(OBJS)\monolib_app.obj \
 	$(OBJS)\monolib_bitmap.obj \
 	$(OBJS)\monolib_brush.obj \
@@ -2485,7 +2487,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_nativewin.obj \
 	$(OBJS)\monolib_notebook.obj \
 	$(OBJS)\monolib_access.obj \
-	$(OBJS)\monolib_activex.obj \
 	$(OBJS)\monolib_ownerdrw.obj \
 	$(OBJS)\monolib_radiobox.obj \
 	$(OBJS)\monolib_radiobut.obj \
@@ -2644,6 +2645,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 !endif
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 ____CORE_SRC_FILENAMES_1_OBJECTS =  \
+	$(OBJS)\monolib_activex.obj \
 	$(OBJS)\monolib_app.obj \
 	$(OBJS)\monolib_bitmap.obj \
 	$(OBJS)\monolib_brush.obj \
@@ -3020,6 +3022,7 @@ __RUNTIME_LIBS_181 = $(__THREADSFLAG)
 !endif
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 ____CORE_SRC_FILENAMES_2_OBJECTS =  \
+	$(OBJS)\coredll_activex.obj \
 	$(OBJS)\coredll_app.obj \
 	$(OBJS)\coredll_bitmap.obj \
 	$(OBJS)\coredll_brush.obj \
@@ -3103,7 +3106,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_nativewin.obj \
 	$(OBJS)\coredll_notebook.obj \
 	$(OBJS)\coredll_access.obj \
-	$(OBJS)\coredll_activex.obj \
 	$(OBJS)\coredll_ownerdrw.obj \
 	$(OBJS)\coredll_radiobox.obj \
 	$(OBJS)\coredll_radiobut.obj \
@@ -3262,6 +3264,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 !endif
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 ____CORE_SRC_FILENAMES_2_OBJECTS =  \
+	$(OBJS)\coredll_activex.obj \
 	$(OBJS)\coredll_app.obj \
 	$(OBJS)\coredll_bitmap.obj \
 	$(OBJS)\coredll_brush.obj \
@@ -3512,6 +3515,7 @@ __RUNTIME_LIBS_194 = $(__THREADSFLAG)
 !endif
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 ____CORE_SRC_FILENAMES_3_OBJECTS =  \
+	$(OBJS)\corelib_activex.obj \
 	$(OBJS)\corelib_app.obj \
 	$(OBJS)\corelib_bitmap.obj \
 	$(OBJS)\corelib_brush.obj \
@@ -3595,7 +3599,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_nativewin.obj \
 	$(OBJS)\corelib_notebook.obj \
 	$(OBJS)\corelib_access.obj \
-	$(OBJS)\corelib_activex.obj \
 	$(OBJS)\corelib_ownerdrw.obj \
 	$(OBJS)\corelib_radiobox.obj \
 	$(OBJS)\corelib_radiobut.obj \
@@ -3754,6 +3757,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 !endif
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 ____CORE_SRC_FILENAMES_3_OBJECTS =  \
+	$(OBJS)\corelib_activex.obj \
 	$(OBJS)\corelib_app.obj \
 	$(OBJS)\corelib_bitmap.obj \
 	$(OBJS)\corelib_brush.obj \
@@ -6151,9 +6155,6 @@ $(OBJS)\monodll_nativewin.obj: ..\..\src\msw\nativewin.cpp
 $(OBJS)\monodll_access.obj: ..\..\src\msw\ole\access.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ole\access.cpp

-$(OBJS)\monodll_activex.obj: ..\..\src\msw\ole\activex.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ole\activex.cpp
-
 $(OBJS)\monodll_ownerdrw.obj: ..\..\src\msw\ownerdrw.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ownerdrw.cpp

@@ -6598,6 +6599,11 @@ $(OBJS)\monodll_xml.obj: ..\..\src\xml\xml.cpp
 $(OBJS)\monodll_xtixml.obj: ..\..\src\common\xtixml.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\xtixml.cpp

+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_activex.obj: ..\..\src\msw\ole\activex.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ole\activex.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_app.obj: ..\..\src\msw\app.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\app.cpp
@@ -8380,9 +8386,6 @@ $(OBJS)\monolib_nativewin.obj: ..\..\src\msw\nativewin.cpp
 $(OBJS)\monolib_access.obj: ..\..\src\msw\ole\access.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ole\access.cpp

-$(OBJS)\monolib_activex.obj: ..\..\src\msw\ole\activex.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ole\activex.cpp
-
 $(OBJS)\monolib_ownerdrw.obj: ..\..\src\msw\ownerdrw.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ownerdrw.cpp

@@ -8827,6 +8830,11 @@ $(OBJS)\monolib_xml.obj: ..\..\src\xml\xml.cpp
 $(OBJS)\monolib_xtixml.obj: ..\..\src\common\xtixml.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\xtixml.cpp

+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_activex.obj: ..\..\src\msw\ole\activex.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ole\activex.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_app.obj: ..\..\src\msw\app.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\app.cpp
@@ -10999,9 +11007,6 @@ $(OBJS)\coredll_nativewin.obj: ..\..\src\msw\nativewin.cpp
 $(OBJS)\coredll_access.obj: ..\..\src\msw\ole\access.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ole\access.cpp

-$(OBJS)\coredll_activex.obj: ..\..\src\msw\ole\activex.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ole\activex.cpp
-
 $(OBJS)\coredll_ownerdrw.obj: ..\..\src\msw\ownerdrw.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ownerdrw.cpp

@@ -11083,6 +11088,11 @@ $(OBJS)\coredll_mono.obj: ..\..\src\univ\themes\mono.cpp
 $(OBJS)\coredll_win32.obj: ..\..\src\univ\themes\win32.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\themes\win32.cpp

+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_activex.obj: ..\..\src\msw\ole\activex.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ole\activex.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_app.obj: ..\..\src\msw\app.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\app.cpp
@@ -12378,9 +12388,6 @@ $(OBJS)\corelib_nativewin.obj: ..\..\src\msw\nativewin.cpp
 $(OBJS)\corelib_access.obj: ..\..\src\msw\ole\access.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ole\access.cpp

-$(OBJS)\corelib_activex.obj: ..\..\src\msw\ole\activex.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ole\activex.cpp
-
 $(OBJS)\corelib_ownerdrw.obj: ..\..\src\msw\ownerdrw.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ownerdrw.cpp

@@ -12462,6 +12469,11 @@ $(OBJS)\corelib_mono.obj: ..\..\src\univ\themes\mono.cpp
 $(OBJS)\corelib_win32.obj: ..\..\src\univ\themes\win32.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\themes\win32.cpp

+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_activex.obj: ..\..\src\msw\ole\activex.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ole\activex.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_app.obj: ..\..\src\msw\app.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\app.cpp
--- a/build/msw/makefile.wat
+++ b/build/msw/makefile.wat
@@ -224,6 +224,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =
 !ifeq USE_GUI 1
 !ifeq WXUNIV 0
 ____CORE_SRC_FILENAMES_OBJECTS =  &
+	$(OBJS)\monodll_activex.obj &
 	$(OBJS)\monodll_app.obj &
 	$(OBJS)\monodll_bitmap.obj &
 	$(OBJS)\monodll_brush.obj &
@@ -307,7 +308,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
 	$(OBJS)\monodll_nativewin.obj &
 	$(OBJS)\monodll_notebook.obj &
 	$(OBJS)\monodll_access.obj &
-	$(OBJS)\monodll_activex.obj &
 	$(OBJS)\monodll_ownerdrw.obj &
 	$(OBJS)\monodll_radiobox.obj &
 	$(OBJS)\monodll_radiobut.obj &
@@ -468,6 +468,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
 !ifeq USE_GUI 1
 !ifeq WXUNIV 1
 ____CORE_SRC_FILENAMES_OBJECTS =  &
+	$(OBJS)\monodll_activex.obj &
 	$(OBJS)\monodll_app.obj &
 	$(OBJS)\monodll_bitmap.obj &
 	$(OBJS)\monodll_brush.obj &
@@ -918,6 +919,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =
 !ifeq USE_GUI 1
 !ifeq WXUNIV 0
 ____CORE_SRC_FILENAMES_1_OBJECTS =  &
+	$(OBJS)\monolib_activex.obj &
 	$(OBJS)\monolib_app.obj &
 	$(OBJS)\monolib_bitmap.obj &
 	$(OBJS)\monolib_brush.obj &
@@ -1001,7 +1003,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
 	$(OBJS)\monolib_nativewin.obj &
 	$(OBJS)\monolib_notebook.obj &
 	$(OBJS)\monolib_access.obj &
-	$(OBJS)\monolib_activex.obj &
 	$(OBJS)\monolib_ownerdrw.obj &
 	$(OBJS)\monolib_radiobox.obj &
 	$(OBJS)\monolib_radiobut.obj &
@@ -1162,6 +1163,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
 !ifeq USE_GUI 1
 !ifeq WXUNIV 1
 ____CORE_SRC_FILENAMES_1_OBJECTS =  &
+	$(OBJS)\monolib_activex.obj &
 	$(OBJS)\monolib_app.obj &
 	$(OBJS)\monolib_bitmap.obj &
 	$(OBJS)\monolib_brush.obj &
@@ -1533,6 +1535,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =
 !ifeq USE_GUI 1
 !ifeq WXUNIV 0
 ____CORE_SRC_FILENAMES_2_OBJECTS =  &
+	$(OBJS)\coredll_activex.obj &
 	$(OBJS)\coredll_app.obj &
 	$(OBJS)\coredll_bitmap.obj &
 	$(OBJS)\coredll_brush.obj &
@@ -1616,7 +1619,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
 	$(OBJS)\coredll_nativewin.obj &
 	$(OBJS)\coredll_notebook.obj &
 	$(OBJS)\coredll_access.obj &
-	$(OBJS)\coredll_activex.obj &
 	$(OBJS)\coredll_ownerdrw.obj &
 	$(OBJS)\coredll_radiobox.obj &
 	$(OBJS)\coredll_radiobut.obj &
@@ -1777,6 +1779,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
 !ifeq USE_GUI 1
 !ifeq WXUNIV 1
 ____CORE_SRC_FILENAMES_2_OBJECTS =  &
+	$(OBJS)\coredll_activex.obj &
 	$(OBJS)\coredll_app.obj &
 	$(OBJS)\coredll_bitmap.obj &
 	$(OBJS)\coredll_brush.obj &
@@ -2029,6 +2032,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =
 !ifeq USE_GUI 1
 !ifeq WXUNIV 0
 ____CORE_SRC_FILENAMES_3_OBJECTS =  &
+	$(OBJS)\corelib_activex.obj &
 	$(OBJS)\corelib_app.obj &
 	$(OBJS)\corelib_bitmap.obj &
 	$(OBJS)\corelib_brush.obj &
@@ -2112,7 +2116,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
 	$(OBJS)\corelib_nativewin.obj &
 	$(OBJS)\corelib_notebook.obj &
 	$(OBJS)\corelib_access.obj &
-	$(OBJS)\corelib_activex.obj &
 	$(OBJS)\corelib_ownerdrw.obj &
 	$(OBJS)\corelib_radiobox.obj &
 	$(OBJS)\corelib_radiobut.obj &
@@ -2273,6 +2276,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
 !ifeq USE_GUI 1
 !ifeq WXUNIV 1
 ____CORE_SRC_FILENAMES_3_OBJECTS =  &
+	$(OBJS)\corelib_activex.obj &
 	$(OBJS)\corelib_app.obj &
 	$(OBJS)\corelib_bitmap.obj &
 	$(OBJS)\corelib_brush.obj &
@@ -6206,9 +6210,6 @@ $(OBJS)\monodll_nativewin.obj :  .AUTODEPEND ..\..\src\msw\nativewin.cpp
 $(OBJS)\monodll_access.obj :  .AUTODEPEND ..\..\src\msw\ole\access.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<

-$(OBJS)\monodll_activex.obj :  .AUTODEPEND ..\..\src\msw\ole\activex.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
 $(OBJS)\monodll_ownerdrw.obj :  .AUTODEPEND ..\..\src\msw\ownerdrw.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<

@@ -6653,6 +6654,11 @@ $(OBJS)\monodll_xml.obj :  .AUTODEPEND ..\..\src\xml\xml.cpp
 $(OBJS)\monodll_xtixml.obj :  .AUTODEPEND ..\..\src\common\xtixml.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<

+!ifeq USE_GUI 1
+$(OBJS)\monodll_activex.obj :  .AUTODEPEND ..\..\src\msw\ole\activex.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+!endif
+
 !ifeq USE_GUI 1
 $(OBJS)\monodll_app.obj :  .AUTODEPEND ..\..\src\msw\app.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
@@ -8547,9 +8553,6 @@ $(OBJS)\monolib_nativewin.obj :  .AUTODEPEND ..\..\src\msw\nativewin.cpp
 $(OBJS)\monolib_access.obj :  .AUTODEPEND ..\..\src\msw\ole\access.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<

-$(OBJS)\monolib_activex.obj :  .AUTODEPEND ..\..\src\msw\ole\activex.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
 $(OBJS)\monolib_ownerdrw.obj :  .AUTODEPEND ..\..\src\msw\ownerdrw.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<

@@ -8994,6 +8997,11 @@ $(OBJS)\monolib_xml.obj :  .AUTODEPEND ..\..\src\xml\xml.cpp
 $(OBJS)\monolib_xtixml.obj :  .AUTODEPEND ..\..\src\common\xtixml.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<

+!ifeq USE_GUI 1
+$(OBJS)\monolib_activex.obj :  .AUTODEPEND ..\..\src\msw\ole\activex.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+!endif
+
 !ifeq USE_GUI 1
 $(OBJS)\monolib_app.obj :  .AUTODEPEND ..\..\src\msw\app.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
@@ -11278,9 +11286,6 @@ $(OBJS)\coredll_nativewin.obj :  .AUTODEPEND ..\..\src\msw\nativewin.cpp
 $(OBJS)\coredll_access.obj :  .AUTODEPEND ..\..\src\msw\ole\access.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<

-$(OBJS)\coredll_activex.obj :  .AUTODEPEND ..\..\src\msw\ole\activex.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
 $(OBJS)\coredll_ownerdrw.obj :  .AUTODEPEND ..\..\src\msw\ownerdrw.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<

@@ -11362,6 +11367,11 @@ $(OBJS)\coredll_mono.obj :  .AUTODEPEND ..\..\src\univ\themes\mono.cpp
 $(OBJS)\coredll_win32.obj :  .AUTODEPEND ..\..\src\univ\themes\win32.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<

+!ifeq USE_GUI 1
+$(OBJS)\coredll_activex.obj :  .AUTODEPEND ..\..\src\msw\ole\activex.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
+!endif
+
 !ifeq USE_GUI 1
 $(OBJS)\coredll_app.obj :  .AUTODEPEND ..\..\src\msw\app.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
@@ -12769,9 +12779,6 @@ $(OBJS)\corelib_nativewin.obj :  .AUTODEPEND ..\..\src\msw\nativewin.cpp
 $(OBJS)\corelib_access.obj :  .AUTODEPEND ..\..\src\msw\ole\access.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<

-$(OBJS)\corelib_activex.obj :  .AUTODEPEND ..\..\src\msw\ole\activex.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
 $(OBJS)\corelib_ownerdrw.obj :  .AUTODEPEND ..\..\src\msw\ownerdrw.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<

@@ -12853,6 +12860,11 @@ $(OBJS)\corelib_mono.obj :  .AUTODEPEND ..\..\src\univ\themes\mono.cpp
 $(OBJS)\corelib_win32.obj :  .AUTODEPEND ..\..\src\univ\themes\win32.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<

+!ifeq USE_GUI 1
+$(OBJS)\corelib_activex.obj :  .AUTODEPEND ..\..\src\msw\ole\activex.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
+!endif
+
 !ifeq USE_GUI 1
 $(OBJS)\corelib_app.obj :  .AUTODEPEND ..\..\src\msw\app.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
--- a/build/msw/wx_core.dsp
+++ b/build/msw/wx_core.dsp
@@ -757,37 +757,6 @@ SOURCE=..\..\src\msw\ole\access.cpp
 # Begin Source File

 SOURCE=..\..\src\msw\ole\activex.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug"
-
-
-!ENDIF
-
 # End Source File
 # Begin Source File

--- a/build/msw/wx_vc7_core.vcproj
+++ b/build/msw/wx_vc7_core.vcproj
@@ -959,18 +959,6 @@
 			</File>
 			<File
 				RelativePath="..\..\src\msw\ole\activex.cpp">
-				<FileConfiguration
-					Name="Universal Debug|Win32"
-					ExcludedFromBuild="TRUE"/>
-				<FileConfiguration
-					Name="Universal Release|Win32"
-					ExcludedFromBuild="TRUE"/>
-				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
-					ExcludedFromBuild="TRUE"/>
-				<FileConfiguration
-					Name="DLL Universal Release|Win32"
-					ExcludedFromBuild="TRUE"/>
 			</File>
 			<File
 				RelativePath="..\..\src\msw\app.cpp">
--- a/build/msw/wx_vc8_core.vcproj
+++ b/build/msw/wx_vc8_core.vcproj
@@ -1314,22 +1314,6 @@
 			<File
 				RelativePath="..\..\src\msw\ole\activex.cpp"
 				>
-				<FileConfiguration
-					Name="Universal Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="Universal Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="DLL Universal Release|Win32"
-					ExcludedFromBuild="true"
-				/>
 			</File>
 			<File
 				RelativePath="..\..\src\msw\app.cpp"
--- a/build/msw/wx_vc9_core.vcproj
+++ b/build/msw/wx_vc9_core.vcproj
@@ -1310,22 +1310,6 @@
 			<File
 				RelativePath="..\..\src\msw\ole\activex.cpp"
 				>
-				<FileConfiguration
-					Name="Universal Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="Universal Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="DLL Universal Release|Win32"
-					ExcludedFromBuild="true"
-				/>
 			</File>
 			<File
 				RelativePath="..\..\src\msw\app.cpp"