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

[wxWidgets.git] / include / wx / msw / pngread.h

diff --git a/include/wx/msw/pngread.h b/include/wx/msw/pngread.h
index ed6cc8fa78e50a76bef3440688db1e8a8e4c2f93..c3326bc4110edf136dc54565a6d70d35263058b2 100644 (file)
--- a/include/wx/msw/pngread.h
+++ b/include/wx/msw/pngread.h
@@ -8,8 +8,8 @@
  *
  */
 
  *
  */
 

-#ifndef __PNGREAD__
-#define __PNGREAD__
+#ifndef _WX_PNGREAD__
+#define _WX_PNGREAD__

 
 #ifdef __GNUG__
 #pragma interface "pngread.h"
 
 #ifdef __GNUG__
 #pragma interface "pngread.h"


@@ -43,7 +43,7 @@ class wxPNGReader
 {
 protected:
   int filetype;
 {
 protected:
   int filetype;

-  char filename[255];
+  wxChar filename[255];

   ImagePointerType RawImage;           //  Image data
 
   int Width, Height;                   //  Dimensions
   ImagePointerType RawImage;           //  Image data
 
   int Width, Height;                   //  Dimensions


@@ -61,14 +61,14 @@ protected:
 friend class wxPNGReaderIter;
 public:
   wxPNGReader(void);
 friend class wxPNGReaderIter;
 public:
   wxPNGReader(void);

-  wxPNGReader (char* ImageFileName);     // Read an image file
+  wxPNGReader (wxChar* ImageFileName);     // Read an image file

   ~wxPNGReader ();
 
   void Create(int width, int height, int deep, int colortype=-1);
 
   ~wxPNGReader ();
 
   void Create(int width, int height, int deep, int colortype=-1);
 

-  bool ReadFile( char* ImageFileName=0 );
-  bool SaveFile( char* ImageFileName=0 );
-  bool SaveXPM(char *filename, char *name = 0);
+  bool ReadFile( wxChar* ImageFileName=0 );
+  bool SaveFile( wxChar* ImageFileName=0 );
+  bool SaveXPM(wxChar *filename, wxChar *name = 0);

   int  GetWidth( void ) const { return Width; };
   int  GetHeight( void ) const { return Height; };
   int  GetDepth( void ) const { return Depth; };
   int  GetWidth( void ) const { return Width; };
   int  GetHeight( void ) const { return Height; };
   int  GetDepth( void ) const { return Depth; };