moved assert for parent window not being a static box to common code where it should...

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

diff --git a/src/common/image.cpp b/src/common/image.cpp
index a9201c2aaf17c4d34a59b477096869ce493243d6..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