From fee4387c6974c756c3f3988b1d075c20430161b7 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 4 Aug 2014 18:56:59 +0000 Subject: [PATCH] Take into account wxAnimationCtrl "animation" property in wxrc. The files used as the values of this property need to be included in the generated file too. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@77004 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- docs/changes.txt | 1 + utils/wxrc/wxrc.cpp | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/docs/changes.txt b/docs/changes.txt index e6f88718d8..3afd5dd051 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -637,6 +637,7 @@ All (GUI): - Fix handling of custom colours in wxPropertyGrid choices (Artur Wieczorek). - Add "hint" property to wxTextCtrl XRC handler. - Allow using wxALIGN_CENTER, and not just CENTRE, in XRC for wxStaticText. +- Handle files used in wxAnimationCtrl "animation" property in wxrc. wxGTK: diff --git a/utils/wxrc/wxrc.cpp b/utils/wxrc/wxrc.cpp index fc522790b2..3f7a7a1384 100644 --- a/utils/wxrc/wxrc.cpp +++ b/utils/wxrc/wxrc.cpp @@ -495,6 +495,10 @@ static bool NodeContainsFilename(wxXmlNode *node) return true; } + // wxAnimationCtrl animations: + if ( name == wxS("animation") ) + return true; + // URLs in wxHtmlWindow: if ( name == wxT("url") && parent != NULL &&