Add XRC handler for wxActivityIndicator control.

The only attribute for this control is a boolean "running" which can be set to start the indicator on load. Update the schema, documentation and the XRC sample.
2015-03-18 16:10:31 +01:00
parent 3f84cb17ca
commit d2ddb2c7c0
22 changed files with 409 additions and 111 deletions
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -3469,6 +3469,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <!-- ====================================================================== -->

 <set var="XRC_SRC" hints="files">
+    src/xrc/xh_activityindicator.cpp
    src/xrc/xh_animatctrl.cpp
    src/xrc/xh_bannerwindow.cpp
    src/xrc/xh_bmp.cpp
@@ -3537,6 +3538,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
    src/xrc/xmlrsall.cpp
 </set>
 <set var="XRC_HDR" hints="files">
+    wx/xrc/xh_activityindicator.h
    wx/xrc/xh_all.h
    wx/xrc/xh_animatctrl.h
    wx/xrc/xh_bannerwindow.h
--- a/build/files
+++ b/build/files
@@ -2910,6 +2910,7 @@ WEBVIEW_CMN_HDR =
 # wxXRC

 XRC_SRC =
+    src/xrc/xh_activityindicator.cpp
    src/xrc/xh_animatctrl.cpp
    src/xrc/xh_bannerwindow.cpp
    src/xrc/xh_bmp.cpp
@@ -2977,6 +2978,7 @@ XRC_SRC =
    src/xrc/xmladv.cpp
    src/xrc/xmlrsall.cpp
 XRC_HDR =
+    wx/xrc/xh_activityindicator.h
    wx/xrc/xh_all.h
    wx/xrc/xh_animatctrl.h
    wx/xrc/xh_bannerwindow.h
--- a/build/msw/makefile.bcc
+++ b/build/msw/makefile.bcc
@@ -1183,6 +1183,7 @@ XRCDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
 	-DWXMAKINGDLL_XRC -Hu -H=$(OBJS)\wxprec_xrcdll.csm $(CPPFLAGS) $(CXXFLAGS)
 XRCDLL_OBJECTS =  \
 	$(OBJS)\xrcdll_dummy.obj \
+	$(OBJS)\xrcdll_xh_activityindicator.obj \
 	$(OBJS)\xrcdll_xh_animatctrl.obj \
 	$(OBJS)\xrcdll_xh_bannerwindow.obj \
 	$(OBJS)\xrcdll_xh_bmp.obj \
@@ -1259,6 +1260,7 @@ XRCLIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
 	-H=$(OBJS)\wxprec_xrclib.csm $(CPPFLAGS) $(CXXFLAGS)
 XRCLIB_OBJECTS =  \
 	$(OBJS)\xrclib_dummy.obj \
+	$(OBJS)\xrclib_xh_activityindicator.obj \
 	$(OBJS)\xrclib_xh_animatctrl.obj \
 	$(OBJS)\xrclib_xh_bannerwindow.obj \
 	$(OBJS)\xrclib_xh_bmp.obj \
@@ -1646,6 +1648,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_webviewfshandler.obj \
 	$(OBJS)\monodll_debugrpt.obj \
 	$(OBJS)\monodll_dbgrptg.obj \
+	$(OBJS)\monodll_xh_activityindicator.obj \
 	$(OBJS)\monodll_xh_animatctrl.obj \
 	$(OBJS)\monodll_xh_bannerwindow.obj \
 	$(OBJS)\monodll_xh_bmp.obj \
@@ -2367,7 +2370,8 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_datectrl.obj \
 	$(OBJS)\monodll_datetimectrl.obj \
 	$(OBJS)\monodll_hyperlink.obj \
-	$(OBJS)\monodll_timectrl.obj
+	$(OBJS)\monodll_timectrl.obj \
+	$(OBJS)\monodll_activityindicator.obj
 !endif
 !if "$(WXUNIV)" == "1"
 ____ADVANCED_SRC_FILENAMES_OBJECTS =  \
@@ -2461,6 +2465,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_webviewfshandler.obj \
 	$(OBJS)\monolib_debugrpt.obj \
 	$(OBJS)\monolib_dbgrptg.obj \
+	$(OBJS)\monolib_xh_activityindicator.obj \
 	$(OBJS)\monolib_xh_animatctrl.obj \
 	$(OBJS)\monolib_xh_bannerwindow.obj \
 	$(OBJS)\monolib_xh_bmp.obj \
@@ -3182,7 +3187,8 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_datectrl.obj \
 	$(OBJS)\monolib_datetimectrl.obj \
 	$(OBJS)\monolib_hyperlink.obj \
-	$(OBJS)\monolib_timectrl.obj
+	$(OBJS)\monolib_timectrl.obj \
+	$(OBJS)\monolib_activityindicator.obj
 !endif
 !if "$(WXUNIV)" == "1"
 ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
@@ -4448,7 +4454,8 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\advdll_datectrl.obj \
 	$(OBJS)\advdll_datetimectrl.obj \
 	$(OBJS)\advdll_hyperlink.obj \
