reset m_selection in DeleteAllPages() (patch 1922215); some cleanup of DoRemovePage...

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

diff --git a/include/wx/xrc/xh_html.h b/include/wx/xrc/xh_html.h
index 5879d3c76c1dd871e49691386ed6de9134da7e21..1f94fcf8c3baaaf924c72daa9ae2fd798e0e8b06 100644 (file)
--- a/include/wx/xrc/xh_html.h
+++ b/include/wx/xrc/xh_html.h
@@ -13,19 +13,18 @@
 
 #include "wx/xrc/xmlres.h"
 
 
 #include "wx/xrc/xmlres.h"
 

-#include "wx/defs.h"
-
-#if wxUSE_HTML
+#if wxUSE_XRC && wxUSE_HTML

 
 class WXDLLIMPEXP_XRC wxHtmlWindowXmlHandler : public wxXmlResourceHandler
 {
 
 class WXDLLIMPEXP_XRC wxHtmlWindowXmlHandler : public wxXmlResourceHandler
 {

-DECLARE_DYNAMIC_CLASS(wxHtmlWindowXmlHandler)
+    DECLARE_DYNAMIC_CLASS(wxHtmlWindowXmlHandler)
+

 public:
     wxHtmlWindowXmlHandler();
     virtual wxObject *DoCreateResource();
     virtual bool CanHandle(wxXmlNode *node);
 };
 
 public:
     wxHtmlWindowXmlHandler();
     virtual wxObject *DoCreateResource();
     virtual bool CanHandle(wxXmlNode *node);
 };
 

-#endif
+#endif // wxUSE_XRC && wxUSE_HTML

 
 

-#endif // _WX_XH_SLIDER_H_
+#endif // _WX_XH_HTML_H_