Renamed HasChildren() to IsContainer(), added GetParent() to wxDataViewModel

[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 12db27088846b57eb7b66239b547f4830a510fc1..1f94fcf8c3baaaf924c72daa9ae2fd798e0e8b06 100644 (file)
--- a/include/wx/xrc/xh_html.h
+++ b/include/wx/xrc/xh_html.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        xh_html.h
+// Name:        wx/xrc/xh_html.h
 // Purpose:     XML resource handler for wxHtmlWindow
 // Author:      Bob Mitchell
 // Created:     2000/03/21
@@ -11,25 +11,20 @@
 #ifndef _WX_XH_HTML_H_
 #define _WX_XH_HTML_H_
 
-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma interface "xh_html.h"
-#endif
-
 #include "wx/xrc/xmlres.h"
 
-#include "wx/defs.h"
-
-#if wxUSE_HTML
+#if wxUSE_XRC && wxUSE_HTML
 
-class WXXMLDLLEXPORT 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);
 };
 
-#endif
+#endif // wxUSE_XRC && wxUSE_HTML
 
-#endif // _WX_XH_SLIDER_H_
+#endif // _WX_XH_HTML_H_