-	$(OBJS)\advdll_timectrl.obj
+	$(OBJS)\advdll_timectrl.obj \
+	$(OBJS)\advdll_activityindicator.obj
 !endif
 !if "$(WXUNIV)" == "1"
 ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
@@ -4550,7 +4557,8 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\advlib_datectrl.obj \
 	$(OBJS)\advlib_datetimectrl.obj \
 	$(OBJS)\advlib_hyperlink.obj \
-	$(OBJS)\advlib_timectrl.obj
+	$(OBJS)\advlib_timectrl.obj \
+	$(OBJS)\advlib_activityindicator.obj
 !endif
 !if "$(WXUNIV)" == "1"
 ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
@@ -6992,6 +7000,9 @@ $(OBJS)\monodll_hyperlink.obj: ..\..\src\msw\hyperlink.cpp
 $(OBJS)\monodll_timectrl.obj: ..\..\src\msw\timectrl.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\timectrl.cpp

+$(OBJS)\monodll_activityindicator.obj: ..\..\src\generic\activityindicator.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\activityindicator.cpp
+
 $(OBJS)\monodll_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\mediactrlcmn.cpp

@@ -7100,6 +7111,9 @@ $(OBJS)\monodll_debugrpt.obj: ..\..\src\common\debugrpt.cpp
 $(OBJS)\monodll_dbgrptg.obj: ..\..\src\generic\dbgrptg.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\dbgrptg.cpp

+$(OBJS)\monodll_xh_activityindicator.obj: ..\..\src\xrc\xh_activityindicator.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_activityindicator.cpp
+
 $(OBJS)\monodll_xh_animatctrl.obj: ..\..\src\xrc\xh_animatctrl.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_animatctrl.cpp

@@ -9482,6 +9496,9 @@ $(OBJS)\monolib_hyperlink.obj: ..\..\src\msw\hyperlink.cpp
 $(OBJS)\monolib_timectrl.obj: ..\..\src\msw\timectrl.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\timectrl.cpp

+$(OBJS)\monolib_activityindicator.obj: ..\..\src\generic\activityindicator.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\activityindicator.cpp
+
 $(OBJS)\monolib_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\mediactrlcmn.cpp

@@ -9590,6 +9607,9 @@ $(OBJS)\monolib_debugrpt.obj: ..\..\src\common\debugrpt.cpp
 $(OBJS)\monolib_dbgrptg.obj: ..\..\src\generic\dbgrptg.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\dbgrptg.cpp

+$(OBJS)\monolib_xh_activityindicator.obj: ..\..\src\xrc\xh_activityindicator.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_activityindicator.cpp
+
 $(OBJS)\monolib_xh_animatctrl.obj: ..\..\src\xrc\xh_animatctrl.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_animatctrl.cpp

@@ -14972,6 +14992,9 @@ $(OBJS)\advdll_hyperlink.obj: ..\..\src\msw\hyperlink.cpp
 $(OBJS)\advdll_timectrl.obj: ..\..\src\msw\timectrl.cpp
 	$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\timectrl.cpp

+$(OBJS)\advdll_activityindicator.obj: ..\..\src\generic\activityindicator.cpp
+	$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\activityindicator.cpp
+
 $(OBJS)\advdll_animatecmn.obj: ..\..\src\common\animatecmn.cpp
 	$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\animatecmn.cpp

@@ -15125,6 +15148,9 @@ $(OBJS)\advlib_hyperlink.obj: ..\..\src\msw\hyperlink.cpp
 $(OBJS)\advlib_timectrl.obj: ..\..\src\msw\timectrl.cpp
 	$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\timectrl.cpp

+$(OBJS)\advlib_activityindicator.obj: ..\..\src\generic\activityindicator.cpp
+	$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\activityindicator.cpp
+
 $(OBJS)\advlib_animatecmn.obj: ..\..\src\common\animatecmn.cpp
 	$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\animatecmn.cpp

@@ -15530,6 +15556,9 @@ $(OBJS)\xrcdll_dummy.obj: ..\..\src\common\dummy.cpp
 $(OBJS)\xrcdll_version.res: ..\..\src\msw\version.rc
 	brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) -i$(SETUPHDIR) -i..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG) -i$(BCCDIR)\include\windows\sdk  -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_XRC ..\..\src\msw\version.rc

