Derive wxButton from wxButtonBase.

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

diff --git a/include/wx/wxhtml.h b/include/wx/wxhtml.h
index f8082a7aaa83f2b54566b7f6e241e545d0761f14..f1311201b7ead8e1bc9ea2a5bcb34ea6d10b2842 100644 (file)
--- a/include/wx/wxhtml.h
+++ b/include/wx/wxhtml.h
@@ -2,26 +2,25 @@
 // Name:        wxhtml.h
 // Purpose:     wxHTML library for wxWindows
 // Author:      Vaclav Slavik
+// RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vaclav Slavik
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __WXHTML_H__
-#define __WXHTML_H__
+#ifndef _WX_HTML_H_
+#define _WX_HTML_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface
 #endif
 
-
-#include <wx/html/version.h>
-#include <wx/html/htmldefs.h>
-#include <wx/html/htmltag.h>
-#include <wx/html/htmlcell.h>
-#include <wx/html/htmlparser.h>
-#include <wx/html/htmlwin.h>
-#include <wx/html/htmlwinparser.h>
-#include <wx/filesys.h>
-#include <wx/html/htmlhelp.h>
+#include "wx/html/htmldefs.h"
+#include "wx/html/htmltag.h"
+#include "wx/html/htmlcell.h"
+#include "wx/html/htmlpars.h"
+#include "wx/html/htmlwin.h"
+#include "wx/html/winpars.h"
+#include "wx/filesys.h"
+#include "wx/html/helpctrl.h"
 
 #endif // __WXHTML_H__