reverted my Set/getTitle change

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

diff --git a/include/wx/wxhtml.h b/include/wx/wxhtml.h
index 718eb1f169c96448d1dfea8a343678634158e58b..2489dbc0e35a738f9606439d2a5847ac8506181e 100644 (file)
--- a/include/wx/wxhtml.h
+++ b/include/wx/wxhtml.h
@@ -2,12 +2,13 @@
 // Name:        wxhtml.h
 // Purpose:     wxHTML library for wxWindows
 // Author:      Vaclav Slavik
 // Name:        wxhtml.h
 // Purpose:     wxHTML library for wxWindows
 // Author:      Vaclav Slavik

+// RCS-ID:      $Id$

 // Copyright:   (c) 1999 Vaclav Slavik
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Copyright:   (c) 1999 Vaclav Slavik
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __WXHTML_H__
-#define __WXHTML_H__
+#ifndef _WX_HTML_H_
+#define _WX_HTML_H_

 
 #ifdef __GNUG__
 #pragma interface
 
 #ifdef __GNUG__
 #pragma interface


@@ -17,10 +18,10 @@
 #include <wx/html/htmldefs.h>
 #include <wx/html/htmltag.h>
 #include <wx/html/htmlcell.h>
 #include <wx/html/htmldefs.h>
 #include <wx/html/htmltag.h>
 #include <wx/html/htmlcell.h>

-#include <wx/html/htmlparser.h>
+#include <wx/html/htmlpars.h>

 #include <wx/html/htmlwin.h>
 #include <wx/html/htmlwin.h>

-#include <wx/html/htmlwinparser.h>
+#include <wx/html/winpars.h>

 #include <wx/filesys.h>
 #include <wx/filesys.h>

-#include <wx/html/htmlhelp.h>
+#include <wx/html/helpctrl.h>

 
 #endif // __WXHTML_H__
 
 #endif // __WXHTML_H__