wxControl::SetLabel no longer strips out codes so do it here

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

diff --git a/src/common/imagpnm.cpp b/src/common/imagpnm.cpp
index a7775d2a29662d16404a5c2ad5ad4dcf7fc44915..86884d7d09f487f2fb7a791fb88a329860ebef63 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$
@@ -7,10 +7,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "imagpnm.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -19,7 +15,6 @@
 #endif
 
 #ifndef WX_PRECOMP
-#  include "wx/setup.h"
 #endif
 
 #if wxUSE_IMAGE && wxUSE_PNM
@@ -172,10 +167,12 @@ bool wxPNMHandler::DoCanRead( wxInputStream& stream )
 
     if ( stream.GetC() == 'P' )
     {
-        switch (stream.GetC())
+        switch ( stream.GetC() )
         {
-            case '3':
-            case '6':
+            case '2': // ASCII Grey
+            case '3': // ASCII RGB
+            case '5': // RAW Grey
+            case '6': // RAW RGB
                 return true;
         }
     }