Add wxActivityIndicator control.

This is a simple animated control indicating some program activity. Provide native GTK+ (for > 2.20) and OS X implementations as well as a generic one used under MSW. Update the sample and the documentation.
2015-03-06 17:43:29 +01:00
parent 00748bbaef
commit 3f84cb17ca
50 changed files with 1800 additions and 70 deletions
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -2932,6 +2932,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
    wx/univ/toolbar.h
    wx/univ/toplevel.h
    wx/univ/window.h
+    wx/generic/activityindicator.h
 </set>

 <!-- ====================================================================== -->
@@ -3026,6 +3027,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
    wx/treelist.h
    wx/wizard.h
    wx/addremovectrl.h
+    wx/activityindicator.h
 </set>

 <set var="ADVANCED_MSW_SRC" hints="files">
@@ -3053,6 +3055,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
    src/msw/datetimectrl.cpp
    src/msw/hyperlink.cpp
    src/msw/timectrl.cpp
+    src/generic/activityindicator.cpp
 </set>
 <set var="ADVANCED_MSW_NATIVE_HDR" hints="files">
    wx/generic/animate.h
@@ -3063,6 +3066,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
    wx/msw/datetimectrl.h
    wx/msw/hyperlink.h
    wx/msw/timectrl.h
+    wx/generic/activityindicator.h
 </set>

 <!-- not built on WindowsCE: -->
@@ -3084,6 +3088,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
    src/osx/carbon/sound.cpp
    src/osx/carbon/taskbar.cpp
    src/osx/core/hidjoystick.cpp
+    src/generic/activityindicator.cpp
 </set>

 <set var="ADVANCED_OSX_CARBON_HDR" hints="files">
@@ -3097,6 +3102,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
    wx/osx/carbon/drawer.h
    wx/osx/carbon/dataview.h
    wx/osx/core/joystick.h
+    wx/generic/activityindicator.h
 </set>

 <set var="ADVANCED_OSX_COCOA_SRC" hints="files">
@@ -3114,6 +3120,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
    src/osx/cocoa/datetimectrl.mm
    src/osx/cocoa/taskbar.mm
    src/osx/core/hidjoystick.cpp
+    src/osx/cocoa/activityindicator.mm
 </set>

 <set var="ADVANCED_OSX_COCOA_HDR" hints="files">
@@ -3129,6 +3136,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
    wx/osx/timectrl.h
    wx/osx/core/joystick.h
    wx/osx/cocoa/dataview.h
+    wx/osx/cocoa/activityindicator.h
 </set>

 <set var="ADVANCED_OSX_IPHONE_SRC" hints="files">
@@ -3170,10 +3178,12 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!

 <set var="ADVANCED_MOTIF_SRC" hints="files">
    src/generic/animateg.cpp
+    src/generic/activityindicator.cpp
 </set>

 <set var="ADVANCED_MOTIF_HDR" hints="files">
    wx/generic/animate.h
+    wx/generic/animateanimate.h
 </set>

 <set var="ADVANCED_GTK_WIN32_SRC" hints="files">
@@ -3205,11 +3215,13 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
    $(ADVANCED_GTK_SRC)
    src/gtk/eggtrayicon.c
    src/gtk/hildon/notifmsg.cpp
+    src/generic/activityindicator.cpp
 </set>
 <set var="ADVANCED_GTK_HDR" hints="files">
    $(ADVANCED_GTK_PLATFORM_HDR)
    wx/gtk/notifmsg.h
    wx/gtk/taskbar.h
+    wx/generic/activityindicator.h
 </set>
 <set var="ADVANCED_GTK2_HDR" hints="files">
    $(ADVANCED_GTK_HDR)
@@ -3223,6 +3235,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
    src/gtk/calctrl.cpp
    src/gtk/dataview.cpp
    src/gtk/hyperlink.cpp
+    src/gtk/activityindicator.cpp
 </set>
 <set var="ADVANCED_GTK_NATIVE_HDR" hints="files">
    wx/gtk/animate.h
@@ -3232,15 +3245,18 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
    wx/gtk/dvrenderer.h
    wx/gtk/dvrenderers.h
    wx/gtk/hyperlink.h
+    wx/gtk/activityindicator.h
 </set>

 <set var="ADVANCED_GTK1_SRC" hints="files">
    src/generic/animateg.cpp
    src/gtk1/eggtrayicon.c
    src/gtk1/taskbar.cpp
+    src/generic/activityindicator.cpp
 </set>
 <set var="ADVANCED_GTK1_HDR" hints="files">
    wx/generic/animate.h
+    wx/generic/activityindicator.h
 </set>

 <set var="ADVANCED_UNIV_SRC" hints="files">
--- a/build/files
+++ b/build/files
@@ -2453,6 +2453,7 @@ UNIV_SRC =
 UNIV_HDR =
    $(UNIV_PLATFORM_HDR)
    wx/generic/accel.h
+    wx/generic/activityindicator.h
    wx/generic/animate.h
    wx/generic/clrpickerg.h
    wx/generic/collpaneg.h
