Fix wxPropertyGrid::GetPropertyRect when the last item is collapsed.

[wxWidgets.git] / include / wx / xrc / xmlreshandler.h

diff --git a/include/wx/xrc/xmlreshandler.h b/include/wx/xrc/xmlreshandler.h
index 46eb374c185e521e43286b4711539071db92496b..7aa12b7bc6fe006c6f38ae72db92d3e492ee593c 100644 (file)
--- a/include/wx/xrc/xmlreshandler.h
+++ b/include/wx/xrc/xmlreshandler.h
@@ -18,9 +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"
+#include "wx/window.h"
+
+class WXDLLIMPEXP_FWD_ADV wxAnimation;
 
 class WXDLLIMPEXP_FWD_XML wxXmlNode;
 class WXDLLIMPEXP_FWD_XML wxXmlResource;
@@ -87,7 +89,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;
@@ -129,6 +131,12 @@ public:
     // it, SetImpl() needs to be called as done by wxXmlResource::AddHandler().
     wxXmlResourceHandler()
     {
+        m_node = NULL;
+        m_parent =
+        m_instance = NULL;
+        m_parentAsWindow = NULL;
+        m_resource = NULL;
+
         m_impl = NULL;
     }
 
@@ -183,15 +191,15 @@ protected:
     // Everything else is simply forwarded to wxXmlResourceHandlerImpl.
     void ReportError(wxXmlNode *context, const wxString& message)
     {
-        return GetImpl()->ReportError(context, message);
+        GetImpl()->ReportError(context, message);
     }
     void ReportError(const wxString& message)
     {
-        return GetImpl()->ReportError(message);
+        GetImpl()->ReportError(message);
     }
     void ReportParamError(const wxString& param, const wxString& message)
     {
-        return GetImpl()->ReportParamError(param, message);
+        GetImpl()->ReportParamError(param, message);
     }
 
     bool IsOfClass(wxXmlNode *node, const wxString& classname) const
@@ -305,7 +313,7 @@ protected:
     }
 
 #if wxUSE_ANIMATIONCTRL
-    wxAnimation GetAnimation(const wxString& param = wxT("animation"))
+    wxAnimation* GetAnimation(const wxString& param = wxT("animation"))
     {
         return GetImpl()->GetAnimation(param);
     }
@@ -352,6 +360,15 @@ protected:
     wxWindow *m_parentAsWindow;
     wxXmlResource *m_resource;
 
+    // provide method access to those member variables
+    wxXmlResource* GetResource() const        { return m_resource; }
+    wxXmlNode* GetNode() const                { return m_node; }
+    wxString GetClass() const                 { return m_class; }
+    wxObject* GetParent() const               { return m_parent; }
+    wxObject* GetInstance() const             { return m_instance; }
+    wxWindow* GetParentAsWindow() const       { return m_parentAsWindow; }
+
+    
     wxArrayString m_styleNames;
     wxArrayInt m_styleValues;