Get rid of inline C compatibility methods

[wxWidgets.git] / include / wx / html / htmlpars.h

diff --git a/include/wx/html/htmlpars.h b/include/wx/html/htmlpars.h
index bebe5ec47eab4b6bfa2dd4504a4591944430179e..29b41ec567bd94cf482746cb9e3bd437a074562a 100644 (file)
--- a/include/wx/html/htmlpars.h
+++ b/include/wx/html/htmlpars.h
@@ -4,14 +4,14 @@
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vaclav Slavik
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vaclav Slavik

-// Licence:     wxWindows Licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 
 #ifndef _WX_HTMLPARS_H_
 #define _WX_HTMLPARS_H_
 
 /////////////////////////////////////////////////////////////////////////////
 
 
 #ifndef _WX_HTMLPARS_H_
 #define _WX_HTMLPARS_H_
 

-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma interface "htmlpars.h"
 #endif
 
 #pragma interface "htmlpars.h"
 #endif
 


@@ -125,6 +125,9 @@ public:
     // if present. Returns empty string if the tag is missing.
     // For wxHTML's internal use.
     static wxString ExtractCharsetInformation(const wxString& markup);
     // if present. Returns empty string if the tag is missing.
     // For wxHTML's internal use.
     static wxString ExtractCharsetInformation(const wxString& markup);

+    
+    // Returns entity parser object, used to substitute HTML &entities;
+    wxHtmlEntitiesParser *GetEntitiesParser() const { return m_entitiesParser; }

 
 protected:
     // DOM structure
 
 protected:
     // DOM structure


@@ -147,9 +150,6 @@ protected:
     // ignored if no hander is found.
     // Derived class is *responsible* for filling in m_Handlers table.
     virtual void AddTag(const wxHtmlTag& tag);
     // ignored if no hander is found.
     // Derived class is *responsible* for filling in m_Handlers table.
     virtual void AddTag(const wxHtmlTag& tag);

-    
-    // Returns entity parser object, used to substitute HTML &entities;
-    wxHtmlEntitiesParser *GetEntitiesParser() const { return m_entitiesParser; }

 
 protected:
     // DOM tree:
 
 protected:
     // DOM tree: