/[pcsx2_0.9.7]/trunk/3rdparty/wxWidgets/src/common/image.cpp
ViewVC logotype

Diff of /trunk/3rdparty/wxWidgets/src/common/image.cpp

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 61 by william, Tue Sep 7 03:24:11 2010 UTC revision 62 by william, Tue Sep 7 11:08:22 2010 UTC
# Line 167  wxImage::wxImage(const char* const* xpmD Line 167  wxImage::wxImage(const char* const* xpmD
167      Create(xpmData);      Create(xpmData);
168  }  }
169    
170    #if wxUSE_XPM
171  bool wxImage::Create(const char* const* xpmData)  bool wxImage::Create(const char* const* xpmData)
172  {  {
 #if wxUSE_XPM  
173      UnRef();      UnRef();
174    
175      wxXPMDecoder decoder;      wxXPMDecoder decoder;
176      (*this) = decoder.ReadData(xpmData);      (*this) = decoder.ReadData(xpmData);
177      return Ok();      return Ok();
178    }
179  #else  #else
180    bool wxImage::Create( const char* const* WXUNUSED(xpmData) )
181    {
182      return false;      return false;
 #endif  
183  }  }
184    #endif
185    
186  bool wxImage::Create( int width, int height, bool clear )  bool wxImage::Create( int width, int height, bool clear )
187  {  {

Legend:
Removed from v.61  
changed lines
  Added in v.62

  ViewVC Help
Powered by ViewVC 1.1.22