X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/952ae1e88b9092f493b4ea6911a2b60b378d422d..142b3bc26a6e93f5857bc053c7748b2c845c4a8e:/src/common/image.cpp

diff --git a/src/common/image.cpp b/src/common/image.cpp
index addb165539..d4f9ddac8c 100644
--- a/src/common/image.cpp
+++ b/src/common/image.cpp
@@ -275,6 +275,14 @@ 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;
 }
 
@@ -723,7 +731,7 @@ int wxImage::GetHeight() const
 
 bool wxImage::FindFirstUnusedColour(
             unsigned char *r, unsigned char *g, unsigned char *b,
-            unsigned char startR, unsigned char startG, unsigned char startB)
+            unsigned char startR, unsigned char startG, unsigned char startB) const
 {
     wxImageHistogram histogram;
     unsigned long key;
@@ -930,9 +938,29 @@ bool wxImage::LoadFile( const wxString& filename, const wxString& mimetype, int
 #endif // wxUSE_STREAMS
 }
 
-bool wxImage::SaveFile( const wxString& filename, int type )
+
+
+bool wxImage::SaveFile( const wxString& filename ) const
+{
+    wxString ext = filename.AfterLast('.').Lower();
+    
+    wxImageHandler * pHandler = FindHandler(ext, -1);
+    if (pHandler)
+    {
+        SaveFile(filename, pHandler->GetType());
+        return TRUE;
+    }
+
+    wxLogError(_("Can't save image to file '%s': unknown extension."), filename.c_str());
+
+    return FALSE;
+}
+
+bool wxImage::SaveFile( const wxString& filename, int type ) const
 {
 #if wxUSE_STREAMS
+    ((wxImage*)this)->SetOption(wxIMAGE_OPTION_FILENAME, filename);
+
     wxFileOutputStream stream(filename);
 
     if ( stream.LastError() == wxStream_NOERROR )
@@ -945,9 +973,11 @@ bool wxImage::SaveFile( const wxString& filename, int type )
     return FALSE;
 }
 
-bool wxImage::SaveFile( const wxString& filename, const wxString& mimetype )
+bool wxImage::SaveFile( const wxString& filename, const wxString& mimetype ) const
 {
 #if wxUSE_STREAMS
+    ((wxImage*)this)->SetOption(wxIMAGE_OPTION_FILENAME, filename);
+
     wxFileOutputStream stream(filename);
 
     if ( stream.LastError() == wxStream_NOERROR )
@@ -1089,7 +1119,7 @@ bool wxImage::LoadFile( wxInputStream& stream, const wxString& mimetype, int ind
     return handler->LoadFile( this, stream, TRUE/*verbose*/, index );
 }
 
-bool wxImage::SaveFile( wxOutputStream& stream, int type )
+bool wxImage::SaveFile( wxOutputStream& stream, int type ) const
 {
     wxCHECK_MSG( Ok(), FALSE, wxT("invalid image") );
 
@@ -1102,10 +1132,10 @@ bool wxImage::SaveFile( wxOutputStream& stream, int type )
         return FALSE;
     }
 
-    return handler->SaveFile( this, stream );
+    return handler->SaveFile( (wxImage*)this, stream );
 }
 
-bool wxImage::SaveFile( wxOutputStream& stream, const wxString& mimetype )
+bool wxImage::SaveFile( wxOutputStream& stream, const wxString& mimetype ) const
 {
     wxCHECK_MSG( Ok(), FALSE, wxT("invalid image") );
 
@@ -1118,7 +1148,7 @@ bool wxImage::SaveFile( wxOutputStream& stream, const wxString& mimetype )
         return FALSE;
     }
 
-    return handler->SaveFile( this, stream );
+    return handler->SaveFile( (wxImage*)this, stream );
 }
 #endif // wxUSE_STREAMS
 
@@ -1268,10 +1298,10 @@ bool wxImageHandler::CanRead( const wxString& name )
 
 
 //-----------------------------------------------------------------------------
-// wxBitmap convertion routines
+// Deprecated wxBitmap convertion routines
 //-----------------------------------------------------------------------------
 
-#if wxUSE_GUI
+#if WXWIN_COMPATIBILITY_2_2 && wxUSE_GUI
 
 #ifdef __WXGTK__
 wxBitmap wxImage::ConvertToMonoBitmap( unsigned char red, unsigned char green, unsigned char blue ) const
@@ -1293,24 +1323,7 @@ wxImage::wxImage( const wxBitmap &bitmap )
     *this = bitmap.ConvertToImage();
 }
 
-#endif
-
-
-
-// A module to allow wxImage initialization/cleanup
-// without calling these functions from app.cpp or from
-// the user's application.
-
-class wxImageModule: public wxModule
-{
-DECLARE_DYNAMIC_CLASS(wxImageModule)
-public:
-    wxImageModule() {}
-    bool OnInit() { wxImage::InitStandardHandlers(); return TRUE; };
-    void OnExit() { wxImage::CleanUpHandlers(); };
-};
-
-IMPLEMENT_DYNAMIC_CLASS(wxImageModule, wxModule)
+#endif // WXWIN_COMPATIBILITY_2_2 && wxUSE_GUI
 
 
 //-----------------------------------------------------------------------------
@@ -1322,7 +1335,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxImageModule, wxModule)
 // less, in this case it would be invoked as CountColours(256)). Default
 // value for stopafter is -1 (don't care).
 //
-unsigned long wxImage::CountColours( unsigned long stopafter )
+unsigned long wxImage::CountColours( unsigned long stopafter ) const
 {
     wxHashTable h;
     wxObject dummy;
@@ -1352,7 +1365,7 @@ unsigned long wxImage::CountColours( unsigned long stopafter )
 }
 
 
-unsigned long wxImage::ComputeHistogram( wxImageHistogram &h )
+unsigned long wxImage::ComputeHistogram( wxImageHistogram &h ) const
 {
     unsigned char r, g, b;
     unsigned char *p;
@@ -1637,4 +1650,24 @@ wxImage wxImage::Rotate(double angle, const wxPoint & centre_of_rotation, bool i
     return rotated;
 }
 
+
+
+
+
+// A module to allow wxImage initialization/cleanup
+// without calling these functions from app.cpp or from
+// the user's application.
+
+class wxImageModule: public wxModule
+{
+DECLARE_DYNAMIC_CLASS(wxImageModule)
+public:
+    wxImageModule() {}
+    bool OnInit() { wxImage::InitStandardHandlers(); return TRUE; };
+    void OnExit() { wxImage::CleanUpHandlers(); };
+};
+
+IMPLEMENT_DYNAMIC_CLASS(wxImageModule, wxModule)
+
+
 #endif // wxUSE_IMAGE