removed extremely user-unfriendly translations

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

diff --git a/src/common/image.cpp b/src/common/image.cpp
index f26ae138557973610262b0c5753dd24b9e4a6cba..5a357beca36fd4ae18207332cdb2610133f883eb 100644 (file)
--- a/src/common/image.cpp
+++ b/src/common/image.cpp
@@ -1005,13 +1005,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,13 +1265,6 @@ void wxImage::InitStandardHandlers()
 #if wxUSE_STREAMS
     AddHandler(new wxBMPHandler);
 #endif // wxUSE_STREAMS
-
-#if wxUSE_XPM && !defined(__WXGTK__) && !defined(__WXMOTIF__)
-    // NB: keep this #ifdef in sync with the one in imagall.cpp -
-    //     they must complement each other so that there's always exactly
-    //     one XPM handler added after calling wxInitAllImageHandlers()
-    AddHandler(new wxXPMHandler);
-#endif
 }
 
 void wxImage::CleanUpHandlers()