activating DrawRectangle optimization

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

diff --git a/include/wx/xrc/xmlreshandler.h b/include/wx/xrc/xmlreshandler.h
index 46eb374c185e521e43286b4711539071db92496b..7c7f3fece39fd12ae03509ea6b14267a3d964d50 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/string.h"
 #include "wx/artprov.h"
 #include "wx/colour.h"

-#include "wx/animate.h"

 #include "wx/filesys.h"
 #include "wx/imaglist.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;
 
 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 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;
 #endif
 
     virtual wxFont GetFont(const wxString& param = wxT("font"), wxWindow* parent = NULL) = 0;


@@ -183,15 +185,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


@@ -305,7 +307,7 @@ protected:
     }
 
 #if wxUSE_ANIMATIONCTRL
     }
 
 #if wxUSE_ANIMATIONCTRL

-    wxAnimation GetAnimation(const wxString& param = wxT("animation"))
+    wxAnimation* GetAnimation(const wxString& param = wxT("animation"))

     {
         return GetImpl()->GetAnimation(param);
     }
     {
         return GetImpl()->GetAnimation(param);
     }