fixed bug due to which all items in a virtual control stayed sometimes selected even...

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

diff --git a/src/common/image.cpp b/src/common/image.cpp
index f533e0043221509e88b34a8f51c29edc35663804..3241ed03cd28b49cc16423fc9d1888c2f66e5241 100644 (file)
--- a/src/common/image.cpp
+++ b/src/common/image.cpp
@@ -131,6 +131,7 @@ wxImage::wxImage( wxInputStream& stream, const wxString& mimetype, int index )
 #endif // wxUSE_STREAMS
 
 wxImage::wxImage( const wxImage& image )
 #endif // wxUSE_STREAMS
 
 wxImage::wxImage( const wxImage& image )

+    : wxObject()

 {
     Ref(image);
 }
 {
     Ref(image);
 }


@@ -198,8 +199,8 @@ wxImage wxImage::Copy() const
 
     wxCHECK_MSG( data, image, wxT("unable to create image") );
 
 
     wxCHECK_MSG( data, image, wxT("unable to create image") );
 

-    if (M_IMGDATA->m_hasMask)
-        image.SetMaskColour( M_IMGDATA->m_maskRed, M_IMGDATA->m_maskGreen, M_IMGDATA->m_maskBlue );
+    image.SetMaskColour( M_IMGDATA->m_maskRed, M_IMGDATA->m_maskGreen, M_IMGDATA->m_maskBlue );
+    image.SetMask( M_IMGDATA->m_hasMask );

 
     memcpy( data, GetData(), M_IMGDATA->m_width*M_IMGDATA->m_height*3 );
 
 
     memcpy( data, GetData(), M_IMGDATA->m_width*M_IMGDATA->m_height*3 );
 


@@ -274,6 +275,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,


@@ -937,11 +939,28 @@ bool wxImage::LoadFile( const wxString& filename, const wxString& mimetype, int
 #endif // wxUSE_STREAMS
 }
 
 #endif // wxUSE_STREAMS
 }
 

+
+
+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
 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 +977,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);
 


@@ -997,7 +1015,7 @@ int wxImage::GetImageCount( const wxString &name, long type )
 
 bool wxImage::CanRead( wxInputStream &stream )
 {
 
 bool wxImage::CanRead( wxInputStream &stream )
 {

-    wxList &list=GetHandlers();
+    const wxList& list = GetHandlers();

 
     for ( wxList::Node *node = list.GetFirst(); node; node = node->GetNext() )
     {
 
     for ( wxList::Node *node = list.GetFirst(); node; node = node->GetNext() )
     {


@@ -1268,12 +1286,32 @@ bool wxImageHandler::CanRead( const wxString& name )
         return CanRead(stream);
     }
 
         return CanRead(stream);
     }
 

-    else {
-        wxLogError( _("Can't check image format of file '%s': file does not exist."), name.c_str() );
+    wxLogError( _("Can't check image format of file '%s': file does not exist."), name.c_str() );

 
 

+    return FALSE;
+}
+
+bool wxImageHandler::CallDoCanRead(wxInputStream& stream)
+{
+    off_t posOld = stream.TellI();
+    if ( posOld == wxInvalidOffset )
+    {
+        // can't test unseekable stream
+        return FALSE;
+    }
+
+    bool ok = DoCanRead(stream);
+
+    // restore the old position to be able to test other formats and so on
+    if ( stream.SeekI(posOld) == wxInvalidOffset )
+    {
+        wxLogDebug(_T("Failed to rewind the stream in wxImageHandler!"));
+
+        // reading would fail anyhow as we're not at the right position

         return FALSE;
     }
         return FALSE;
     }

-//    return FALSE;
+
+    return ok;

 }
 
 #endif // wxUSE_STREAMS
 }
 
 #endif // wxUSE_STREAMS


@@ -1281,10 +1319,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
 
 #ifdef __WXGTK__
 wxBitmap wxImage::ConvertToMonoBitmap( unsigned char red, unsigned char green, unsigned char blue ) const


@@ -1306,24 +1344,7 @@ wxImage::wxImage( const wxBitmap &bitmap )
     *this = bitmap.ConvertToImage();
 }
 
     *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

 
 
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------


@@ -1650,4 +1671,24 @@ wxImage wxImage::Rotate(double angle, const wxPoint & centre_of_rotation, bool i
     return rotated;
 }
 
     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
 #endif // wxUSE_IMAGE