Break implicit dependency of "core" on "adv" via wxXmlResourceHandlerImplBase.
wxXmlResourceHandlerImplBase::GetAnimation() returned wxAnimation by value which created references to wxAnimationCtrlNameStr and wxNullAnimation symbols, defined in the "adv" library, in "core" when using Sun CC even though they were not referenced directly. Fix this by returning wxAnimation by pointer to keep it opaque for "core" code. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72782 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -18,10 +18,11 @@
|
||||
#include "wx/string.h"
|
||||
#include "wx/artprov.h"
|
||||
#include "wx/colour.h"
|
||||
#include "wx/animate.h"
|
||||
#include "wx/filesys.h"
|
||||
#include "wx/imaglist.h"
|
||||
|
||||
class WXDLLIMPEXP_FWD_ADV wxAnimation;
|
||||
|
||||
class WXDLLIMPEXP_FWD_XML wxXmlNode;
|
||||
class WXDLLIMPEXP_FWD_XML wxXmlResource;
|
||||
|
||||
@@ -87,7 +88,7 @@ public:
|
||||
virtual wxImageList *GetImageList(const wxString& param = wxT("imagelist")) = 0;
|
||||
|
||||
#if wxUSE_ANIMATIONCTRL
|
||||
virtual wxAnimation GetAnimation(const wxString& param = wxT("animation")) = 0;
|
||||
virtual wxAnimation* GetAnimation(const wxString& param = wxT("animation")) = 0;
|
||||
#endif
|
||||
|
||||
virtual wxFont GetFont(const wxString& param = wxT("font"), wxWindow* parent = NULL) = 0;
|
||||
@@ -305,7 +306,7 @@ protected:
|
||||
}
|
||||
|
||||
#if wxUSE_ANIMATIONCTRL
|
||||
wxAnimation GetAnimation(const wxString& param = wxT("animation"))
|
||||
wxAnimation* GetAnimation(const wxString& param = wxT("animation"))
|
||||
{
|
||||
return GetImpl()->GetAnimation(param);
|
||||
}
|
||||
|
Reference in New Issue
Block a user