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 3934a459902331214b3a6b950f8393b65f760a54..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$
 // Purpose:     wxHtml module for parsing <style> tag
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$


@@ -9,14 +9,13 @@
 
 #include "wx/wxprec.h"
 
 
 #include "wx/wxprec.h"
 

-#include "wx/defs.h"
-#if wxUSE_HTML && wxUSE_STREAMS
-

 #ifdef __BORLANDC__
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #endif
 

-#ifndef WXPRECOMP
+#if wxUSE_HTML && wxUSE_STREAMS
+
+#ifndef WX_PRECOMP

 #endif
 
 #include "wx/html/forcelnk.h"
 #endif
 
 #include "wx/html/forcelnk.h"