diff --git a/Makefile.in b/Makefile.in
index 81960e11ae..2483738bb3 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1724,6 +1724,7 @@ XRCDLL_CXXFLAGS = $(__xrcdll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(CPPFLAGS) $(CXXFLAGS)
XRCDLL_OBJECTS = \
$(__xrcdll___win32rc) \
+ xrcdll_xh_activityindicator.o \
xrcdll_xh_animatctrl.o \
xrcdll_xh_bannerwindow.o \
xrcdll_xh_bmp.o \
@@ -1797,6 +1798,7 @@ XRCLIB_CXXFLAGS = $(__xrclib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) \
$(__INC_EXPAT_p) $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
XRCLIB_OBJECTS = \
+ xrclib_xh_activityindicator.o \
xrclib_xh_animatctrl.o \
xrclib_xh_bannerwindow.o \
xrclib_xh_bmp.o \
@@ -4298,6 +4300,7 @@ COND_USE_GUI_1_ALL_GUI_HEADERS = \
wx/glcanvas.h \
$(OPENGL_HDR_PLATFORM) \
wx/debugrpt.h \
+ wx/xrc/xh_activityindicator.h \
wx/xrc/xh_all.h \
wx/xrc/xh_animatctrl.h \
wx/xrc/xh_bannerwindow.h \
@@ -4611,6 +4614,7 @@ COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS = \
monodll_webviewfshandler.o \
monodll_debugrpt.o \
monodll_dbgrptg.o \
+ monodll_xh_activityindicator.o \
monodll_xh_animatctrl.o \
monodll_xh_bannerwindow.o \
monodll_xh_bmp.o \
@@ -6985,6 +6989,7 @@ COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS_1 = \
monolib_webviewfshandler.o \
monolib_debugrpt.o \
monolib_dbgrptg.o \
+ monolib_xh_activityindicator.o \
monolib_xh_animatctrl.o \
monolib_xh_bannerwindow.o \
monolib_xh_bmp.o \
@@ -18821,6 +18826,9 @@ monodll_debugrpt.o: $(srcdir)/src/common/debugrpt.cpp $(MONODLL_ODEP)
monodll_dbgrptg.o: $(srcdir)/src/generic/dbgrptg.cpp $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/dbgrptg.cpp
+monodll_xh_activityindicator.o: $(srcdir)/src/xrc/xh_activityindicator.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_activityindicator.cpp
+
monodll_xh_animatctrl.o: $(srcdir)/src/xrc/xh_animatctrl.cpp $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_animatctrl.cpp
@@ -24740,6 +24748,9 @@ monolib_debugrpt.o: $(srcdir)/src/common/debugrpt.cpp $(MONOLIB_ODEP)
monolib_dbgrptg.o: $(srcdir)/src/generic/dbgrptg.cpp $(MONOLIB_ODEP)
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/dbgrptg.cpp
+monolib_xh_activityindicator.o: $(srcdir)/src/xrc/xh_activityindicator.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_activityindicator.cpp
+
monolib_xh_animatctrl.o: $(srcdir)/src/xrc/xh_animatctrl.cpp $(MONOLIB_ODEP)
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_animatctrl.cpp
@@ -40493,6 +40504,9 @@ xmllib_xtixml.o: $(srcdir)/src/common/xtixml.cpp $(XMLLIB_ODEP)
xrcdll_version_rc.o: $(srcdir)/src/msw/version.rc $(XRCDLL_ODEP)
$(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_66) $(__INC_TIFF_p_66) $(__INC_JPEG_p_66) $(__INC_PNG_p_65) $(__INC_ZLIB_p_67) $(__INC_REGEX_p_65) $(__INC_EXPAT_p_65) --define WXUSINGDLL --define WXMAKINGDLL_XRC
+xrcdll_xh_activityindicator.o: $(srcdir)/src/xrc/xh_activityindicator.cpp $(XRCDLL_ODEP)
+ $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_activityindicator.cpp
+
xrcdll_xh_animatctrl.o: $(srcdir)/src/xrc/xh_animatctrl.cpp $(XRCDLL_ODEP)
$(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_animatctrl.cpp
@@ -40691,6 +40705,9 @@ xrcdll_xmladv.o: $(srcdir)/src/xrc/xmladv.cpp $(XRCDLL_ODEP)
xrcdll_xmlrsall.o: $(srcdir)/src/xrc/xmlrsall.cpp $(XRCDLL_ODEP)
$(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xmlrsall.cpp
+xrclib_xh_activityindicator.o: $(srcdir)/src/xrc/xh_activityindicator.cpp $(XRCLIB_ODEP)
+ $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_activityindicator.cpp
+
xrclib_xh_animatctrl.o: $(srcdir)/src/xrc/xh_animatctrl.cpp $(XRCLIB_ODEP)
$(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_animatctrl.cpp
diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index e60aa35968..ae2b56d178 100644
--- 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!
+ 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
+ wx/xrc/xh_activityindicator.h
wx/xrc/xh_all.h
wx/xrc/xh_animatctrl.h
wx/xrc/xh_bannerwindow.h
diff --git a/build/files b/build/files
index cf856a013b..cb3c4505a2 100644
--- 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
diff --git a/build/msw/makefile.bcc b/build/msw/makefile.bcc
index 64dae1feca..f231e69412 100644
--- 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
diff --git a/build/msw/makefile.gcc b/build/msw/makefile.gcc
index ff1441fc51..f9e6858055 100644
--- 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) $<
diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc
index 3e02df6b1a..7c672251ce 100644
--- 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
diff --git a/build/msw/wx_vc7_adv.vcproj b/build/msw/wx_vc7_adv.vcproj
index aa71d5d89f..1401d0f420 100644
--- a/build/msw/wx_vc7_adv.vcproj
+++ b/build/msw/wx_vc7_adv.vcproj
@@ -276,6 +276,9 @@
+
+
@@ -330,9 +333,6 @@
-
-
+
+
@@ -470,9 +473,6 @@
-
-
+
+
@@ -666,9 +669,6 @@
-
-
+
+
+
+
@@ -760,12 +766,6 @@
-
-
-
-
diff --git a/build/msw/wx_vc7_core.vcproj b/build/msw/wx_vc7_core.vcproj
index 4d4f9cae4f..c51b675233 100644
--- a/build/msw/wx_vc7_core.vcproj
+++ b/build/msw/wx_vc7_core.vcproj
@@ -1247,6 +1247,9 @@
+
+
@@ -1628,9 +1631,6 @@
-
-
+
+
@@ -1797,9 +1800,6 @@
-
-
+
+
+
+
@@ -2711,6 +2717,9 @@
+
+
@@ -2927,12 +2936,6 @@
-
-
-
-
+
+
@@ -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}">
+
+
diff --git a/build/msw/wx_vc8_adv.vcproj b/build/msw/wx_vc8_adv.vcproj
index 350cda0d68..84da1eeab3 100644
--- 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}"
>
+
+
@@ -845,10 +849,6 @@
RelativePath="..\..\src\common\taskbarcmn.cpp"
>
-
-
+
+
@@ -1039,10 +1043,6 @@
RelativePath="..\..\src\generic\wizard.cpp"
>
-
-
+
+
@@ -1390,10 +1394,6 @@
RelativePath="..\..\include\wx\generic\wizard.h"
>
-
-
+
+
+
+
@@ -1515,14 +1523,6 @@
RelativePath="..\..\include\wx\wizard.h"
>
-
-
-
-
diff --git a/build/msw/wx_vc8_core.vcproj b/build/msw/wx_vc8_core.vcproj
index 53a910f052..b94b2016b0 100644
--- a/build/msw/wx_vc8_core.vcproj
+++ b/build/msw/wx_vc8_core.vcproj
@@ -2125,6 +2125,10 @@
RelativePath="..\..\include\wx\msw\app.h"
>
+
+
@@ -2673,10 +2677,6 @@
RelativePath="..\..\include\wx\msw\window.h"
>
-
-
+
+
@@ -2898,10 +2902,6 @@
RelativePath="..\..\include\wx\generic\wizard.h"
>
-
-
+
+
+
+
@@ -4116,6 +4124,10 @@
RelativePath="..\..\include\wx\wxhtml.h"
>
+
+
@@ -4404,14 +4416,6 @@
RelativePath="..\..\include\wx\xpmhand.h"
>
-
-
-
-
+
+
@@ -1319,6 +1323,10 @@
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
+
+
diff --git a/build/msw/wx_vc9_adv.vcproj b/build/msw/wx_vc9_adv.vcproj
index bdbacf5414..4cf1b51694 100644
--- 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}"
>
+
+
@@ -841,10 +845,6 @@
RelativePath="..\..\src\common\taskbarcmn.cpp"
>
-
-
+
+
@@ -1035,10 +1039,6 @@
RelativePath="..\..\src\generic\wizard.cpp"
>
-
-
+
+
@@ -1386,10 +1390,6 @@
RelativePath="..\..\include\wx\generic\wizard.h"
>
-
-
+
+
+
+
@@ -1511,14 +1519,6 @@
RelativePath="..\..\include\wx\wizard.h"
>
-
-
-
-
diff --git a/build/msw/wx_vc9_core.vcproj b/build/msw/wx_vc9_core.vcproj
index e8a2f8d266..5d2bdfc321 100644
--- a/build/msw/wx_vc9_core.vcproj
+++ b/build/msw/wx_vc9_core.vcproj
@@ -2121,6 +2121,10 @@
RelativePath="..\..\include\wx\msw\app.h"
>
+
+
@@ -2669,10 +2673,6 @@
RelativePath="..\..\include\wx\msw\window.h"
>
-
-
+
+
@@ -2894,10 +2898,6 @@
RelativePath="..\..\include\wx\generic\wizard.h"
>
-
-
+
+
+
+
@@ -4112,6 +4120,10 @@
RelativePath="..\..\include\wx\wxhtml.h"
>
+
+
@@ -4400,14 +4412,6 @@
RelativePath="..\..\include\wx\xpmhand.h"
>
-
-
-
-
+
+
@@ -1315,6 +1319,10 @@
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
+
+
diff --git a/docs/doxygen/overviews/xrc_format.h b/docs/doxygen/overviews/xrc_format.h
index 3dbe40ef15..5c93f19b3d 100644
--- a/docs/doxygen/overviews/xrc_format.h
+++ b/docs/doxygen/overviews/xrc_format.h
@@ -541,6 +541,14 @@ control-specific properties are listed. If the control can have child objects,
it is documented there too; unless said otherwise, XRC elements for these
controls cannot have children.
+@subsubsection xrc_activityindicator wxActivityIndicator
+
+@beginTable
+@hdr3col{property, type, description}
+@row3col{running, @ref overview_xrcformat_type_bool,
+ If true, start the activity indicator after creating it (default: false).}
+@endTable
+
@subsubsection xrc_wxanimationctrl wxAnimationCtrl
@beginTable
diff --git a/include/wx/xrc/xh_activityindicator.h b/include/wx/xrc/xh_activityindicator.h
new file mode 100644
index 0000000000..b6a0e8c360
--- /dev/null
+++ b/include/wx/xrc/xh_activityindicator.h
@@ -0,0 +1,31 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name: wx/xrc/xh_activityindicator.h
+// Purpose: Declaration of wxActivityIndicator XRC handler.
+// Author: Vadim Zeitlin
+// Created: 2015-03-18
+// Copyright: (c) 2015 Vadim Zeitlin
+// Licence: wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_XH_ACTIVITYINDICATOR_H_
+#define _WX_XH_ACTIVITYINDICATOR_H_
+
+#include "wx/xrc/xmlres.h"
+
+#if wxUSE_XRC && wxUSE_ACTIVITYINDICATOR
+
+class WXDLLIMPEXP_XRC wxActivityIndicatorXmlHandler : public wxXmlResourceHandler
+{
+public:
+ wxActivityIndicatorXmlHandler();
+
+ virtual wxObject *DoCreateResource() wxOVERRIDE;
+ virtual bool CanHandle(wxXmlNode *node) wxOVERRIDE;
+
+private:
+ wxDECLARE_DYNAMIC_CLASS(wxActivityIndicatorXmlHandler);
+};
+
+#endif // wxUSE_XRC && wxUSE_ACTIVITYINDICATOR
+
+#endif // _WX_XH_ACTIVITYINDICATOR_H_
diff --git a/include/wx/xrc/xh_all.h b/include/wx/xrc/xh_all.h
index b532f3f2c2..379faa9aa2 100644
--- a/include/wx/xrc/xh_all.h
+++ b/include/wx/xrc/xh_all.h
@@ -13,6 +13,7 @@
// Existing handlers:
+#include "wx/xrc/xh_activityindicator.h"
#include "wx/xrc/xh_animatctrl.h"
#include "wx/xrc/xh_bannerwindow.h"
#include "wx/xrc/xh_bmp.h"
diff --git a/misc/schema/xrc_schema.rnc b/misc/schema/xrc_schema.rnc
index a1ae2654b2..529831c0d7 100644
--- a/misc/schema/xrc_schema.rnc
+++ b/misc/schema/xrc_schema.rnc
@@ -152,6 +152,7 @@ builtinToplevelClasses =
builtinWindowClasses =
( unknown
+ | wxActivityIndicator
| wxAnimationCtrl
| wxAuiNotebook
| wxAuiToolBar
@@ -242,6 +243,7 @@ builtinClassesNames =
| "unknown"
+ | "wxActivityIndicator"
| "wxAnimationCtrl"
| "wxAuiNotebook"
| "wxAuiToolBar"
@@ -506,6 +508,15 @@ wxBitmap_or_wxIcon =
}
+wxActivityIndicator =
+ element object {
+ attribute class { "wxActivityIndicator" } &
+ stdObjectNodeAttributes &
+ stdWindowProperties &
+ [xrc:p="o"] element running {_, t_bool }*
+ }
+
+
wxAnimationCtrl =
element object {
attribute class { "wxAnimationCtrl" } &
diff --git a/samples/xrc/rc/controls.xrc b/samples/xrc/rc/controls.xrc
index 862f62a0cc..85486b646c 100644
--- a/samples/xrc/rc/controls.xrc
+++ b/samples/xrc/rc/controls.xrc
@@ -21,6 +21,48 @@