previous change to wxImage was wrong, it didn't account for saving same image twice

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14252 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/image.cpp b/src/common/image.cpp
index f533e0043221509e88b34a8f51c29edc35663804..2c5ba9758dba4cba2f67e9c89d21e398b1b4ca46 100644 (file)
--- a/src/common/image.cpp
+++ b/src/common/image.cpp
@@ -274,6 +274,7 @@ wxImage wxImage::Scale( int width, int height ) const
         }
     }
 #endif
         }
     }
 #endif

+

     // In case this is a cursor, make sure the hotspot is scalled accordingly:
     if ( HasOption(wxIMAGE_OPTION_CUR_HOTSPOT_X) )
         image.SetOption(wxIMAGE_OPTION_CUR_HOTSPOT_X,
     // In case this is a cursor, make sure the hotspot is scalled accordingly:
     if ( HasOption(wxIMAGE_OPTION_CUR_HOTSPOT_X) )
         image.SetOption(wxIMAGE_OPTION_CUR_HOTSPOT_X,


@@ -940,8 +941,7 @@ bool wxImage::LoadFile( const wxString& filename, const wxString& mimetype, int
 bool wxImage::SaveFile( const wxString& filename, int type ) const
 {
 #if wxUSE_STREAMS
 bool wxImage::SaveFile( const wxString& filename, int type ) const
 {
 #if wxUSE_STREAMS

-    if ( !HasOption(wxIMAGE_OPTION_FILENAME) )
-        ((wxImage*)this)->SetOption(wxIMAGE_OPTION_FILENAME, filename);
+    ((wxImage*)this)->SetOption(wxIMAGE_OPTION_FILENAME, filename);

 
     wxFileOutputStream stream(filename);
 
 
     wxFileOutputStream stream(filename);
 


@@ -958,8 +958,7 @@ bool wxImage::SaveFile( const wxString& filename, int type ) const
 bool wxImage::SaveFile( const wxString& filename, const wxString& mimetype ) const
 {
 #if wxUSE_STREAMS
 bool wxImage::SaveFile( const wxString& filename, const wxString& mimetype ) const
 {
 #if wxUSE_STREAMS

-    if ( !HasOption(wxIMAGE_OPTION_FILENAME) )
-        ((wxImage*)this)->SetOption(wxIMAGE_OPTION_FILENAME, filename);
+    ((wxImage*)this)->SetOption(wxIMAGE_OPTION_FILENAME, filename);

 
     wxFileOutputStream stream(filename);
 
 
     wxFileOutputStream stream(filename);