Implemented forceTrueColour in SetBestVisual.

[wxWidgets.git] / src / common / imagpnm.cpp

diff --git a/src/common/imagpnm.cpp b/src/common/imagpnm.cpp
index aaa30aec58a52af69307b3d94161e6ea0fffa5e4..4c1a6205c9fc967041cd44d17c69c7960af090e3 100644 (file)
--- a/src/common/imagpnm.cpp
+++ b/src/common/imagpnm.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        imagpnm.cpp
+// Name:        src/common/imagpnm.cpp

 // Purpose:     wxImage PNM handler
 // Author:      Sylvain Bougnoux
 // RCS-ID:      $Id$
 // Purpose:     wxImage PNM handler
 // Author:      Sylvain Bougnoux
 // RCS-ID:      $Id$


@@ -11,18 +11,18 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#  include "wx/setup.h"
+    #pragma hdrstop

 #endif
 
 #if wxUSE_IMAGE && wxUSE_PNM
 
 #include "wx/imagpnm.h"
 #endif
 
 #if wxUSE_IMAGE && wxUSE_PNM
 
 #include "wx/imagpnm.h"

-#include "wx/log.h"
-#include "wx/intl.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/intl.h"
+    #include "wx/log.h"
+#endif
+

 #include "wx/txtstrm.h"
 
 //-----------------------------------------------------------------------------
 #include "wx/txtstrm.h"
 
 //-----------------------------------------------------------------------------


@@ -184,4 +184,4 @@ bool wxPNMHandler::DoCanRead( wxInputStream& stream )
 
 #endif // wxUSE_STREAMS
 
 
 #endif // wxUSE_STREAMS
 

-#endif // wxUSE_PNM
+#endif // wxUSE_IMAGE && wxUSE_PNM