corrected getting FSRef associated with the POSIX path in wxString

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

diff --git a/src/common/image.cpp b/src/common/image.cpp
index 3e922fad22a8300f29bd981bd7a405e46b067837..6aea2037fc10dec43b580cfea3aed3f086036af4 100644 (file)
--- a/src/common/image.cpp
+++ b/src/common/image.cpp
@@ -63,6 +63,8 @@ public:
 #endif // wxUSE_PALETTE
     wxArrayString   m_optionNames;
     wxArrayString   m_optionValues;
+
+    DECLARE_NO_COPY_CLASS(wxImageRefData)
 };
 
 wxImageRefData::wxImageRefData()
@@ -1005,13 +1007,11 @@ int wxImage::GetImageCount( const wxString &name, long type )
 {
 #if wxUSE_STREAMS
   wxFileInputStream stream(name);
-  if (!stream.Ok())
-      return 0;
-  else
+  if (stream.Ok())
       return GetImageCount(stream, type);
-#else
-  return 0;
 #endif
+
+  return 0;
 }
 
 #if wxUSE_STREAMS
@@ -1267,10 +1267,6 @@ void wxImage::InitStandardHandlers()
 #if wxUSE_STREAMS
     AddHandler(new wxBMPHandler);
 #endif // wxUSE_STREAMS
-
-#if wxUSE_XPM && !defined(__WXGTK__) && !defined(__WXMOTIF__)
-    AddHandler(new wxXPMHandler);
-#endif
 }
 
 void wxImage::CleanUpHandlers()