Use the data scheme to load resources in the WebKitGTK+ implementation, rather than...

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

diff --git a/src/common/imagxpm.cpp b/src/common/imagxpm.cpp
index 3f1caeaf46a07610a520c1b70674ffc7341f767e..de2530e84c73960d194a3f114648feabc1efc349 100644 (file)
--- a/src/common/imagxpm.cpp
+++ b/src/common/imagxpm.cpp
@@ -97,7 +97,7 @@ bool wxXPMHandler::LoadFile(wxImage *image,
     wxXPMDecoder decoder;
 
     wxImage img = decoder.ReadFile(stream);
     wxXPMDecoder decoder;
 
     wxImage img = decoder.ReadFile(stream);

-    if ( !img.Ok() )
+    if ( !img.IsOk() )

         return false;
     *image = img;
     return true;
         return false;
     *image = img;
     return true;


@@ -218,6 +218,7 @@ bool wxXPMHandler::DoCanRead(wxInputStream& stream)
 {
     wxXPMDecoder decoder;
     return decoder.CanRead(stream);
 {
     wxXPMDecoder decoder;
     return decoder.CanRead(stream);

+         // it's ok to modify the stream position here

 }
 
 #endif  // wxUSE_STREAMS
 }
 
 #endif  // wxUSE_STREAMS