Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

A couple of changes to wxImage:

Browse Source 
1. changed wxBMP_foo, wxCUR_foo to wxIMAGE_OPTION_{BMP,CUR}_foo
   (with backward compatiblity macros, of course)
2. applied Chris' patch to update hotspot when scaling an image
3. applied Chris' patch to write a filename in XPM and generalized it
   to pass wxIMAGE_OPTION_FILENAME to all saving handlers


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14247 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2002-02-16 01:45:30 +00:00
parent 06534aa178
commit fd94e8aa45
7 changed files with 67 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/common/image.cpp
View File

@@ -274,6 +274,13 @@ wxImage wxImage::Scale( int width, int height ) const
}
}
#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,
(GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_X)*width)/old_width);
if ( HasOption(wxIMAGE_OPTION_CUR_HOTSPOT_Y) )
image.SetOption(wxIMAGE_OPTION_CUR_HOTSPOT_Y,
(GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_Y)*height)/old_height);
return image;
}
@@ -933,6 +940,9 @@ bool wxImage::LoadFile( const wxString& filename, const wxString& mimetype, int
bool wxImage::SaveFile( const wxString& filename, int type ) const
{
#if wxUSE_STREAMS
if ( !HasOption(wxIMAGE_OPTION_FILENAME) )
((wxImage*)this)->SetOption(wxIMAGE_OPTION_FILENAME, filename);
wxFileOutputStream stream(filename);
if ( stream.LastError() == wxStream_NOERROR )
@@ -948,6 +958,9 @@ bool wxImage::SaveFile( const wxString& filename, int type ) const
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);
wxFileOutputStream stream(filename);
if ( stream.LastError() == wxStream_NOERROR )