Don't take hidden wxGrid row/columns into account when auto-sizing.

[wxWidgets.git] / src / xrc / xmladv.cpp

diff --git a/src/xrc/xmladv.cpp b/src/xrc/xmladv.cpp
index 5087147e2fefed94c0c7ce09775ef97ac71f0ca5..d1a057c92e824d22e80140d0e9c100d5791d8757 100644 (file)
--- a/src/xrc/xmladv.cpp
+++ b/src/xrc/xmladv.cpp
@@ -5,7 +5,6 @@
 //              linking wxAdv even if the latter is not used at all.
 // Author:      Vadim Zeitlin (extracted from src/xrc/xmlres.cpp)
 // Created:     2008-08-02
 //              linking wxAdv even if the latter is not used at all.
 // Author:      Vadim Zeitlin (extracted from src/xrc/xmlres.cpp)
 // Created:     2008-08-02

-// RCS-ID:      $Id$

 // Copyright:   (c) 2000 Vaclav Slavik
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2000 Vaclav Slavik
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////


@@ -33,42 +32,45 @@
     #include "wx/log.h"
 #endif // WX_PRECOMP
 
     #include "wx/log.h"
 #endif // WX_PRECOMP
 

+#include "wx/animate.h"
+#include "wx/scopedptr.h"
+

 // ============================================================================
 // implementation
 // ============================================================================
 
 #if wxUSE_ANIMATIONCTRL
 // ============================================================================
 // implementation
 // ============================================================================
 
 #if wxUSE_ANIMATIONCTRL

-wxAnimation wxXmlResourceHandler::GetAnimation(const wxString& param)
+wxAnimation* wxXmlResourceHandlerImpl::GetAnimation(const wxString& param)

 {
     const wxString name = GetParamValue(param);
     if ( name.empty() )
 {
     const wxString name = GetParamValue(param);
     if ( name.empty() )

-        return wxNullAnimation;
+        return NULL;

 
     // load the animation from file
 
     // load the animation from file

-    wxAnimation ani;
+    wxScopedPtr<wxAnimation> ani(new wxAnimation);

 #if wxUSE_FILESYSTEM
     wxFSFile * const
         fsfile = GetCurFileSystem().OpenFile(name, wxFS_READ | wxFS_SEEKABLE);
     if ( fsfile )
     {
 #if wxUSE_FILESYSTEM
     wxFSFile * const
         fsfile = GetCurFileSystem().OpenFile(name, wxFS_READ | wxFS_SEEKABLE);
     if ( fsfile )
     {

-        ani.Load(*fsfile->GetStream());
+        ani->Load(*fsfile->GetStream());

         delete fsfile;
     }
 #else
         delete fsfile;
     }
 #else

-    ani.LoadFile(name);
+    ani->LoadFile(name);

 #endif
 
 #endif
 

-    if ( !ani.IsOk() )
+    if ( !ani->IsOk() )

     {
         ReportParamError
         (
             param,
             wxString::Format("cannot create animation from \"%s\"", name)
         );
     {
         ReportParamError
         (
             param,
             wxString::Format("cannot create animation from \"%s\"", name)
         );

-        return wxNullAnimation;
+        return NULL;

     }
 
     }
 

-    return ani;
+    return ani.release();

 }
 #endif // wxUSE_ANIMATIONCTRL
 
 }
 #endif // wxUSE_ANIMATIONCTRL