+$(OBJS)\xrcdll_xh_activityindicator.obj: ..\..\src\xrc\xh_activityindicator.cpp
+	$(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_activityindicator.cpp
+
 $(OBJS)\xrcdll_xh_animatctrl.obj: ..\..\src\xrc\xh_animatctrl.cpp
 	$(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_animatctrl.cpp

@@ -15731,6 +15760,9 @@ $(OBJS)\xrcdll_xmlrsall.obj: ..\..\src\xrc\xmlrsall.cpp
 $(OBJS)\xrclib_dummy.obj: ..\..\src\common\dummy.cpp
 	$(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) -H ..\..\src\common\dummy.cpp

+$(OBJS)\xrclib_xh_activityindicator.obj: ..\..\src\xrc\xh_activityindicator.cpp
+	$(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_activityindicator.cpp
+
 $(OBJS)\xrclib_xh_animatctrl.obj: ..\..\src\xrc\xh_animatctrl.cpp
 	$(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_animatctrl.cpp

--- a/build/msw/makefile.gcc
+++ b/build/msw/makefile.gcc
@@ -1187,6 +1187,7 @@ XRCDLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS)
 XRCDLL_OBJECTS =  \
 	$(OBJS)\xrcdll_dummy.o \
 	$(OBJS)\xrcdll_version_rc.o \
+	$(OBJS)\xrcdll_xh_activityindicator.o \
 	$(OBJS)\xrcdll_xh_animatctrl.o \
 	$(OBJS)\xrcdll_xh_bannerwindow.o \
 	$(OBJS)\xrcdll_xh_bmp.o \
@@ -1263,6 +1264,7 @@ XRCLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS)
 	-Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
 XRCLIB_OBJECTS =  \
 	$(OBJS)\xrclib_dummy.o \
+	$(OBJS)\xrclib_xh_activityindicator.o \
 	$(OBJS)\xrclib_xh_animatctrl.o \
 	$(OBJS)\xrclib_xh_bannerwindow.o \
 	$(OBJS)\xrclib_xh_bmp.o \
@@ -1664,6 +1666,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_webviewfshandler.o \
 	$(OBJS)\monodll_debugrpt.o \
 	$(OBJS)\monodll_dbgrptg.o \
+	$(OBJS)\monodll_xh_activityindicator.o \
 	$(OBJS)\monodll_xh_animatctrl.o \
 	$(OBJS)\monodll_xh_bannerwindow.o \
 	$(OBJS)\monodll_xh_bmp.o \
@@ -2389,7 +2392,8 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_datectrl.o \
 	$(OBJS)\monodll_datetimectrl.o \
 	$(OBJS)\monodll_hyperlink.o \
-	$(OBJS)\monodll_timectrl.o
+	$(OBJS)\monodll_timectrl.o \
+	$(OBJS)\monodll_activityindicator.o
 endif
 ifeq ($(WXUNIV),1)
 ____ADVANCED_SRC_FILENAMES_OBJECTS =  \
@@ -2485,6 +2489,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_webviewfshandler.o \
 	$(OBJS)\monolib_debugrpt.o \
 	$(OBJS)\monolib_dbgrptg.o \
+	$(OBJS)\monolib_xh_activityindicator.o \
 	$(OBJS)\monolib_xh_animatctrl.o \
 	$(OBJS)\monolib_xh_bannerwindow.o \
 	$(OBJS)\monolib_xh_bmp.o \
@@ -3210,7 +3215,8 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_datectrl.o \
 	$(OBJS)\monolib_datetimectrl.o \
 	$(OBJS)\monolib_hyperlink.o \
-	$(OBJS)\monolib_timectrl.o
+	$(OBJS)\monolib_timectrl.o \
+	$(OBJS)\monolib_activityindicator.o
 endif
 ifeq ($(WXUNIV),1)
 ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
@@ -4504,7 +4510,8 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\advdll_datectrl.o \
 	$(OBJS)\advdll_datetimectrl.o \
 	$(OBJS)\advdll_hyperlink.o \
-	$(OBJS)\advdll_timectrl.o
+	$(OBJS)\advdll_timectrl.o \
+	$(OBJS)\advdll_activityindicator.o
 endif
 ifeq ($(WXUNIV),1)
 ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
@@ -4610,7 +4617,8 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\advlib_datectrl.o \
 	$(OBJS)\advlib_datetimectrl.o \
 	$(OBJS)\advlib_hyperlink.o \
-	$(OBJS)\advlib_timectrl.o
+	$(OBJS)\advlib_timectrl.o \
+	$(OBJS)\advlib_activityindicator.o
 endif
 ifeq ($(WXUNIV),1)
 ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
@@ -7167,6 +7175,9 @@ $(OBJS)\monodll_hyperlink.o: ../../src/msw/hyperlink.cpp
 $(OBJS)\monodll_timectrl.o: ../../src/msw/timectrl.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<

+$(OBJS)\monodll_activityindicator.o: ../../src/generic/activityindicator.cpp
+	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\monodll_mediactrlcmn.o: ../../src/common/mediactrlcmn.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<

@@ -7275,6 +7286,9 @@ $(OBJS)\monodll_debugrpt.o: ../../src/common/debugrpt.cpp
 $(OBJS)\monodll_dbgrptg.o: ../../src/generic/dbgrptg.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<

+$(OBJS)\monodll_xh_activityindicator.o: ../../src/xrc/xh_activityindicator.cpp
+	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\monodll_xh_animatctrl.o: ../../src/xrc/xh_animatctrl.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<

@@ -9657,6 +9671,9 @@ $(OBJS)\monolib_hyperlink.o: ../../src/msw/hyperlink.cpp
 $(OBJS)\monolib_timectrl.o: ../../src/msw/timectrl.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<

+$(OBJS)\monolib_activityindicator.o: ../../src/generic/activityindicator.cpp
+	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\monolib_mediactrlcmn.o: ../../src/common/mediactrlcmn.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<

@@ -9765,6 +9782,9 @@ $(OBJS)\monolib_debugrpt.o: ../../src/common/debugrpt.cpp
 $(OBJS)\monolib_dbgrptg.o: ../../src/generic/dbgrptg.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<

+$(OBJS)\monolib_xh_activityindicator.o: ../../src/xrc/xh_activityindicator.cpp
+	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\monolib_xh_animatctrl.o: ../../src/xrc/xh_animatctrl.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<

@@ -15147,6 +15167,9 @@ $(OBJS)\advdll_hyperlink.o: ../../src/msw/hyperlink.cpp
 $(OBJS)\advdll_timectrl.o: ../../src/msw/timectrl.cpp
 	$(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<

+$(OBJS)\advdll_activityindicator.o: ../../src/generic/activityindicator.cpp
+	$(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\advdll_animatecmn.o: ../../src/common/animatecmn.cpp
 	$(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<

@@ -15300,6 +15323,9 @@ $(OBJS)\advlib_hyperlink.o: ../../src/msw/hyperlink.cpp
 $(OBJS)\advlib_timectrl.o: ../../src/msw/timectrl.cpp
 	$(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<

+$(OBJS)\advlib_activityindicator.o: ../../src/generic/activityindicator.cpp
+	$(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\advlib_animatecmn.o: ../../src/common/animatecmn.cpp
 	$(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<

@@ -15705,6 +15731,9 @@ $(OBJS)\xrcdll_dummy.o: ../../src/common/dummy.cpp
 $(OBJS)\xrcdll_version_rc.o: ../../src/msw/version.rc
 	$(WINDRES) -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) --include-dir $(SETUPHDIR) --include-dir ../../include $(__CAIRO_INCLUDEDIR_p) --define WXBUILDING --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG)  --include-dir ../../src/tiff/libtiff --include-dir ../../src/jpeg --include-dir ../../src/png --include-dir ../../src/zlib --include-dir ../../src/regex --include-dir ../../src/expat/lib --define WXUSINGDLL --define WXMAKINGDLL_XRC

+$(OBJS)\xrcdll_xh_activityindicator.o: ../../src/xrc/xh_activityindicator.cpp
+	$(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\xrcdll_xh_animatctrl.o: ../../src/xrc/xh_animatctrl.cpp
 	$(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $<

@@ -15906,6 +15935,9 @@ $(OBJS)\xrcdll_xmlrsall.o: ../../src/xrc/xmlrsall.cpp
 $(OBJS)\xrclib_dummy.o: ../../src/common/dummy.cpp
 	$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $<

+$(OBJS)\xrclib_xh_activityindicator.o: ../../src/xrc/xh_activityindicator.cpp
+	$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\xrclib_xh_animatctrl.o: ../../src/xrc/xh_animatctrl.cpp
 	$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $<

--- a/build/msw/makefile.vc
+++ b/build/msw/makefile.vc
@@ -1316,6 +1316,7 @@ XRCDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_426)$(__DEBUGRUNTIME) /DWIN32 \
 	$(CPPFLAGS) $(CXXFLAGS)
 XRCDLL_OBJECTS =  \
 	$(OBJS)\xrcdll_dummy.obj \
+	$(OBJS)\xrcdll_xh_activityindicator.obj \
 	$(OBJS)\xrcdll_xh_animatctrl.obj \
 	$(OBJS)\xrcdll_xh_bannerwindow.obj \
 	$(OBJS)\xrcdll_xh_bmp.obj \
@@ -1398,6 +1399,7 @@ XRCLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_441)$(__DEBUGRUNTIME) /DWIN32 \
 	/Fp"$(OBJS)\wxprec_xrclib.pch" $(CPPFLAGS) $(CXXFLAGS)
 XRCLIB_OBJECTS =  \
 	$(OBJS)\xrclib_dummy.obj \
+	$(OBJS)\xrclib_xh_activityindicator.obj \
 	$(OBJS)\xrclib_xh_animatctrl.obj \
 	$(OBJS)\xrclib_xh_bannerwindow.obj \
 	$(OBJS)\xrclib_xh_bmp.obj \
@@ -1946,6 +1948,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_webviewfshandler.obj \
 	$(OBJS)\monodll_debugrpt.obj \
 	$(OBJS)\monodll_dbgrptg.obj \
+	$(OBJS)\monodll_xh_activityindicator.obj \
 	$(OBJS)\monodll_xh_animatctrl.obj \
 	$(OBJS)\monodll_xh_bannerwindow.obj \
 	$(OBJS)\monodll_xh_bmp.obj \
@@ -2667,7 +2670,8 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_datectrl.obj \
 	$(OBJS)\monodll_datetimectrl.obj \
 	$(OBJS)\monodll_hyperlink.obj \
-	$(OBJS)\monodll_timectrl.obj
+	$(OBJS)\monodll_timectrl.obj \
+	$(OBJS)\monodll_activityindicator.obj
 !endif
 !if "$(WXUNIV)" == "1"
 ____ADVANCED_SRC_FILENAMES_OBJECTS =  \
@@ -2767,6 +2771,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_webviewfshandler.obj \
 	$(OBJS)\monolib_debugrpt.obj \
 	$(OBJS)\monolib_dbgrptg.obj \
+	$(OBJS)\monolib_xh_activityindicator.obj \
 	$(OBJS)\monolib_xh_animatctrl.obj \
 	$(OBJS)\monolib_xh_bannerwindow.obj \
 	$(OBJS)\monolib_xh_bmp.obj \
@@ -3488,7 +3493,8 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_datectrl.obj \
 	$(OBJS)\monolib_datetimectrl.obj \
 	$(OBJS)\monolib_hyperlink.obj \
-	$(OBJS)\monolib_timectrl.obj
+	$(OBJS)\monolib_timectrl.obj \
+	$(OBJS)\monolib_activityindicator.obj
 !endif
 !if "$(WXUNIV)" == "1"
 ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
@@ -4844,7 +4850,8 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\advdll_datectrl.obj \
 	$(OBJS)\advdll_datetimectrl.obj \
 	$(OBJS)\advdll_hyperlink.obj \
-	$(OBJS)\advdll_timectrl.obj
+	$(OBJS)\advdll_timectrl.obj \
+	$(OBJS)\advdll_activityindicator.obj
 !endif
 !if "$(WXUNIV)" == "1"
 ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
@@ -4952,7 +4959,8 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\advlib_datectrl.obj \
 	$(OBJS)\advlib_datetimectrl.obj \
 	$(OBJS)\advlib_hyperlink.obj \
-	$(OBJS)\advlib_timectrl.obj
+	$(OBJS)\advlib_timectrl.obj \
+	$(OBJS)\advlib_activityindicator.obj
 !endif
 !if "$(WXUNIV)" == "1"
 ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
@@ -7684,6 +7692,9 @@ $(OBJS)\monodll_hyperlink.obj: ..\..\src\msw\hyperlink.cpp
 $(OBJS)\monodll_timectrl.obj: ..\..\src\msw\timectrl.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\timectrl.cpp

+$(OBJS)\monodll_activityindicator.obj: ..\..\src\generic\activityindicator.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\activityindicator.cpp
+
 $(OBJS)\monodll_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\mediactrlcmn.cpp

@@ -7792,6 +7803,9 @@ $(OBJS)\monodll_debugrpt.obj: ..\..\src\common\debugrpt.cpp
 $(OBJS)\monodll_dbgrptg.obj: ..\..\src\generic\dbgrptg.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\dbgrptg.cpp

+$(OBJS)\monodll_xh_activityindicator.obj: ..\..\src\xrc\xh_activityindicator.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_activityindicator.cpp
+
 $(OBJS)\monodll_xh_animatctrl.obj: ..\..\src\xrc\xh_animatctrl.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_animatctrl.cpp

@@ -10174,6 +10188,9 @@ $(OBJS)\monolib_hyperlink.obj: ..\..\src\msw\hyperlink.cpp
 $(OBJS)\monolib_timectrl.obj: ..\..\src\msw\timectrl.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\timectrl.cpp

+$(OBJS)\monolib_activityindicator.obj: ..\..\src\generic\activityindicator.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\activityindicator.cpp
+
 $(OBJS)\monolib_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\mediactrlcmn.cpp

@@ -10282,6 +10299,9 @@ $(OBJS)\monolib_debugrpt.obj: ..\..\src\common\debugrpt.cpp
 $(OBJS)\monolib_dbgrptg.obj: ..\..\src\generic\dbgrptg.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\dbgrptg.cpp

+$(OBJS)\monolib_xh_activityindicator.obj: ..\..\src\xrc\xh_activityindicator.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_activityindicator.cpp
+
 $(OBJS)\monolib_xh_animatctrl.obj: ..\..\src\xrc\xh_animatctrl.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_animatctrl.cpp

@@ -15664,6 +15684,9 @@ $(OBJS)\advdll_hyperlink.obj: ..\..\src\msw\hyperlink.cpp
 $(OBJS)\advdll_timectrl.obj: ..\..\src\msw\timectrl.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\timectrl.cpp

+$(OBJS)\advdll_activityindicator.obj: ..\..\src\generic\activityindicator.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\activityindicator.cpp
+
 $(OBJS)\advdll_animatecmn.obj: ..\..\src\common\animatecmn.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\animatecmn.cpp

@@ -15817,6 +15840,9 @@ $(OBJS)\advlib_hyperlink.obj: ..\..\src\msw\hyperlink.cpp
 $(OBJS)\advlib_timectrl.obj: ..\..\src\msw\timectrl.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\timectrl.cpp

+$(OBJS)\advlib_activityindicator.obj: ..\..\src\generic\activityindicator.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\activityindicator.cpp
+
 $(OBJS)\advlib_animatecmn.obj: ..\..\src\common\animatecmn.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\animatecmn.cpp

@@ -16222,6 +16248,9 @@ $(OBJS)\xrcdll_dummy.obj: ..\..\src\common\dummy.cpp
 $(OBJS)\xrcdll_version.res: ..\..\src\msw\version.rc
 	rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_6) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_72)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) /i $(SETUPHDIR) /i ..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_XRC ..\..\src\msw\version.rc

+$(OBJS)\xrcdll_xh_activityindicator.obj: ..\..\src\xrc\xh_activityindicator.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_activityindicator.cpp
+
 $(OBJS)\xrcdll_xh_animatctrl.obj: ..\..\src\xrc\xh_animatctrl.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_animatctrl.cpp

@@ -16423,6 +16452,9 @@ $(OBJS)\xrcdll_xmlrsall.obj: ..\..\src\xrc\xmlrsall.cpp
 $(OBJS)\xrclib_dummy.obj: ..\..\src\common\dummy.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp

+$(OBJS)\xrclib_xh_activityindicator.obj: ..\..\src\xrc\xh_activityindicator.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_activityindicator.cpp
+
 $(OBJS)\xrclib_xh_animatctrl.obj: ..\..\src\xrc\xh_animatctrl.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_animatctrl.cpp

--- a/build/msw/wx_vc7_adv.vcproj
+++ b/build/msw/wx_vc7_adv.vcproj
@@ -276,6 +276,9 @@
 		<Filter
 			Name="Common Sources"
 			UniqueIdentifier="{A6A5C30D-BDB6-5050-906D-10A96065136C}">
+			<File
+				RelativePath="..\..\src\common\addremovectrl.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\common\animatecmn.cpp">
 			</File>
@@ -330,9 +333,6 @@
 			<File
 				RelativePath="..\..\src\common\taskbarcmn.cpp">
 			</File>
-			<File
-				RelativePath="..\..\src\common\addremovectrl.cpp">
-			</File>
 		</Filter>
 		<Filter
 			Name="MSW Sources"
@@ -395,6 +395,9 @@
 			<File
 				RelativePath="..\..\src\generic\aboutdlgg.cpp">
 			</File>
+			<File
+				RelativePath="..\..\src\generic\activityindicator.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\generic\animateg.cpp">
 			</File>
@@ -470,9 +473,6 @@
 			<File
 				RelativePath="..\..\src\generic\wizard.cpp">
 			</File>
-			<File
-				RelativePath="..\..\src\generic\activityindicator.cpp">
-			</File>
 		</Filter>
 		<Filter
 			Name="Setup Headers"
@@ -606,6 +606,9 @@
 			<File
 				RelativePath="..\..\include\wx\generic\aboutdlgg.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\generic\activityindicator.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\generic\animate.h">
 			</File>
@@ -666,9 +669,6 @@
 			<File
 				RelativePath="..\..\include\wx\generic\wizard.h">
 			</File>
-			<File
-				RelativePath="..\..\include\wx\generic\activityindicator.h">
-			</File>
 		</Filter>
 		<Filter
 			Name="Common Headers"
@@ -676,6 +676,12 @@
 			<File
 				RelativePath="..\..\include\wx\aboutdlg.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\activityindicator.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\addremovectrl.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\animate.h">
 			</File>
@@ -760,12 +766,6 @@
 			<File
 				RelativePath="..\..\include\wx\wizard.h">
 			</File>
-			<File
-				RelativePath="..\..\include\wx\addremovectrl.h">
-			</File>
-			<File
-				RelativePath="..\..\include\wx\activityindicator.h">
-			</File>
 		</Filter>
 	</Files>
 	<Globals>
--- a/build/msw/wx_vc7_core.vcproj
+++ b/build/msw/wx_vc7_core.vcproj
@@ -1247,6 +1247,9 @@
 			<File
 				RelativePath="..\..\include\wx\msw\app.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\appprogress.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\ole\automtn.h">
 			</File>
@@ -1628,9 +1631,6 @@
 			<File
 				RelativePath="..\..\include\wx\msw\window.h">
 			</File>
-			<File
-				RelativePath="..\..\include\wx\msw\appprogress.h">
-			</File>
 		</Filter>
 		<Filter
 			Name="Generic Headers"
@@ -1641,6 +1641,9 @@
 			<File
 				RelativePath="..\..\include\wx\generic\accel.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\generic\activityindicator.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\generic\animate.h">
 			</File>
@@ -1797,9 +1800,6 @@
 			<File
 				RelativePath="..\..\include\wx\generic\wizard.h">
 			</File>
-			<File
-				RelativePath="..\..\include\wx\generic\activityindicator.h">
-			</File>
 		</Filter>
 		<Filter
 			Name="wxHTML Headers"
@@ -1868,6 +1868,12 @@
 			<File
 				RelativePath="..\..\include\wx\access.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\activityindicator.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\addremovectrl.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\propgrid\advprops.h">
 			</File>
@@ -2711,6 +2717,9 @@
 			<File
 				RelativePath="..\..\include\wx\wxhtml.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\xrc\xh_activityindicator.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_all.h">
 			</File>
@@ -2927,12 +2936,6 @@
 			<File
 				RelativePath="..\..\include\wx\xpmhand.h">
 			</File>
-			<File
-				RelativePath="..\..\include\wx\addremovectrl.h">
-			</File>
-			<File
-				RelativePath="..\..\include\wx\activityindicator.h">
-			</File>
 		</Filter>
 		<Filter
 			Name="Source Files"
--- a/build/msw/wx_vc7_xrc.vcproj
+++ b/build/msw/wx_vc7_xrc.vcproj
@@ -413,6 +413,9 @@
 		<Filter
 			Name="Common Headers"
 			UniqueIdentifier="{8C07E926-65B0-5F00-B0D6-7F40DA69BB25}">
+			<File
+				RelativePath="..\..\include\wx\xrc\xh_activityindicator.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_all.h">
 			</File>
@@ -613,6 +616,9 @@
 			Name="Source Files"
 			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+			<File
+				RelativePath="..\..\src\xrc\xh_activityindicator.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\xrc\xh_animatctrl.cpp">
 			</File>
--- a/build/msw/wx_vc8_adv.vcproj
+++ b/build/msw/wx_vc8_adv.vcproj
@@ -741,6 +741,10 @@
 			Name="Common Sources"
 			UniqueIdentifier="{A6A5C30D-BDB6-5050-906D-10A96065136C}"
 			>
+			<File
+				RelativePath="..\..\src\common\addremovectrl.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\animatecmn.cpp"
 				>
@@ -845,10 +849,6 @@
 				RelativePath="..\..\src\common\taskbarcmn.cpp"
 				>
 			</File>
-			<File
-				RelativePath="..\..\src\common\addremovectrl.cpp"
-				>
-			</File>
 		</Filter>
 		<Filter
 			Name="MSW Sources"
@@ -939,6 +939,10 @@
 				RelativePath="..\..\src\generic\aboutdlgg.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\..\src\generic\activityindicator.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\generic\animateg.cpp"
 				>
@@ -1039,10 +1043,6 @@
 				RelativePath="..\..\src\generic\wizard.cpp"
 				>
 			</File>
-			<File
-				RelativePath="..\..\src\generic\activityindicator.cpp"
-				>
-			</File>
 		</Filter>
 		<Filter
 			Name="Setup Headers"
@@ -1310,6 +1310,10 @@
 				RelativePath="..\..\include\wx\generic\aboutdlgg.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\include\wx\generic\activityindicator.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\generic\animate.h"
 				>
@@ -1390,10 +1394,6 @@
 				RelativePath="..\..\include\wx\generic\wizard.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\include\wx\generic\activityindicator.h"
-				>
-			</File>
 		</Filter>
 		<Filter
 			Name="Common Headers"
@@ -1403,6 +1403,14 @@
 				RelativePath="..\..\include\wx\aboutdlg.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\include\wx\activityindicator.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\addremovectrl.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\animate.h"
 				>
@@ -1515,14 +1523,6 @@
 				RelativePath="..\..\include\wx\wizard.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\include\wx\addremovectrl.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\activityindicator.h"
-				>
-			</File>
 		</Filter>
 	</Files>
 	<Globals>
--- a/build/msw/wx_vc8_core.vcproj
+++ b/build/msw/wx_vc8_core.vcproj
@@ -2125,6 +2125,10 @@
 				RelativePath="..\..\include\wx\msw\app.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\appprogress.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\ole\automtn.h"
 				>
@@ -2673,10 +2677,6 @@
 				RelativePath="..\..\include\wx\msw\window.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\include\wx\msw\appprogress.h"
-				>
-			</File>
 		</Filter>
 		<Filter
 			Name="Generic Headers"
@@ -2690,6 +2690,10 @@
 				RelativePath="..\..\include\wx\generic\accel.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\include\wx\generic\activityindicator.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\generic\animate.h"
 				>
@@ -2898,10 +2902,6 @@
 				RelativePath="..\..\include\wx\generic\wizard.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\include\wx\generic\activityindicator.h"
-				>
-			</File>
 		</Filter>
 		<Filter
 			Name="wxHTML Headers"
@@ -2992,6 +2992,14 @@
 				RelativePath="..\..\include\wx\access.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\include\wx\activityindicator.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\addremovectrl.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\propgrid\advprops.h"
 				>
@@ -4116,6 +4124,10 @@
 				RelativePath="..\..\include\wx\wxhtml.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\include\wx\xrc\xh_activityindicator.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_all.h"
 				>
@@ -4404,14 +4416,6 @@
 				RelativePath="..\..\include\wx\xpmhand.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\include\wx\addremovectrl.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\activityindicator.h"
-				>
-			</File>
 		</Filter>
 		<Filter
 			Name="Source Files"
--- a/build/msw/wx_vc8_xrc.vcproj
+++ b/build/msw/wx_vc8_xrc.vcproj
@@ -1053,6 +1053,10 @@
 			Name="Common Headers"
 			UniqueIdentifier="{8C07E926-65B0-5F00-B0D6-7F40DA69BB25}"
 			>
+			<File
+				RelativePath="..\..\include\wx\xrc\xh_activityindicator.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_all.h"
 				>
@@ -1319,6 +1323,10 @@
 			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
+			<File
+				RelativePath="..\..\src\xrc\xh_activityindicator.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\xrc\xh_animatctrl.cpp"
 				>
--- a/build/msw/wx_vc9_adv.vcproj
+++ b/build/msw/wx_vc9_adv.vcproj
@@ -737,6 +737,10 @@
 			Name="Common Sources"
 			UniqueIdentifier="{A6A5C30D-BDB6-5050-906D-10A96065136C}"
 			>
+			<File
+				RelativePath="..\..\src\common\addremovectrl.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\animatecmn.cpp"
 				>
@@ -841,10 +845,6 @@
 				RelativePath="..\..\src\common\taskbarcmn.cpp"
 				>
 			</File>
-			<File
-				RelativePath="..\..\src\common\addremovectrl.cpp"
-				>
-			</File>
 		</Filter>
 		<Filter
 			Name="MSW Sources"
@@ -935,6 +935,10 @@
 				RelativePath="..\..\src\generic\aboutdlgg.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\..\src\generic\activityindicator.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\generic\animateg.cpp"
 				>
@@ -1035,10 +1039,6 @@
 				RelativePath="..\..\src\generic\wizard.cpp"
 				>
 			</File>
-			<File
-				RelativePath="..\..\src\generic\activityindicator.cpp"
-				>
-			</File>
 		</Filter>
 		<Filter
 			Name="Setup Headers"
@@ -1306,6 +1306,10 @@
 				RelativePath="..\..\include\wx\generic\aboutdlgg.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\include\wx\generic\activityindicator.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\generic\animate.h"
 				>
@@ -1386,10 +1390,6 @@
 				RelativePath="..\..\include\wx\generic\wizard.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\include\wx\generic\activityindicator.h"
-				>
-			</File>
 		</Filter>
 		<Filter
 			Name="Common Headers"
@@ -1399,6 +1399,14 @@
 				RelativePath="..\..\include\wx\aboutdlg.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\include\wx\activityindicator.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\addremovectrl.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\animate.h"
 				>
@@ -1511,14 +1519,6 @@
 				RelativePath="..\..\include\wx\wizard.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\include\wx\addremovectrl.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\activityindicator.h"
-				>
-			</File>
 		</Filter>
 	</Files>
 	<Globals>
--- a/build/msw/wx_vc9_core.vcproj
+++ b/build/msw/wx_vc9_core.vcproj
@@ -2121,6 +2121,10 @@
 				RelativePath="..\..\include\wx\msw\app.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\appprogress.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\ole\automtn.h"
 				>
@@ -2669,10 +2673,6 @@
 				RelativePath="..\..\include\wx\msw\window.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\include\wx\msw\appprogress.h"
-				>
-			</File>
 		</Filter>
 		<Filter
 			Name="Generic Headers"
@@ -2686,6 +2686,10 @@
 				RelativePath="..\..\include\wx\generic\accel.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\include\wx\generic\activityindicator.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\generic\animate.h"
 				>
@@ -2894,10 +2898,6 @@
 				RelativePath="..\..\include\wx\generic\wizard.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\include\wx\generic\activityindicator.h"
-				>
-			</File>
 		</Filter>
 		<Filter
 			Name="wxHTML Headers"
@@ -2988,6 +2988,14 @@
 				RelativePath="..\..\include\wx\access.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\include\wx\activityindicator.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\addremovectrl.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\propgrid\advprops.h"
 				>
@@ -4112,6 +4120,10 @@
 				RelativePath="..\..\include\wx\wxhtml.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\include\wx\xrc\xh_activityindicator.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_all.h"
 				>
@@ -4400,14 +4412,6 @@
 				RelativePath="..\..\include\wx\xpmhand.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\include\wx\addremovectrl.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\activityindicator.h"
-				>
-			</File>
 		</Filter>
 		<Filter
 			Name="Source Files"
--- a/build/msw/wx_vc9_xrc.vcproj
+++ b/build/msw/wx_vc9_xrc.vcproj
@@ -1049,6 +1049,10 @@
 			Name="Common Headers"
 			UniqueIdentifier="{8C07E926-65B0-5F00-B0D6-7F40DA69BB25}"
 			>
+			<File
+				RelativePath="..\..\include\wx\xrc\xh_activityindicator.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_all.h"
 				>
@@ -1315,6 +1319,10 @@
 			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
+			<File
+				RelativePath="..\..\src\xrc\xh_activityindicator.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\xrc\xh_animatctrl.cpp"
 				>