don't define operator<<(ostream&, wxString) at all if it's already defined in the...

[wxWidgets.git] / include / wx / helphtml.h

diff --git a/include/wx/helphtml.h b/include/wx/helphtml.h
index 345c71cac062a1ba48d312462eb62fa4dd0af716..b4fae9b7aebb5fec88975326f583eb38a92c652b 100644 (file)
--- a/include/wx/helphtml.h
+++ b/include/wx/helphtml.h
@@ -1,7 +1,20 @@
-#ifndef __HELPHTMLH_BASE__
-#define __HELPHTMLH_BASE__
+/////////////////////////////////////////////////////////////////////////////
+// Name:        helphtml.h
+// Purpose:     Includes wx/html/helpctrl.h, for wxHtmlHelpController.
+// Author:      Julian Smart
+// Modified by:
+// Created:     2003-05-24
+// RCS-ID:      $Id$
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
 
-#include "wx/generic/helphtml.h"
+#ifndef __WX_HELPHTML_H_
+#define __WX_HELPHTML_H_
 
+#if wxUSE_WXHTML_HELP
+#include "wx/html/helpctrl.h"
 #endif
-    // __HELPHTMLH_BASE__
+
+#endif // __WX_HELPHTML_H_
+