Include src/generic/activityindicator.cpp in wxUniv sources
This generic implementation should be used for wxUniv too, otherwise any code using wxActivityIndicator, such as the widgets sample, simply failed to link when using it. Closes #17394.
This commit is contained in:
Vadim Zeitlin
@@ -2170,6 +2170,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
|
||||
$(OBJS)\monodll_univ_toolbar.obj \
|
||||
$(OBJS)\monodll_topluniv.obj \
|
||||
$(OBJS)\monodll_winuniv.obj \
|
||||
$(OBJS)\monodll_activityindicator.obj \
|
||||
$(OBJS)\monodll_gtk.obj \
|
||||
$(OBJS)\monodll_metal.obj \
|
||||
$(OBJS)\monodll_mono.obj \
|
||||
@@ -2384,6 +2385,7 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = \
|
||||
$(OBJS)\monodll_sound.obj \
|
||||
$(OBJS)\monodll_taskbar.obj \
|
||||
$(OBJS)\monodll_notifmsgrt.obj \
|
||||
$(OBJS)\monodll_activityindicator.obj \
|
||||
$(OBJS)\monodll_joystick.obj \
|
||||
$(OBJS)\monodll_animateg.obj \
|
||||
$(OBJS)\monodll_bmpcbox.obj \
|
||||
@@ -2393,8 +2395,7 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = \
|
||||
$(OBJS)\monodll_datectrl.obj \
|
||||
$(OBJS)\monodll_datetimectrl.obj \
|
||||
$(OBJS)\monodll_hyperlink.obj \
|
||||
$(OBJS)\monodll_timectrl.obj \
|
||||
$(OBJS)\monodll_activityindicator.obj
|
||||
$(OBJS)\monodll_timectrl.obj
|
||||
!endif
|
||||
!if "$(WXUNIV)" == "1"
|
||||
____ADVANCED_SRC_FILENAMES_OBJECTS = \
|
||||
@@ -2440,6 +2441,7 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = \
|
||||
$(OBJS)\monodll_sound.obj \
|
||||
$(OBJS)\monodll_taskbar.obj \
|
||||
$(OBJS)\monodll_notifmsgrt.obj \
|
||||
$(OBJS)\monodll_activityindicator.obj \
|
||||
$(OBJS)\monodll_joystick.obj \
|
||||
$(OBJS)\monodll_animateg.obj
|
||||
!endif
|
||||
@@ -2999,6 +3001,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
|
||||
$(OBJS)\monolib_univ_toolbar.obj \
|
||||
$(OBJS)\monolib_topluniv.obj \
|
||||
$(OBJS)\monolib_winuniv.obj \
|
||||
$(OBJS)\monolib_activityindicator.obj \
|
||||
$(OBJS)\monolib_gtk.obj \
|
||||
$(OBJS)\monolib_metal.obj \
|
||||
$(OBJS)\monolib_mono.obj \
|
||||
@@ -3213,6 +3216,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \
|
||||
$(OBJS)\monolib_sound.obj \
|
||||
$(OBJS)\monolib_taskbar.obj \
|
||||
$(OBJS)\monolib_notifmsgrt.obj \
|
||||
$(OBJS)\monolib_activityindicator.obj \
|
||||
$(OBJS)\monolib_joystick.obj \
|
||||
$(OBJS)\monolib_animateg.obj \
|
||||
$(OBJS)\monolib_bmpcbox.obj \
|
||||
@@ -3222,8 +3226,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \
|
||||
$(OBJS)\monolib_datectrl.obj \
|
||||
$(OBJS)\monolib_datetimectrl.obj \
|
||||
$(OBJS)\monolib_hyperlink.obj \
|
||||
$(OBJS)\monolib_timectrl.obj \
|
||||
$(OBJS)\monolib_activityindicator.obj
|
||||
$(OBJS)\monolib_timectrl.obj
|
||||
!endif
|
||||
!if "$(WXUNIV)" == "1"
|
||||
____ADVANCED_SRC_FILENAMES_1_OBJECTS = \
|
||||
@@ -3269,6 +3272,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \
|
||||
$(OBJS)\monolib_sound.obj \
|
||||
$(OBJS)\monolib_taskbar.obj \
|
||||
$(OBJS)\monolib_notifmsgrt.obj \
|
||||
$(OBJS)\monolib_activityindicator.obj \
|
||||
$(OBJS)\monolib_joystick.obj \
|
||||
$(OBJS)\monolib_animateg.obj
|
||||
!endif
|
||||
@@ -3700,6 +3704,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
|
||||
$(OBJS)\coredll_univ_toolbar.obj \
|
||||
$(OBJS)\coredll_topluniv.obj \
|
||||
$(OBJS)\coredll_winuniv.obj \
|
||||
$(OBJS)\coredll_activityindicator.obj \
|
||||
$(OBJS)\coredll_gtk.obj \
|
||||
$(OBJS)\coredll_metal.obj \
|
||||
$(OBJS)\coredll_mono.obj \
|
||||
@@ -4270,6 +4275,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
|
||||
$(OBJS)\corelib_univ_toolbar.obj \
|
||||
$(OBJS)\corelib_topluniv.obj \
|
||||
$(OBJS)\corelib_winuniv.obj \
|
||||
$(OBJS)\corelib_activityindicator.obj \
|
||||
$(OBJS)\corelib_gtk.obj \
|
||||
$(OBJS)\corelib_metal.obj \
|
||||
$(OBJS)\corelib_mono.obj \
|
||||
@@ -4494,6 +4500,7 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = \
|
||||
$(OBJS)\advdll_sound.obj \
|
||||
$(OBJS)\advdll_taskbar.obj \
|
||||
$(OBJS)\advdll_notifmsgrt.obj \
|
||||
$(OBJS)\advdll_activityindicator.obj \
|
||||
$(OBJS)\advdll_joystick.obj \
|
||||
$(OBJS)\advdll_animateg.obj \
|
||||
$(OBJS)\advdll_bmpcbox.obj \
|
||||
@@ -4503,8 +4510,7 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = \
|
||||
$(OBJS)\advdll_datectrl.obj \
|
||||
$(OBJS)\advdll_datetimectrl.obj \
|
||||
$(OBJS)\advdll_hyperlink.obj \
|
||||
$(OBJS)\advdll_timectrl.obj \
|
||||
$(OBJS)\advdll_activityindicator.obj
|
||||
$(OBJS)\advdll_timectrl.obj
|
||||
!endif
|
||||
!if "$(WXUNIV)" == "1"
|
||||
____ADVANCED_SRC_FILENAMES_2_OBJECTS = \
|
||||
@@ -4550,6 +4556,7 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = \
|
||||
$(OBJS)\advdll_sound.obj \
|
||||
$(OBJS)\advdll_taskbar.obj \
|
||||
$(OBJS)\advdll_notifmsgrt.obj \
|
||||
$(OBJS)\advdll_activityindicator.obj \
|
||||
$(OBJS)\advdll_joystick.obj \
|
||||
$(OBJS)\advdll_animateg.obj
|
||||
!endif
|
||||
@@ -4601,6 +4608,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \
|
||||
$(OBJS)\advlib_sound.obj \
|
||||
$(OBJS)\advlib_taskbar.obj \
|
||||
$(OBJS)\advlib_notifmsgrt.obj \
|
||||
$(OBJS)\advlib_activityindicator.obj \
|
||||
$(OBJS)\advlib_joystick.obj \
|
||||
$(OBJS)\advlib_animateg.obj \
|
||||
$(OBJS)\advlib_bmpcbox.obj \
|
||||
@@ -4610,8 +4618,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \
|
||||
$(OBJS)\advlib_datectrl.obj \
|
||||
$(OBJS)\advlib_datetimectrl.obj \
|
||||
$(OBJS)\advlib_hyperlink.obj \
|
||||
$(OBJS)\advlib_timectrl.obj \
|
||||
$(OBJS)\advlib_activityindicator.obj
|
||||
$(OBJS)\advlib_timectrl.obj
|
||||
!endif
|
||||
!if "$(WXUNIV)" == "1"
|
||||
____ADVANCED_SRC_FILENAMES_3_OBJECTS = \
|
||||
@@ -4657,6 +4664,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \
|
||||
$(OBJS)\advlib_sound.obj \
|
||||
$(OBJS)\advlib_taskbar.obj \
|
||||
$(OBJS)\advlib_notifmsgrt.obj \
|
||||
$(OBJS)\advlib_activityindicator.obj \
|
||||
$(OBJS)\advlib_joystick.obj \
|
||||
$(OBJS)\advlib_animateg.obj
|
||||
!endif
|
||||
@@ -7079,9 +7087,6 @@ $(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
|
||||
|
||||
@@ -8667,6 +8672,16 @@ $(OBJS)\monodll_xmlreshandler.obj: ..\..\src\xrc\xmlreshandler.cpp
|
||||
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xmlreshandler.cpp
|
||||
!endif
|
||||
|
||||
!if "$(USE_GUI)" == "1"
|
||||
$(OBJS)\monodll_activityindicator.obj: ..\..\src\generic\activityindicator.cpp
|
||||
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\activityindicator.cpp
|
||||
!endif
|
||||
|
||||
!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
|
||||
$(OBJS)\monodll_activityindicator.obj: ..\..\src\generic\activityindicator.cpp
|
||||
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\activityindicator.cpp
|
||||
!endif
|
||||
|
||||
!if "$(USE_GUI)" == "1"
|
||||
$(OBJS)\monodll_animatecmn.obj: ..\..\src\common\animatecmn.cpp
|
||||
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\animatecmn.cpp
|
||||
@@ -9607,9 +9622,6 @@ $(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
|
||||
|
||||
@@ -11195,6 +11207,16 @@ $(OBJS)\monolib_xmlreshandler.obj: ..\..\src\xrc\xmlreshandler.cpp
|
||||
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xmlreshandler.cpp
|
||||
!endif
|
||||
|
||||
!if "$(USE_GUI)" == "1"
|
||||
$(OBJS)\monolib_activityindicator.obj: ..\..\src\generic\activityindicator.cpp
|
||||
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\activityindicator.cpp
|
||||
!endif
|
||||
|
||||
!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
|
||||
$(OBJS)\monolib_activityindicator.obj: ..\..\src\generic\activityindicator.cpp
|
||||
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\activityindicator.cpp
|
||||
!endif
|
||||
|
||||
!if "$(USE_GUI)" == "1"
|
||||
$(OBJS)\monolib_animatecmn.obj: ..\..\src\common\animatecmn.cpp
|
||||
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\animatecmn.cpp
|
||||
@@ -12507,6 +12529,9 @@ $(OBJS)\coredll_topluniv.obj: ..\..\src\univ\topluniv.cpp
|
||||
$(OBJS)\coredll_winuniv.obj: ..\..\src\univ\winuniv.cpp
|
||||
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\winuniv.cpp
|
||||
|
||||
$(OBJS)\coredll_activityindicator.obj: ..\..\src\generic\activityindicator.cpp
|
||||
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\activityindicator.cpp
|
||||
|
||||
$(OBJS)\coredll_gtk.obj: ..\..\src\univ\themes\gtk.cpp
|
||||
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\themes\gtk.cpp
|
||||
|
||||
@@ -13981,6 +14006,9 @@ $(OBJS)\corelib_topluniv.obj: ..\..\src\univ\topluniv.cpp
|
||||
$(OBJS)\corelib_winuniv.obj: ..\..\src\univ\winuniv.cpp
|
||||
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\winuniv.cpp
|
||||
|
||||
$(OBJS)\corelib_activityindicator.obj: ..\..\src\generic\activityindicator.cpp
|
||||
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\activityindicator.cpp
|
||||
|
||||
$(OBJS)\corelib_gtk.obj: ..\..\src\univ\themes\gtk.cpp
|
||||
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\themes\gtk.cpp
|
||||
|
||||
@@ -15158,9 +15186,6 @@ $(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
|
||||
|
||||
@@ -15287,6 +15312,9 @@ $(OBJS)\advdll_taskbar.obj: ..\..\src\msw\taskbar.cpp
|
||||
$(OBJS)\advdll_notifmsgrt.obj: ..\..\src\msw\rt\notifmsgrt.cpp
|
||||
$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\rt\notifmsgrt.cpp
|
||||
|
||||
$(OBJS)\advdll_activityindicator.obj: ..\..\src\generic\activityindicator.cpp
|
||||
$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\activityindicator.cpp
|
||||
|
||||
$(OBJS)\advdll_joystick.obj: ..\..\src\msw\joystick.cpp
|
||||
$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\joystick.cpp
|
||||
|
||||
@@ -15320,9 +15348,6 @@ $(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
|
||||
|
||||
@@ -15449,6 +15474,9 @@ $(OBJS)\advlib_taskbar.obj: ..\..\src\msw\taskbar.cpp
|
||||
$(OBJS)\advlib_notifmsgrt.obj: ..\..\src\msw\rt\notifmsgrt.cpp
|
||||
$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\rt\notifmsgrt.cpp
|
||||
|
||||
$(OBJS)\advlib_activityindicator.obj: ..\..\src\generic\activityindicator.cpp
|
||||
$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\activityindicator.cpp
|
||||
|
||||
$(OBJS)\advlib_joystick.obj: ..\..\src\msw\joystick.cpp
|
||||
$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\joystick.cpp
|
||||
|
||||
|
||||
Reference in New Issue
Block a user