Merge in from trunk r64802 - r68625

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

diff --git a/src/html/m_style.cpp b/src/html/m_style.cpp
index 463c4ddc85fdd4bebe9d702e3b4bac62bbe519f0..4002438bed05e17a87db86f7953d2a80dd5dae60 100644 (file)
--- a/src/html/m_style.cpp
+++ b/src/html/m_style.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        m_style.cpp
+// Name:        src/html/m_style.cpp
 // Purpose:     wxHtml module for parsing <style> tag
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
@@ -7,21 +7,15 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation
-#endif
-
 #include "wx/wxprec.h"
 
-
-#include "wx/defs.h"
-#if wxUSE_HTML && wxUSE_STREAMS
-
 #ifdef __BORLANDC__
-#pragma hdrstop
+    #pragma hdrstop
 #endif
 
-#ifndef WXPRECOMP
+#if wxUSE_HTML && wxUSE_STREAMS
+
+#ifndef WX_PRECOMP
 #endif
 
 #include "wx/html/forcelnk.h"
@@ -37,7 +31,7 @@ TAG_HANDLER_BEGIN(STYLE, "STYLE")
     {
         // 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)