@@ -2550,6 +2551,7 @@ ADVANCED_CMN_SRC =

 ADVANCED_CMN_HDR =
    wx/aboutdlg.h
+    wx/activityindicator.h
    wx/addremovectrl.h
    wx/animate.h
    wx/bannerwindow.h
@@ -2614,6 +2616,7 @@ ADVANCED_MSW_HDR =

 # not used with wxUniv
 ADVANCED_MSW_NATIVE_SRC =
+    src/generic/activityindicator.cpp
    src/generic/animateg.cpp
    src/msw/bmpcbox.cpp
    src/msw/calctrl.cpp
@@ -2624,6 +2627,7 @@ ADVANCED_MSW_NATIVE_SRC =
    src/msw/hyperlink.cpp
    src/msw/timectrl.cpp
 ADVANCED_MSW_NATIVE_HDR =
+    wx/generic/activityindicator.h
    wx/generic/animate.h
    wx/msw/bmpcbox.h
    wx/msw/commandlinkbutton.h
@@ -2641,6 +2645,7 @@ ADVANCED_MSW_DESKTOP_HDR =

 ADVANCED_OSX_CARBON_SRC =
    src/common/taskbarcmn.cpp
+    src/generic/activityindicator.cpp
    src/generic/animateg.cpp
    src/osx/carbon/aboutdlg.cpp
    src/osx/carbon/drawer.cpp
@@ -2652,6 +2657,7 @@ ADVANCED_OSX_CARBON_SRC =
    src/osx/core/hidjoystick.cpp

 ADVANCED_OSX_CARBON_HDR =
+    wx/generic/activityindicator.h
    wx/generic/animate.h
    wx/osx/dataview.h
    wx/osx/dvrenderer.h
@@ -2666,6 +2672,7 @@ ADVANCED_OSX_CARBON_HDR =
 ADVANCED_OSX_COCOA_SRC =
    src/common/taskbarcmn.cpp
    src/generic/animateg.cpp
+    src/osx/cocoa/activityindicator.mm
    src/osx/datetimectrl_osx.cpp
    src/osx/datectrl_osx.cpp
    src/osx/sound_osx.cpp
@@ -2691,6 +2698,7 @@ ADVANCED_OSX_COCOA_HDR =
    wx/osx/taskbarosx.h
    wx/osx/timectrl.h
    wx/osx/core/joystick.h
+    wx/osx/cocoa/activityindicator.h
    wx/osx/cocoa/dataview.h

 ADVANCED_OSX_IPHONE_SRC =
@@ -2724,9 +2732,11 @@ ADVANCED_UNIX_HDR =
    wx/unix/taskbarx11.h

 ADVANCED_MOTIF_SRC =
+    src/generic/activityindicator.cpp
    src/generic/animateg.cpp

 ADVANCED_MOTIF_HDR =
+    wx/generic/animateanimate.h
    wx/generic/animate.h

 ADVANCED_GTK_WIN32_SRC =
@@ -2743,10 +2753,12 @@ ADVANCED_GTK_SRC =
    src/gtk/taskbar.cpp
 ADVANCED_GTK2_SRC =
    $(ADVANCED_GTK_SRC)
+    src/generic/activityindicator.cpp
    src/gtk/eggtrayicon.c
    src/gtk/hildon/notifmsg.cpp
 ADVANCED_GTK_HDR =
    $(ADVANCED_GTK_PLATFORM_HDR)
+    wx/generic/activityindicator.h
    wx/gtk/notifmsg.h
    wx/gtk/taskbar.h
 ADVANCED_GTK2_HDR =
@@ -2755,12 +2767,14 @@ ADVANCED_GTK2_HDR =

 ADVANCED_GTK_NATIVE_SRC =
    src/gtk/aboutdlg.cpp
+    src/gtk/activityindicator.cpp
    src/gtk/animate.cpp
    src/gtk/bmpcbox.cpp
    src/gtk/calctrl.cpp
    src/gtk/dataview.cpp
    src/gtk/hyperlink.cpp
 ADVANCED_GTK_NATIVE_HDR =
+    wx/gtk/activityindicator.h
    wx/gtk/animate.h
    wx/gtk/bmpcbox.h
    wx/gtk/calctrl.h
@@ -2770,10 +2784,12 @@ ADVANCED_GTK_NATIVE_HDR =
    wx/gtk/hyperlink.h

 ADVANCED_GTK1_SRC =
+    src/generic/activityindicator.cpp
    src/generic/animateg.cpp
    src/gtk1/eggtrayicon.c
    src/gtk1/taskbar.cpp
 ADVANCED_GTK1_HDR =
+    wx/generic/activityindicator.h
    wx/generic/animate.h


--- a/build/msw/wx_adv.vcxproj
+++ b/build/msw/wx_adv.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup Label="ProjectConfigurations">
    <ProjectConfiguration Include="Debug|Win32">
@@ -506,6 +506,7 @@
    <ClCompile Include="..\..\src\generic\treelist.cpp" />
    <ClCompile Include="..\..\src\generic\wizard.cpp" />
    <ClCompile Include="..\..\src\common\addremovectrl.cpp" />
+    <ClCompile Include="..\..\src\generic\activityindicator.cpp" />
  </ItemGroup>
  <ItemGroup>
    <ResourceCompile Include="..\..\src\msw\version.rc">
@@ -598,6 +599,8 @@
    <ClInclude Include="..\..\include\wx\treelist.h" />
    <ClInclude Include="..\..\include\wx\wizard.h" />
    <ClInclude Include="..\..\include\wx\addremovectrl.h" />
+    <ClInclude Include="..\..\include\wx\activityindicator.h" />
+    <ClInclude Include="..\..\include\wx\generic\activityindicator.h" />
  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
--- a/build/msw/wx_adv.vcxproj.filters
+++ b/build/msw/wx_adv.vcxproj.filters
@@ -60,6 +60,9 @@
    <ClCompile Include="..\..\src\generic\aboutdlgg.cpp">
      <Filter>Generic Sources</Filter>
    </ClCompile>
+    <ClCompile Include="..\..\src\generic\activityindicator.cpp">
+      <Filter>Generic Sources</Filter>
+    </ClCompile>
    <ClCompile Include="..\..\src\generic\animateg.cpp">
      <Filter>Generic Sources</Filter>
    </ClCompile>
@@ -187,6 +190,9 @@
    <ClInclude Include="..\..\include\wx\aboutdlg.h">
      <Filter>Common Headers</Filter>
    </ClInclude>
+    <ClInclude Include="..\..\include\wx\activityindicator.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
    <ClInclude Include="..\..\include\wx\addremovectrl.h">
      <Filter>Common Headers</Filter>
    </ClInclude>
@@ -229,6 +235,9 @@
    <ClInclude Include="..\..\include\wx\generic\aboutdlgg.h">
      <Filter>Generic Headers</Filter>
    </ClInclude>
+    <ClInclude Include="..\..\include\wx\generic\activityindicator.h">
+      <Filter>Generic Headers</Filter>
+    </ClInclude>
    <ClInclude Include="..\..\include\wx\generic\animate.h">
      <Filter>Generic Headers</Filter>
    </ClInclude>
--- a/build/msw/wx_vc7_adv.vcproj
+++ b/build/msw/wx_vc7_adv.vcproj
@@ -470,6 +470,9 @@
 			<File
 				RelativePath="..\..\src\generic\wizard.cpp">
 			</File>
+			<File
+				RelativePath="..\..\src\generic\activityindicator.cpp">
+			</File>
 		</Filter>
 		<Filter
 			Name="Setup Headers"
@@ -663,6 +666,9 @@
 			<File
 				RelativePath="..\..\include\wx\generic\wizard.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\generic\activityindicator.h">
+			</File>
 		</Filter>
 		<Filter
 			Name="Common Headers"
@@ -757,6 +763,9 @@
 			<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
@@ -1797,6 +1797,9 @@
 			<File
 				RelativePath="..\..\include\wx\generic\wizard.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\generic\activityindicator.h">
+			</File>
 		</Filter>
 		<Filter
 			Name="wxHTML Headers"
@@ -2927,6 +2930,9 @@
 			<File
 				RelativePath="..\..\include\wx\addremovectrl.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\activityindicator.h">
+			</File>
 		</Filter>
 		<Filter
 			Name="Source Files"
--- a/build/msw/wx_vc8_adv.vcproj
+++ b/build/msw/wx_vc8_adv.vcproj
@@ -1039,6 +1039,10 @@
 				RelativePath="..\..\src\generic\wizard.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\..\src\generic\activityindicator.cpp"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="Setup Headers"
@@ -1386,6 +1390,10 @@
 				RelativePath="..\..\include\wx\generic\wizard.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\include\wx\generic\activityindicator.h"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="Common Headers"
@@ -1511,6 +1519,10 @@
 				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
@@ -2898,6 +2898,10 @@
 				RelativePath="..\..\include\wx\generic\wizard.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\include\wx\generic\activityindicator.h"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="wxHTML Headers"
@@ -4404,6 +4408,10 @@
 				RelativePath="..\..\include\wx\addremovectrl.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\include\wx\activityindicator.h"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="Source Files"
--- a/build/msw/wx_vc9_adv.vcproj
+++ b/build/msw/wx_vc9_adv.vcproj
@@ -1035,6 +1035,10 @@
 				RelativePath="..\..\src\generic\wizard.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\..\src\generic\activityindicator.cpp"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="Setup Headers"
@@ -1382,6 +1386,10 @@
 				RelativePath="..\..\include\wx\generic\wizard.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\include\wx\generic\activityindicator.h"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="Common Headers"
@@ -1507,6 +1515,10 @@
 				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
@@ -2894,6 +2894,10 @@
 				RelativePath="..\..\include\wx\generic\wizard.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\include\wx\generic\activityindicator.h"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="wxHTML Headers"
@@ -4400,6 +4404,10 @@
 				RelativePath="..\..\include\wx\addremovectrl.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\include\wx\activityindicator.h"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="Source Files"