replaced T() makro with wxT() due to namespace probs, _T() exists, too

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

diff --git a/src/common/imagpnm.cpp b/src/common/imagpnm.cpp
index d50e4247a23450d1619c4dfa6c6f92fe421c1803..d29174929cb03384f20ef00a3630d1bd43fa5c47 100644 (file)
--- a/src/common/imagpnm.cpp
+++ b/src/common/imagpnm.cpp
@@ -23,7 +23,7 @@
 #  include "wx/setup.h"
 #endif
 
-#if wxUSE_STREAMS && wxUSE_PNM
+#if wxUSE_PNM
 
 #include "wx/image.h"
 #include "wx/log.h"
@@ -37,13 +37,14 @@
 IMPLEMENT_DYNAMIC_CLASS(wxPNMHandler,wxImageHandler)
 #endif
 
+#if wxUSE_STREAMS
 
 void Skip_Comment(wxInputStream &stream)
 {
   wxString line;
   wxTextInputStream text_stream(stream);
 
-  if (stream.Peek()==_T('#')) 
+  if (stream.Peek()==wxT('#')) 
     {
       text_stream >> line;
       Skip_Comment(stream);
@@ -67,19 +68,19 @@ bool wxPNMHandler::LoadFile( wxImage *image, wxInputStream& stream, bool WXUNUSE
     wxTextInputStream text_stream(buf_stream);
 
     Skip_Comment(buf_stream);
-    if (buf_stream.GetC()==_T('P')) c=buf_stream.GetC();
+    if (buf_stream.GetC()==wxT('P')) c=buf_stream.GetC();
 
     switch (c)
       {
-      case _T('2'):
-       wxLogError(_T("Loading Grey Ascii PNM image is not yet implemented."));
+      case wxT('2'):
+       wxLogError(wxT("Loading Grey Ascii PNM image is not yet implemented."));
        return FALSE;
-      case _T('5'):
-       wxLogError(_T("Loading Grey Raw PNM image is not yet implemented."));
+      case wxT('5'):
+       wxLogError(wxT("Loading Grey Raw PNM image is not yet implemented."));
        return FALSE;
-      case _T('3'): case _T('6'): break;
+      case wxT('3'): case wxT('6'): break;
        default :
-       wxLogError(_T("Loading PNM image : file not recognized."));
+       wxLogError(wxT("Loading PNM image : file not recognized."));
        return FALSE;
       }
 
@@ -94,7 +95,7 @@ bool wxPNMHandler::LoadFile( wxImage *image, wxInputStream& stream, bool WXUNUSE
     unsigned char *ptr = image->GetData();
     if (!ptr)
     {
-        wxLogError( _T("Cannot allocate RAM for RGB data in PNM file.") );
+        wxLogError( wxT("Cannot allocate RAM for RGB data in PNM file.") );
        return FALSE;
     }
 
@@ -110,7 +111,7 @@ bool wxPNMHandler::LoadFile( wxImage *image, wxInputStream& stream, bool WXUNUSE
 
            if (buf_stream.LastError()!=wxSTREAM_NOERROR)
              {
-               wxLogError(_T("Loading PNM image : file seems truncated."));
+               wxLogError(wxT("Loading PNM image : file seems truncated."));
                return FALSE;
              }
          }
@@ -142,10 +143,10 @@ bool wxPNMHandler::CanRead( wxInputStream& stream )
 
     Skip_Comment(stream);
 
-    if (stream.GetC()==_T('P'))
+    if (stream.GetC()==wxT('P'))
       switch (stream.GetC())
        {
-       case _T('3'): case _T('6'):
+       case wxT('3'): case wxT('6'):
          stream.SeekI(pos);
          return TRUE;
        }
@@ -155,5 +156,6 @@ bool wxPNMHandler::CanRead( wxInputStream& stream )
 }
 
 
-#endif // wxUSE_STREAMS && wxUSE_PNM
+#endif // wxUSE_STREAMS
 
+#endif // wxUSE_PNM