AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add activityindicator.cpp to wxQt sources

Browse Source 
Similar to ffce5b09f8 but for wxQt port.
This commit is contained in:
Vadim Zeitlin 2016-02-26 12:11:28 +01:00
parent 96a1125ad8
commit 39ad5135f8
4 changed files with 34 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
Makefile.in
View File

@ -3418,7 +3418,8 @@ COND_TOOLKIT_QT_ADVANCED_PLATFORM_HDR = \
wx/qt/dataview.h \
wx/qt/dvrenderer.h \
wx/qt/dvrenderers.h \
wx/qt/taskbar.h
wx/qt/taskbar.h \
wx/generic/activityindicator.h
@COND_TOOLKIT_QT@ADVANCED_PLATFORM_HDR = $(COND_TOOLKIT_QT_ADVANCED_PLATFORM_HDR)
@COND_TOOLKIT_X11@ADVANCED_PLATFORM_HDR = \
@COND_TOOLKIT_X11@ wx/unix/joystick.h wx/unix/sound.h wx/unix/taskbarx11.h
@ -5922,7 +5923,8 @@ COND_TOOLKIT_QT___ADVANCED_PLATFORM_SRC_OBJECTS = \
monodll_unix_sound.o \
monodll_qt_taskbar.o \
monodll_taskbarcmn.o \
monodll_qt_utils.o
monodll_qt_utils.o \
monodll_generic_activityindicator.o
@COND_TOOLKIT_QT@__ADVANCED_PLATFORM_SRC_OBJECTS = $(COND_TOOLKIT_QT___ADVANCED_PLATFORM_SRC_OBJECTS)
COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS = \
monodll_taskbarcmn.o \
@ -6038,7 +6040,8 @@ COND_TOOLKIT_QT___ADVANCED_PLATFORM_SRC_OBJECTS_1 = \
monodll_unix_sound.o \
monodll_qt_taskbar.o \
monodll_taskbarcmn.o \
monodll_qt_utils.o
monodll_qt_utils.o \
monodll_generic_activityindicator.o
@COND_TOOLKIT_QT@__ADVANCED_PLATFORM_SRC_OBJECTS_1 = $(COND_TOOLKIT_QT___ADVANCED_PLATFORM_SRC_OBJECTS_1)
COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_1 = \
monodll_taskbarcmn.o \
@ -7930,7 +7933,8 @@ COND_TOOLKIT_QT___ADVANCED_PLATFORM_SRC_OBJECTS_2 = \
monolib_unix_sound.o \
monolib_qt_taskbar.o \
monolib_taskbarcmn.o \
monolib_qt_utils.o
monolib_qt_utils.o \
monolib_generic_activityindicator.o
@COND_TOOLKIT_QT@__ADVANCED_PLATFORM_SRC_OBJECTS_2 = $(COND_TOOLKIT_QT___ADVANCED_PLATFORM_SRC_OBJECTS_2)
COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_2 = \
monolib_taskbarcmn.o \
@ -8046,7 +8050,8 @@ COND_TOOLKIT_QT___ADVANCED_PLATFORM_SRC_OBJECTS_3 = \
monolib_unix_sound.o \
monolib_qt_taskbar.o \
monolib_taskbarcmn.o \
monolib_qt_utils.o
monolib_qt_utils.o \
monolib_generic_activityindicator.o
@COND_TOOLKIT_QT@__ADVANCED_PLATFORM_SRC_OBJECTS_3 = $(COND_TOOLKIT_QT___ADVANCED_PLATFORM_SRC_OBJECTS_3)
COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_3 = \
monolib_taskbarcmn.o \
@ -11619,7 +11624,8 @@ COND_TOOLKIT_QT___ADVANCED_PLATFORM_SRC_OBJECTS_4 = \
advdll_unix_sound.o \
advdll_qt_taskbar.o \
advdll_taskbarcmn.o \
advdll_utils.o
advdll_utils.o \
advdll_generic_activityindicator.o
@COND_TOOLKIT_QT@__ADVANCED_PLATFORM_SRC_OBJECTS_4 = $(COND_TOOLKIT_QT___ADVANCED_PLATFORM_SRC_OBJECTS_4)
COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_4 = \
advdll_taskbarcmn.o \
@ -11735,7 +11741,8 @@ COND_TOOLKIT_QT___ADVANCED_PLATFORM_SRC_OBJECTS_5 = \
advdll_unix_sound.o \
advdll_qt_taskbar.o \
advdll_taskbarcmn.o \
advdll_utils.o
advdll_utils.o \
advdll_generic_activityindicator.o
@COND_TOOLKIT_QT@__ADVANCED_PLATFORM_SRC_OBJECTS_5 = $(COND_TOOLKIT_QT___ADVANCED_PLATFORM_SRC_OBJECTS_5)
COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_5 = \
advdll_taskbarcmn.o \
@ -11918,7 +11925,8 @@ COND_TOOLKIT_QT___ADVANCED_PLATFORM_SRC_OBJECTS_6 = \
advlib_unix_sound.o \
advlib_qt_taskbar.o \
advlib_taskbarcmn.o \
advlib_utils.o
advlib_utils.o \
advlib_generic_activityindicator.o
@COND_TOOLKIT_QT@__ADVANCED_PLATFORM_SRC_OBJECTS_6 = $(COND_TOOLKIT_QT___ADVANCED_PLATFORM_SRC_OBJECTS_6)
COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_6 = \
advlib_taskbarcmn.o \
@ -12034,7 +12042,8 @@ COND_TOOLKIT_QT___ADVANCED_PLATFORM_SRC_OBJECTS_7 = \
advlib_unix_sound.o \
advlib_qt_taskbar.o \
advlib_taskbarcmn.o \
advlib_utils.o
advlib_utils.o \
advlib_generic_activityindicator.o
@COND_TOOLKIT_QT@__ADVANCED_PLATFORM_SRC_OBJECTS_7 = $(COND_TOOLKIT_QT___ADVANCED_PLATFORM_SRC_OBJECTS_7)
COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_7 = \
advlib_taskbarcmn.o \
@ -19917,6 +19926,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_generic_activityindicator.o: $(srcdir)/src/generic/activityindicator.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/activityindicator.cpp
@COND_TOOLKIT_QT_USE_GUI_1@monodll_generic_activityindicator.o: $(srcdir)/src/generic/activityindicator.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_QT_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/activityindicator.cpp
@COND_USE_GUI_1@monodll_animatecmn.o: $(srcdir)/src/common/animatecmn.cpp $(MONODLL_ODEP)
@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/animatecmn.cpp
@ -24741,6 +24753,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_generic_activityindicator.o: $(srcdir)/src/generic/activityindicator.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/activityindicator.cpp
@COND_TOOLKIT_QT_USE_GUI_1@monolib_generic_activityindicator.o: $(srcdir)/src/generic/activityindicator.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_QT_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/activityindicator.cpp
@COND_USE_GUI_1@monolib_animatecmn.o: $(srcdir)/src/common/animatecmn.cpp $(MONOLIB_ODEP)
@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/animatecmn.cpp
@ -33207,6 +33222,9 @@ advdll_notifmsgcmn.o: $(srcdir)/src/common/notifmsgcmn.cpp $(ADVDLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@advdll_generic_activityindicator.o: $(srcdir)/src/generic/activityindicator.cpp $(ADVDLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/generic/activityindicator.cpp
@COND_TOOLKIT_QT@advdll_generic_activityindicator.o: $(srcdir)/src/generic/activityindicator.cpp $(ADVDLL_ODEP)
@COND_TOOLKIT_QT@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/generic/activityindicator.cpp
@COND_TOOLKIT_MSW@advdll_msw_joystick.o: $(srcdir)/src/msw/joystick.cpp $(ADVDLL_ODEP)
@COND_TOOLKIT_MSW@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/msw/joystick.cpp
@ -33657,6 +33675,9 @@ advlib_notifmsgcmn.o: $(srcdir)/src/common/notifmsgcmn.cpp $(ADVLIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@advlib_generic_activityindicator.o: $(srcdir)/src/generic/activityindicator.cpp $(ADVLIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/generic/activityindicator.cpp
@COND_TOOLKIT_QT@advlib_generic_activityindicator.o: $(srcdir)/src/generic/activityindicator.cpp $(ADVLIB_ODEP)
@COND_TOOLKIT_QT@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/generic/activityindicator.cpp
@COND_TOOLKIT_MSW@advlib_msw_joystick.o: $(srcdir)/src/msw/joystick.cpp $(ADVLIB_ODEP)
@COND_TOOLKIT_MSW@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/msw/joystick.cpp

6
autoconf_inc.m4
View File

@ -788,12 +788,6 @@ dnl ### begin block 20_COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0[wx.bkl] ###
COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0=""
fi
AC_SUBST(COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0)
dnl ### begin block 20_COND_TOOLKIT_MSW_WXUNIV_0[wx.bkl] ###
COND_TOOLKIT_MSW_WXUNIV_0="#"
if test "x$TOOLKIT" = "xMSW" -a "x$WXUNIV" = "x0" ; then
COND_TOOLKIT_MSW_WXUNIV_0=""
fi
AC_SUBST(COND_TOOLKIT_MSW_WXUNIV_0)
dnl ### begin block 20_COND_TOOLKIT_OSX_CARBON[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal-mariano/minimal.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/helpview/src/helpview.bkl,../../utils/screenshotgen/src/screenshotgen.bkl] ###
COND_TOOLKIT_OSX_CARBON="#"
if test "x$TOOLKIT" = "xOSX_CARBON" ; then

2
build/bakefiles/files.bkl
View File

@ -416,6 +416,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/qt/dvrenderer.h
wx/qt/dvrenderers.h
wx/qt/taskbar.h
wx/generic/activityindicator.h
</set>
<set var="ADVANCED_QT_SRC" hints="files">
@ -430,6 +431,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/qt/taskbar.cpp
src/common/taskbarcmn.cpp
src/qt/utils.cpp
src/generic/activityindicator.cpp
</set>
<set var="QT_HDR" hints="files">

2
build/files
View File

@ -353,6 +353,7 @@ QT_LOWLEVEL_SRC=
src/qt/window.cpp
ADVANCED_QT_HDR=
wx/generic/activityindicator.h
wx/generic/animate.h
wx/qt/calctrl.h
wx/qt/dataview.h
@ -361,6 +362,7 @@ ADVANCED_QT_HDR=
wx/qt/taskbar.h
ADVANCED_QT_SRC=
src/generic/activityindicator.cpp
src/generic/animateg.cpp
src/qt/calctrl.cpp
src/qt/converter.cpp