Added wxUSE_MENUS_NATIVE wrapper around DoPopupMenu to match header

[wxWidgets.git] / src / html / m_style.cpp

diff --git a/src/html/m_style.cpp b/src/html/m_style.cpp
index 9913b8370367922915e0ac11f03baad995643c34..f5622376cf7e58e1a5b531848b71bf36dcfe7457 100644 (file)
--- a/src/html/m_style.cpp
+++ b/src/html/m_style.cpp
@@ -4,10 +4,10 @@
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
 // Copyright:   (c) 2002 Vaclav Slavik
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
 // Copyright:   (c) 2002 Vaclav Slavik

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

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

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

 #pragma implementation
 #endif
 
 #pragma implementation
 #endif
 


@@ -31,12 +31,13 @@ FORCE_LINK_ME(m_style)
 
 
 TAG_HANDLER_BEGIN(STYLE, "STYLE")
 
 
 TAG_HANDLER_BEGIN(STYLE, "STYLE")

+    TAG_HANDLER_CONSTR(STYLE) { }

 
     TAG_HANDLER_PROC(WXUNUSED(tag))
     {
         // VS: Ignore styles for now. We must have this handler present,
         //     because CSS style text would be rendered verbatim otherwise
 
     TAG_HANDLER_PROC(WXUNUSED(tag))
     {
         // VS: Ignore styles for now. We must have this handler present,
         //     because CSS style text would be rendered verbatim otherwise

-        return TRUE;
+        return true;

     }
 
 TAG_HANDLER_END(STYLE)
     }
 
 TAG_HANDLER_END(STYLE)