change wxImage::InitAllHandlers to wxInitAllImageHandlers and put it in a separate...

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

diff --git a/src/common/imagpnm.cpp b/src/common/imagpnm.cpp
index d2200424336037cc4d162f5c83721cab5bdc7dbb..28bf08eba303e2b2d3cc18d26f7631a6cd4b7273 100644 (file)
--- a/src/common/imagpnm.cpp
+++ b/src/common/imagpnm.cpp
@@ -19,15 +19,15 @@
 #pragma hdrstop
 #endif
 
-#include "wx/image.h"
-#include "wx/log.h"
-#include "wx/txtstrm.h"
+#ifndef WX_PRECOMP
+#  include "wx/setup.h"
+#endif
 
 #if wxUSE_PNM
 
-#ifdef __WXMSW__
-#include <windows.h>
-#endif
+#include "wx/image.h"
+#include "wx/log.h"
+#include "wx/txtstrm.h"
 
 //-----------------------------------------------------------------------------
 // wxBMPHandler
@@ -39,8 +39,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxPNMHandler,wxImageHandler)
 
 #if wxUSE_STREAMS
 
-//#include <stream.h> // for cout
-
 void Skip_Comment(wxInputStream &stream)
 {
   wxString line;
@@ -161,4 +159,3 @@ bool wxPNMHandler::CanRead( wxInputStream& stream )
 #endif // wxUSE_STREAMS
 
 #endif // wxUSE_PNM
-