Animation support added to XRC

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42223 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/wxPython/src/_xmlhandler.i b/wxPython/src/_xmlhandler.i
index 9ae1038f410671535eb207b5e46ccb1051d8ad33..984508ed0d77b5a70af2b80aa4ffb0fa506607b7 100644 (file)
--- a/wxPython/src/_xmlhandler.i
+++ b/wxPython/src/_xmlhandler.i
@@ -105,6 +105,9 @@ public:
                    wxSize size = wxDefaultSize)
         { return wxXmlResourceHandler::GetIcon(param, defaultArtClient, size); }
 
+    wxAnimation GetAnimation(const wxString& param = wxT("animation"))
+        { return wxXmlResourceHandler::GetAnimation(param); }
+
     wxFont GetFont(const wxString& param = wxT("font"))
         { return wxXmlResourceHandler::GetFont(param); }
 
@@ -243,6 +246,9 @@ public:
     // Gets a font.
     wxFont GetFont(const wxString& param = wxPyFontString);
 
+    // Gets an animation.
+    wxAnimation GetAnimation(const wxString& param = wxPyAnimationString);
+
     // Sets common window options.
     void SetupWindow(wxWindow *wnd);
 

diff --git a/wxPython/src/_xmlres.i b/wxPython/src/_xmlres.i
index 4d007b8786143aab424e39465d448761e32b74b6..ba07720eea38b725a5578869f8a96ea121c55118 100644 (file)
--- a/wxPython/src/_xmlres.i
+++ b/wxPython/src/_xmlres.i
@@ -63,7 +63,8 @@ public:
     
     ~wxXmlResource();
 
-
+    //wxXmlNode* GetFirstRoot();  ** Link error
+    
     // Loads resources from XML files that match given filemask.
     // This method understands VFS (see filesys.h).
     bool Load(const wxString& filemask);

diff --git a/wxPython/src/xrc.i b/wxPython/src/xrc.i
index 33498ed448bc010fe7701c47e382b5322d9de3be..7bb7f617c2dfc8060942d67906788299041f4d2f 100644 (file)
--- a/wxPython/src/xrc.i
+++ b/wxPython/src/xrc.i
@@ -35,14 +35,14 @@ controls on a panel, etc. to be loaded from an XML file."
 
 
 MAKE_CONST_WXSTRING_NOSWIG(EmptyString);
-MAKE_CONST_WXSTRING2(UTF8String,   wxT("UTF-8"));
-MAKE_CONST_WXSTRING2(StyleString,  wxT("style"));
-MAKE_CONST_WXSTRING2(SizeString,   wxT("size"));
-MAKE_CONST_WXSTRING2(PosString,    wxT("pos"));
-MAKE_CONST_WXSTRING2(BitmapString, wxT("bitmap"));
-MAKE_CONST_WXSTRING2(IconString,   wxT("icon"));
-MAKE_CONST_WXSTRING2(FontString,   wxT("font"));
-
+MAKE_CONST_WXSTRING2(UTF8String,       wxT("UTF-8"));
+MAKE_CONST_WXSTRING2(StyleString,      wxT("style"));
+MAKE_CONST_WXSTRING2(SizeString,       wxT("size"));
+MAKE_CONST_WXSTRING2(PosString,        wxT("pos"));
+MAKE_CONST_WXSTRING2(BitmapString,     wxT("bitmap"));
+MAKE_CONST_WXSTRING2(IconString,       wxT("icon"));
+MAKE_CONST_WXSTRING2(FontString,       wxT("font"));
+MAKE_CONST_WXSTRING2(AnimationString,  wxT("animation"));
 
 
 // Include all the files that make up this module