projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix compilation in !wxUSE_MENUS case.
[wxWidgets.git]
/
src
/
xrc
/
xh_animatctrl.cpp
diff --git
a/src/xrc/xh_animatctrl.cpp
b/src/xrc/xh_animatctrl.cpp
index 78e53e09d0ede32ac775214b660beb73981c82c9..b912f1b92bbbd4ddd9fbf03f2df0277c5439e758 100644
(file)
--- a/
src/xrc/xh_animatctrl.cpp
+++ b/
src/xrc/xh_animatctrl.cpp
@@
-19,6
+19,7
@@
#include "wx/xrc/xh_animatctrl.h"
#include "wx/animate.h"
#include "wx/xrc/xh_animatctrl.h"
#include "wx/animate.h"
+#include "wx/scopedptr.h"
IMPLEMENT_DYNAMIC_CLASS(wxAnimationCtrlXmlHandler, wxXmlResourceHandler)
IMPLEMENT_DYNAMIC_CLASS(wxAnimationCtrlXmlHandler, wxXmlResourceHandler)
@@
-33,11
+34,13
@@
wxObject *wxAnimationCtrlXmlHandler::DoCreateResource()
{
XRC_MAKE_INSTANCE(ctrl, wxAnimationCtrl)
{
XRC_MAKE_INSTANCE(ctrl, wxAnimationCtrl)
+ wxScopedPtr<wxAnimation> animation(GetAnimation(wxT("animation")));
+
ctrl->Create(m_parentAsWindow,
GetID(),
ctrl->Create(m_parentAsWindow,
GetID(),
-
GetAnimation(wxT("animation"))
,
+
animation ? *animation : wxNullAnimation
,
GetPosition(), GetSize(),
GetPosition(), GetSize(),
- GetStyle(
_
T("style"), wxAC_DEFAULT_STYLE),
+ GetStyle(
wx
T("style"), wxAC_DEFAULT_STYLE),
GetName());
// if no inactive-bitmap has been provided, GetBitmap() will return wxNullBitmap
GetName());
// if no inactive-bitmap has been provided, GetBitmap() will return wxNullBitmap