Don't define __STRICT_ANSI__, we should build both with and without it.

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

diff --git a/include/wx/xrc/xmlreshandler.h b/include/wx/xrc/xmlreshandler.h
index d0ad233519fcad5a030186c3ed443996f9234826..7aa12b7bc6fe006c6f38ae72db92d3e492ee593c 100644 (file)
--- a/include/wx/xrc/xmlreshandler.h
+++ b/include/wx/xrc/xmlreshandler.h
@@ -20,6 +20,7 @@
 #include "wx/colour.h"
 #include "wx/filesys.h"
 #include "wx/imaglist.h"
 #include "wx/colour.h"
 #include "wx/filesys.h"
 #include "wx/imaglist.h"

+#include "wx/window.h"

 
 class WXDLLIMPEXP_FWD_ADV wxAnimation;
 
 
 class WXDLLIMPEXP_FWD_ADV wxAnimation;
 


@@ -130,6 +131,12 @@ public:
     // it, SetImpl() needs to be called as done by wxXmlResource::AddHandler().
     wxXmlResourceHandler()
     {
     // 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;
     }
 
         m_impl = NULL;
     }
 


@@ -184,15 +191,15 @@ protected:
     // Everything else is simply forwarded to wxXmlResourceHandlerImpl.
     void ReportError(wxXmlNode *context, const wxString& message)
     {
     // 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)
     {
     }
     void ReportError(const wxString& message)
     {

-        return GetImpl()->ReportError(message);
+        GetImpl()->ReportError(message);

     }
     void ReportParamError(const wxString& param, const wxString& 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
     }
 
     bool IsOfClass(wxXmlNode *node, const wxString& classname) const


@@ -353,6 +360,15 @@ protected:
     wxWindow *m_parentAsWindow;
     wxXmlResource *m_resource;
 
     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;
 
     wxArrayString m_styleNames;
     wxArrayInt m_styleValues;