don't return wxLIST_HITTEST_ONITEMICON from HitTest() when the muse is clicked to...

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

diff --git a/src/common/image.cpp b/src/common/image.cpp
index b55fd180703def1bdc25a225abbd9039aa7be3fe..784a016b94210942efce04a431dab95838df4a97 100644 (file)
--- a/src/common/image.cpp
+++ b/src/common/image.cpp
@@ -110,10 +110,6 @@ wxImage wxNullImage;
 
 IMPLEMENT_DYNAMIC_CLASS(wxImage, wxObject)
 
-wxImage::wxImage()
-{
-}
-
 wxImage::wxImage( int width, int height, bool clear )
 {
     Create( width, height, clear );
@@ -231,7 +227,7 @@ wxImage wxImage::ShrinkBy( int xFactor , int yFactor ) const
 {
     if( xFactor == 1 && yFactor == 1 )
         return Copy() ;
-        
+
     wxImage image;
 
     wxCHECK_MSG( Ok(), image, wxT("invalid image") );
@@ -242,7 +238,7 @@ wxImage wxImage::ShrinkBy( int xFactor , int yFactor ) const
 
     long old_height = M_IMGDATA->m_height,
          old_width  = M_IMGDATA->m_width;
-         
+
     wxCHECK_MSG( (old_height > 0) && (old_width > 0), image,
                  wxT("invalid old image size") );
 
@@ -265,14 +261,14 @@ wxImage wxImage::ShrinkBy( int xFactor , int yFactor ) const
         maskRed = M_IMGDATA->m_maskRed;
         maskGreen = M_IMGDATA->m_maskGreen;
         maskBlue =M_IMGDATA->m_maskBlue ;
-      
+
         image.SetMaskColour( M_IMGDATA->m_maskRed,
                              M_IMGDATA->m_maskGreen,
                              M_IMGDATA->m_maskBlue );
     }
     char unsigned *source_data = M_IMGDATA->m_data;
     char unsigned *target_data = data;
-    
+
     for (long y = 0; y < height; y++)
     {
         for (long x = 0; x < width; x++)
@@ -935,7 +931,7 @@ bool wxImage::SetMaskFromImage(const wxImage& mask,
 
     return true;
 }
-    
+
 bool wxImage::ConvertAlphaToMask(unsigned char threshold)
 {
     if (!HasAlpha())
@@ -961,7 +957,7 @@ bool wxImage::ConvertAlphaToMask(unsigned char threshold)
     {
         for (int x = 0; x < w; x++, imgdata += 3, alphadata++)
         {
-            if ((unsigned)(*alphadata) < threshold)
+            if (*alphadata < threshold)
             {
                 imgdata[0] = mr;
                 imgdata[1] = mg;
@@ -1485,7 +1481,7 @@ bool wxImageHandler::CanRead( const wxString& name )
 
 bool wxImageHandler::CallDoCanRead(wxInputStream& stream)
 {
-    off_t posOld = stream.TellI();
+    wxFileSize_t posOld = stream.TellI();
     if ( posOld == wxInvalidOffset )
     {
         // can't test unseekable stream