Added support for delayed deactivation of windows (for MDI)

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

diff --git a/src/common/image.cpp b/src/common/image.cpp
index aa19e4ea35089200e9dd5c067e8bde3083c5831e..10035ce9653fad70c0b0635ccae66715d56da02a 100644 (file)
--- a/src/common/image.cpp
+++ b/src/common/image.cpp
@@ -85,10 +85,10 @@ wxImageRefData::wxImageRefData()
     m_maskRed = 0;
     m_maskGreen = 0;
     m_maskBlue = 0;
     m_maskRed = 0;
     m_maskGreen = 0;
     m_maskBlue = 0;

-    m_hasMask = FALSE;
+    m_hasMask = false;

 
 

-    m_ok = FALSE;
-    m_static = FALSE;
+    m_ok = false;
+    m_static = false;

 }
 
 wxImageRefData::~wxImageRefData()
 }
 
 wxImageRefData::~wxImageRefData()


@@ -113,9 +113,9 @@ wxImage::wxImage()
 {
 }
 
 {
 }
 

-wxImage::wxImage( int width, int height )
+wxImage::wxImage( int width, int height, bool clear )

 {
 {

-    Create( width, height );
+    Create( width, height, clear );

 }
 
 wxImage::wxImage( int width, int height, unsigned char* data, bool static_data )
 }
 
 wxImage::wxImage( int width, int height, unsigned char* data, bool static_data )


@@ -156,45 +156,44 @@ wxImage::wxImage( const wxImage* image )
     if (image) Ref(*image);
 }
 
     if (image) Ref(*image);
 }
 

-void wxImage::Create( int width, int height )
+bool wxImage::Create( int width, int height, bool clear )

 {
     UnRef();
 
     m_refData = new wxImageRefData();
 
     M_IMGDATA->m_data = (unsigned char *) malloc( width*height*3 );
 {
     UnRef();
 
     m_refData = new wxImageRefData();
 
     M_IMGDATA->m_data = (unsigned char *) malloc( width*height*3 );

-    if (M_IMGDATA->m_data)
-    {
-        for (int l = 0; l < width*height*3; l++) M_IMGDATA->m_data[l] = 0;
-
-        M_IMGDATA->m_width = width;
-        M_IMGDATA->m_height = height;
-        M_IMGDATA->m_ok = TRUE;
-    }
-    else
+    if (!M_IMGDATA->m_data)

     {
         UnRef();
     {
         UnRef();

+        return false;

     }
     }

+
+    if (clear)
+        memset(M_IMGDATA->m_data, 0, width*height*3);
+
+    M_IMGDATA->m_width = width;
+    M_IMGDATA->m_height = height;
+    M_IMGDATA->m_ok = true;
+
+    return true;

 }
 
 }
 

-void wxImage::Create( int width, int height, unsigned char* data, bool static_data )
+bool wxImage::Create( int width, int height, unsigned char* data, bool static_data )

 {
     UnRef();
 
 {
     UnRef();
 

+    wxCHECK_MSG( data, false, _T("NULL data in wxImage::Create") );
+

     m_refData = new wxImageRefData();
 
     M_IMGDATA->m_data = data;
     m_refData = new wxImageRefData();
 
     M_IMGDATA->m_data = data;

-    if (M_IMGDATA->m_data)
-    {
-        M_IMGDATA->m_width = width;
-        M_IMGDATA->m_height = height;
-        M_IMGDATA->m_ok = TRUE;
-        M_IMGDATA->m_static = static_data;
-    }
-    else
-    {
-        UnRef();
-    }
+    M_IMGDATA->m_width = width;
+    M_IMGDATA->m_height = height;
+    M_IMGDATA->m_ok = true;
+    M_IMGDATA->m_static = static_data;
+
+    return true;

 }
 
 void wxImage::Destroy()
 }
 
 void wxImage::Destroy()


@@ -208,7 +207,7 @@ wxImage wxImage::Copy() const
 
     wxCHECK_MSG( Ok(), image, wxT("invalid image") );
 
 
     wxCHECK_MSG( Ok(), image, wxT("invalid image") );
 

-    image.Create( M_IMGDATA->m_width, M_IMGDATA->m_height );
+    image.Create( M_IMGDATA->m_width, M_IMGDATA->m_height, false );

 
     unsigned char *data = image.GetData();
 
 
     unsigned char *data = image.GetData();
 


@@ -244,7 +243,7 @@ wxImage wxImage::ShrinkBy( int xFactor , int yFactor ) const
     long width = old_width / xFactor ;
     long height = old_height / yFactor ;
 
     long width = old_width / xFactor ;
     long height = old_height / yFactor ;
 

-    image.Create( width , height );
+    image.Create( width, height, false );

 
     char unsigned *data = image.GetData();
 
 
     char unsigned *data = image.GetData();
 


@@ -341,7 +340,7 @@ wxImage wxImage::Scale( int width, int height ) const
     {
         return ShrinkBy( old_width / width , old_height / height ) ;
     }
     {
         return ShrinkBy( old_width / width , old_height / height ) ;
     }

-    image.Create( width, height );
+    image.Create( width, height, false );

 
     unsigned char *data = image.GetData();
 
 
     unsigned char *data = image.GetData();
 


@@ -357,43 +356,29 @@ wxImage wxImage::Scale( int width, int height ) const
     unsigned char *source_data = M_IMGDATA->m_data;
     unsigned char *target_data = data;
 
     unsigned char *source_data = M_IMGDATA->m_data;
     unsigned char *target_data = data;
 

-#if 0
-    // This is nonsense, RR.
-
-    // We do (x, y) -> (x, y)*oldSize/newSize but the valid values of x and y
-    // are from 0 to size-1, hence all decrement the sizes
-    long old_old_width = old_width;
-    old_height--;
-    old_width--;
-    height--;
-    width--;
-    for ( long j = 0; j <= height; j++ )
-    {
-        // don't crash for images with height == 1
-        long y_offset = height ? (j * old_height / height)* old_old_width : 0;
+    long x_delta = (old_width<<16) / width;
+    long y_delta = (old_height<<16) / height;

 
 

-        for ( long i = 0; i <= width; i++ )
-        {
-            long x_offset = width ? (i * old_width) / width : 0;
+    unsigned char* dest_pixel = target_data;

 
 

-            memcpy( target_data, source_data + 3*(y_offset + x_offset), 3 );
-            target_data += 3;
-        }
-    }
-#else
-    for (long j = 0; j < height; j++)
-    {
-        long y_offset = (j * old_height / height) * old_width;
+    long y = 0;
+    for ( long j = 0; j < height; j++ )
+        {
+        unsigned char* src_line = &source_data[(y>>16)*old_width*3];

 
 

-        for (long i = 0; i < width; i++)
+        long x = 0;
+        for ( long i = 0; i < width; i++ )

         {
         {

-            memcpy( target_data,
-                source_data + 3*(y_offset + ((i * old_width )/ width)),
-                3 );
-            target_data += 3;
+             unsigned char* src_pixel = &src_line[(x>>16)*3];
+             dest_pixel[0] = src_pixel[0];
+             dest_pixel[1] = src_pixel[1];
+             dest_pixel[2] = src_pixel[2];
+             dest_pixel += 3;
+             x += x_delta;

         }
         }

+
+        y += y_delta;

     }
     }

-#endif

 
     // In case this is a cursor, make sure the hotspot is scalled accordingly:
     if ( HasOption(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) )


@@ -412,7 +397,7 @@ wxImage wxImage::Rotate90( bool clockwise ) const
 
     wxCHECK_MSG( Ok(), image, wxT("invalid image") );
 
 
     wxCHECK_MSG( Ok(), image, wxT("invalid image") );
 

-    image.Create( M_IMGDATA->m_height, M_IMGDATA->m_width );
+    image.Create( M_IMGDATA->m_height, M_IMGDATA->m_width, false );

 
     unsigned char *data = image.GetData();
 
 
     unsigned char *data = image.GetData();
 


@@ -449,7 +434,7 @@ wxImage wxImage::Mirror( bool horizontally ) const
 
     wxCHECK_MSG( Ok(), image, wxT("invalid image") );
 
 
     wxCHECK_MSG( Ok(), image, wxT("invalid image") );
 

-    image.Create( M_IMGDATA->m_width, M_IMGDATA->m_height );
+    image.Create( M_IMGDATA->m_width, M_IMGDATA->m_height, false );

 
     unsigned char *data = image.GetData();
 
 
     unsigned char *data = image.GetData();
 


@@ -503,7 +488,7 @@ wxImage wxImage::GetSubImage( const wxRect &rect ) const
     int subwidth=rect.GetWidth();
     const int subheight=rect.GetHeight();
 
     int subwidth=rect.GetWidth();
     const int subheight=rect.GetHeight();
 

-    image.Create( subwidth, subheight );
+    image.Create( subwidth, subheight, false );

 
     unsigned char *subdata = image.GetData(), *data=GetData();
 
 
     unsigned char *subdata = image.GetData(), *data=GetData();
 


@@ -637,7 +622,7 @@ wxImage wxImage::ConvertToMono( unsigned char r, unsigned char g, unsigned char
 
     wxCHECK_MSG( Ok(), image, wxT("invalid image") );
 
 
     wxCHECK_MSG( Ok(), image, wxT("invalid image") );
 

-    image.Create( M_IMGDATA->m_width, M_IMGDATA->m_height );
+    image.Create( M_IMGDATA->m_width, M_IMGDATA->m_height, false );

 
     unsigned char *data = image.GetData();
 
 
     unsigned char *data = image.GetData();
 


@@ -750,7 +735,7 @@ void wxImage::SetData( unsigned char *data )
     newRefData->m_width = M_IMGDATA->m_width;
     newRefData->m_height = M_IMGDATA->m_height;
     newRefData->m_data = data;
     newRefData->m_width = M_IMGDATA->m_width;
     newRefData->m_height = M_IMGDATA->m_height;
     newRefData->m_data = data;

-    newRefData->m_ok = TRUE;
+    newRefData->m_ok = true;

     newRefData->m_maskRed = M_IMGDATA->m_maskRed;
     newRefData->m_maskGreen = M_IMGDATA->m_maskGreen;
     newRefData->m_maskBlue = M_IMGDATA->m_maskBlue;
     newRefData->m_maskRed = M_IMGDATA->m_maskRed;
     newRefData->m_maskGreen = M_IMGDATA->m_maskGreen;
     newRefData->m_maskBlue = M_IMGDATA->m_maskBlue;


@@ -770,7 +755,7 @@ void wxImage::SetData( unsigned char *data, int new_width, int new_height )
         newRefData->m_width = new_width;
         newRefData->m_height = new_height;
         newRefData->m_data = data;
         newRefData->m_width = new_width;
         newRefData->m_height = new_height;
         newRefData->m_data = data;

-        newRefData->m_ok = TRUE;
+        newRefData->m_ok = true;

         newRefData->m_maskRed = M_IMGDATA->m_maskRed;
         newRefData->m_maskGreen = M_IMGDATA->m_maskGreen;
         newRefData->m_maskBlue = M_IMGDATA->m_maskBlue;
         newRefData->m_maskRed = M_IMGDATA->m_maskRed;
         newRefData->m_maskGreen = M_IMGDATA->m_maskGreen;
         newRefData->m_maskBlue = M_IMGDATA->m_maskBlue;


@@ -781,7 +766,7 @@ void wxImage::SetData( unsigned char *data, int new_width, int new_height )
         newRefData->m_width = new_width;
         newRefData->m_height = new_height;
         newRefData->m_data = data;
         newRefData->m_width = new_width;
         newRefData->m_height = new_height;
         newRefData->m_data = data;

-        newRefData->m_ok = TRUE;
+        newRefData->m_ok = true;

     }
 
     UnRef();
     }
 
     UnRef();


@@ -823,8 +808,7 @@ void wxImage::SetAlpha( unsigned char *alpha )
 
     if ( !alpha )
     {
 
     if ( !alpha )
     {

-        alpha = (unsigned char *)
-                    malloc(M_IMGDATA->m_width*M_IMGDATA->m_height*3);
+        alpha = (unsigned char *)malloc(M_IMGDATA->m_width*M_IMGDATA->m_height);

     }
 
     delete [] M_IMGDATA->m_alpha;
     }
 
     delete [] M_IMGDATA->m_alpha;


@@ -849,7 +833,7 @@ void wxImage::SetMaskColour( unsigned char r, unsigned char g, unsigned char b )
     M_IMGDATA->m_maskRed = r;
     M_IMGDATA->m_maskGreen = g;
     M_IMGDATA->m_maskBlue = b;
     M_IMGDATA->m_maskRed = r;
     M_IMGDATA->m_maskGreen = g;
     M_IMGDATA->m_maskBlue = b;

-    M_IMGDATA->m_hasMask = TRUE;
+    M_IMGDATA->m_hasMask = true;

 }
 
 unsigned char wxImage::GetMaskRed() const
 }
 
 unsigned char wxImage::GetMaskRed() const


@@ -882,7 +866,7 @@ void wxImage::SetMask( bool mask )
 
 bool wxImage::HasMask() const
 {
 
 bool wxImage::HasMask() const
 {

-    wxCHECK_MSG( Ok(), FALSE, wxT("invalid image") );
+    wxCHECK_MSG( Ok(), false, wxT("invalid image") );

 
     return M_IMGDATA->m_hasMask;
 }
 
     return M_IMGDATA->m_hasMask;
 }


@@ -908,7 +892,7 @@ bool wxImage::SetMaskFromImage(const wxImage& mask,
     if ( (M_IMGDATA->m_height != mask.GetHeight() ) || (M_IMGDATA->m_width != mask.GetWidth () ) )
     {
         wxLogError( _("Image and Mask have different sizes") );
     if ( (M_IMGDATA->m_height != mask.GetHeight() ) || (M_IMGDATA->m_width != mask.GetWidth () ) )
     {
         wxLogError( _("Image and Mask have different sizes") );

-        return FALSE;
+        return false;

     }
 
     // find unused colour
     }
 
     // find unused colour


@@ -916,7 +900,7 @@ bool wxImage::SetMaskFromImage(const wxImage& mask,
     if (!FindFirstUnusedColour(&r, &g, &b))
     {
         wxLogError( _("No Unused Color in image being masked") );
     if (!FindFirstUnusedColour(&r, &g, &b))
     {
         wxLogError( _("No Unused Color in image being masked") );

-        return FALSE ;
+        return false ;

     }
 
     unsigned char *imgdata = GetData();
     }
 
     unsigned char *imgdata = GetData();


@@ -941,9 +925,9 @@ bool wxImage::SetMaskFromImage(const wxImage& mask,
     }
 
     SetMaskColour(r, g, b);
     }
 
     SetMaskColour(r, g, b);

-    SetMask(TRUE);
+    SetMask(true);

 
 

-    return TRUE;
+    return true;

 }
 
 #if wxUSE_PALETTE
 }
 
 #if wxUSE_PALETTE


@@ -953,7 +937,7 @@ bool wxImage::SetMaskFromImage(const wxImage& mask,
 bool wxImage::HasPalette() const
 {
     if (!Ok())
 bool wxImage::HasPalette() const
 {
     if (!Ok())

-        return FALSE;
+        return false;

 
     return M_IMGDATA->m_palette.Ok();
 }
 
     return M_IMGDATA->m_palette.Ok();
 }


@@ -979,7 +963,7 @@ void wxImage::SetOption(const wxString& name, const wxString& value)
 {
     wxCHECK_RET( Ok(), wxT("invalid image") );
 
 {
     wxCHECK_RET( Ok(), wxT("invalid image") );
 

-    int idx = M_IMGDATA->m_optionNames.Index(name, FALSE);
+    int idx = M_IMGDATA->m_optionNames.Index(name, false);

     if (idx == wxNOT_FOUND)
     {
         M_IMGDATA->m_optionNames.Add(name);
     if (idx == wxNOT_FOUND)
     {
         M_IMGDATA->m_optionNames.Add(name);


@@ -1003,7 +987,7 @@ wxString wxImage::GetOption(const wxString& name) const
 {
     wxCHECK_MSG( Ok(), wxEmptyString, wxT("invalid image") );
 
 {
     wxCHECK_MSG( Ok(), wxEmptyString, wxT("invalid image") );
 

-    int idx = M_IMGDATA->m_optionNames.Index(name, FALSE);
+    int idx = M_IMGDATA->m_optionNames.Index(name, false);

     if (idx == wxNOT_FOUND)
         return wxEmptyString;
     else
     if (idx == wxNOT_FOUND)
         return wxEmptyString;
     else


@@ -1019,9 +1003,9 @@ int wxImage::GetOptionInt(const wxString& name) const
 
 bool wxImage::HasOption(const wxString& name) const
 {
 
 bool wxImage::HasOption(const wxString& name) const
 {

-    wxCHECK_MSG( Ok(), FALSE, wxT("invalid image") );
+    wxCHECK_MSG( Ok(), false, wxT("invalid image") );

 
 

-    return (M_IMGDATA->m_optionNames.Index(name, FALSE) != wxNOT_FOUND);
+    return (M_IMGDATA->m_optionNames.Index(name, false) != wxNOT_FOUND);

 }
 
 bool wxImage::LoadFile( const wxString& filename, long type, int index )
 }
 
 bool wxImage::LoadFile( const wxString& filename, long type, int index )


@@ -1037,10 +1021,10 @@ bool wxImage::LoadFile( const wxString& filename, long type, int index )
     {
         wxLogError( _("Can't load image from file '%s': file does not exist."), filename.c_str() );
 
     {
         wxLogError( _("Can't load image from file '%s': file does not exist."), filename.c_str() );
 

-        return FALSE;
+        return false;

     }
 #else // !wxUSE_STREAMS
     }
 #else // !wxUSE_STREAMS

-    return FALSE;
+    return false;

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


@@ -1057,10 +1041,10 @@ bool wxImage::LoadFile( const wxString& filename, const wxString& mimetype, int
     {
         wxLogError( _("Can't load image from file '%s': file does not exist."), filename.c_str() );
 
     {
         wxLogError( _("Can't load image from file '%s': file does not exist."), filename.c_str() );
 

-        return FALSE;
+        return false;

     }
 #else // !wxUSE_STREAMS
     }
 #else // !wxUSE_STREAMS

-    return FALSE;
+    return false;

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


@@ -1074,12 +1058,12 @@ bool wxImage::SaveFile( const wxString& filename ) const
     if (pHandler)
     {
         SaveFile(filename, pHandler->GetType());
     if (pHandler)
     {
         SaveFile(filename, pHandler->GetType());

-        return TRUE;
+        return true;

     }
 
     wxLogError(_("Can't save image to file '%s': unknown extension."), filename.c_str());
 
     }
 
     wxLogError(_("Can't save image to file '%s': unknown extension."), filename.c_str());
 

-    return FALSE;
+    return false;

 }
 
 bool wxImage::SaveFile( const wxString& filename, int type ) const
 }
 
 bool wxImage::SaveFile( const wxString& filename, int type ) const


@@ -1096,7 +1080,7 @@ bool wxImage::SaveFile( const wxString& filename, int type ) const
     }
 #endif // wxUSE_STREAMS
 
     }
 #endif // wxUSE_STREAMS
 

-    return FALSE;
+    return false;

 }
 
 bool wxImage::SaveFile( const wxString& filename, const wxString& mimetype ) const
 }
 
 bool wxImage::SaveFile( const wxString& filename, const wxString& mimetype ) const


@@ -1113,7 +1097,7 @@ bool wxImage::SaveFile( const wxString& filename, const wxString& mimetype ) con
     }
 #endif // wxUSE_STREAMS
 
     }
 #endif // wxUSE_STREAMS
 

-    return FALSE;
+    return false;

 }
 
 bool wxImage::CanRead( const wxString &name )
 }
 
 bool wxImage::CanRead( const wxString &name )


@@ -1122,7 +1106,7 @@ bool wxImage::CanRead( const wxString &name )
   wxFileInputStream stream(name);
   return CanRead(stream);
 #else
   wxFileInputStream stream(name);
   return CanRead(stream);
 #else

-  return FALSE;
+  return false;

 #endif
 }
 
 #endif
 }
 


@@ -1147,10 +1131,10 @@ bool wxImage::CanRead( wxInputStream &stream )
     {
         wxImageHandler *handler=(wxImageHandler*)node->GetData();
         if (handler->CanRead( stream ))
     {
         wxImageHandler *handler=(wxImageHandler*)node->GetData();
         if (handler->CanRead( stream ))

-            return TRUE;
+            return true;

     }
 
     }
 

-    return FALSE;
+    return false;

 }
 
 int wxImage::GetImageCount( wxInputStream &stream, long type )
 }
 
 int wxImage::GetImageCount( wxInputStream &stream, long type )


@@ -1178,7 +1162,7 @@ int wxImage::GetImageCount( wxInputStream &stream, long type )
     if ( !handler )
     {
         wxLogWarning(_("No image handler for type %d defined."), type);
     if ( !handler )
     {
         wxLogWarning(_("No image handler for type %d defined."), type);

-        return FALSE;
+        return false;

     }
 
     if ( handler->CanRead(stream) )
     }
 
     if ( handler->CanRead(stream) )


@@ -1208,12 +1192,12 @@ bool wxImage::LoadFile( wxInputStream& stream, long type, int index )
         {
              handler=(wxImageHandler*)node->GetData();
              if ( handler->CanRead(stream) )
         {
              handler=(wxImageHandler*)node->GetData();
              if ( handler->CanRead(stream) )

-                 return handler->LoadFile(this, stream, TRUE/*verbose*/, index);
+                 return handler->LoadFile(this, stream, true/*verbose*/, index);

 
         }
 
         wxLogWarning( _("No handler found for image type.") );
 
         }
 
         wxLogWarning( _("No handler found for image type.") );

-        return FALSE;
+        return false;

     }
 
     handler = FindHandler(type);
     }
 
     handler = FindHandler(type);


@@ -1222,10 +1206,10 @@ bool wxImage::LoadFile( wxInputStream& stream, long type, int index )
     {
         wxLogWarning( _("No image handler for type %d defined."), type );
 
     {
         wxLogWarning( _("No image handler for type %d defined."), type );
 

-        return FALSE;
+        return false;

     }
 
     }
 

-    return handler->LoadFile(this, stream, TRUE/*verbose*/, index);
+    return handler->LoadFile(this, stream, true/*verbose*/, index);

 }
 
 bool wxImage::LoadFile( wxInputStream& stream, const wxString& mimetype, int index )
 }
 
 bool wxImage::LoadFile( wxInputStream& stream, const wxString& mimetype, int index )


@@ -1240,15 +1224,15 @@ bool wxImage::LoadFile( wxInputStream& stream, const wxString& mimetype, int ind
     {
         wxLogWarning( _("No image handler for type %s defined."), mimetype.GetData() );
 
     {
         wxLogWarning( _("No image handler for type %s defined."), mimetype.GetData() );
 

-        return FALSE;
+        return false;

     }
 
     }
 

-    return handler->LoadFile( this, stream, TRUE/*verbose*/, index );
+    return handler->LoadFile( this, stream, true/*verbose*/, index );

 }
 
 bool wxImage::SaveFile( wxOutputStream& stream, int type ) const
 {
 }
 
 bool wxImage::SaveFile( wxOutputStream& stream, int type ) const
 {

-    wxCHECK_MSG( Ok(), FALSE, wxT("invalid image") );
+    wxCHECK_MSG( Ok(), false, wxT("invalid image") );

 
     wxImageHandler *handler = FindHandler(type);
 
 
     wxImageHandler *handler = FindHandler(type);
 


@@ -1256,7 +1240,7 @@ bool wxImage::SaveFile( wxOutputStream& stream, int type ) const
     {
         wxLogWarning( _("No image handler for type %d defined."), type );
 
     {
         wxLogWarning( _("No image handler for type %d defined."), type );
 

-        return FALSE;
+        return false;

     }
 
     return handler->SaveFile( (wxImage*)this, stream );
     }
 
     return handler->SaveFile( (wxImage*)this, stream );


@@ -1264,7 +1248,7 @@ bool wxImage::SaveFile( wxOutputStream& stream, int type ) const
 
 bool wxImage::SaveFile( wxOutputStream& stream, const wxString& mimetype ) const
 {
 
 bool wxImage::SaveFile( wxOutputStream& stream, const wxString& mimetype ) const
 {

-    wxCHECK_MSG( Ok(), FALSE, wxT("invalid image") );
+    wxCHECK_MSG( Ok(), false, wxT("invalid image") );

 
     wxImageHandler *handler = FindHandlerMime(mimetype);
 
 
     wxImageHandler *handler = FindHandlerMime(mimetype);
 


@@ -1272,7 +1256,7 @@ bool wxImage::SaveFile( wxOutputStream& stream, const wxString& mimetype ) const
     {
         wxLogWarning( _("No image handler for type %s defined."), mimetype.GetData() );
 
     {
         wxLogWarning( _("No image handler for type %s defined."), mimetype.GetData() );
 

-        return FALSE;
+        return false;

     }
 
     return handler->SaveFile( (wxImage*)this, stream );
     }
 
     return handler->SaveFile( (wxImage*)this, stream );


@@ -1282,7 +1266,7 @@ bool wxImage::SaveFile( wxOutputStream& stream, const wxString& mimetype ) const
 void wxImage::AddHandler( wxImageHandler *handler )
 {
     // make sure that the memory will be freed at the program end
 void wxImage::AddHandler( wxImageHandler *handler )
 {
     // make sure that the memory will be freed at the program end

-    sm_handlers.DeleteContents(TRUE);
+    sm_handlers.DeleteContents(true);

 
     // Check for an existing handler of the type being added.
     if (FindHandler( handler->GetType() ) == 0)
 
     // Check for an existing handler of the type being added.
     if (FindHandler( handler->GetType() ) == 0)


@@ -1306,7 +1290,7 @@ void wxImage::AddHandler( wxImageHandler *handler )
 void wxImage::InsertHandler( wxImageHandler *handler )
 {
     // make sure that the memory will be freed at the program end
 void wxImage::InsertHandler( wxImageHandler *handler )
 {
     // make sure that the memory will be freed at the program end

-    sm_handlers.DeleteContents(TRUE);
+    sm_handlers.DeleteContents(true);

 
     // Check for an existing handler of the type being added.
     if (FindHandler( handler->GetType() ) == 0)
 
     // Check for an existing handler of the type being added.
     if (FindHandler( handler->GetType() ) == 0)


@@ -1328,10 +1312,10 @@ bool wxImage::RemoveHandler( const wxString& name )
     if (handler)
     {
         sm_handlers.DeleteObject(handler);
     if (handler)
     {
         sm_handlers.DeleteObject(handler);

-        return TRUE;
+        return true;

     }
     else
     }
     else

-        return FALSE;
+        return false;

 }
 
 wxImageHandler *wxImage::FindHandler( const wxString& name )
 }
 
 wxImageHandler *wxImage::FindHandler( const wxString& name )


@@ -1379,7 +1363,7 @@ wxImageHandler *wxImage::FindHandlerMime( const wxString& mimetype )
     while (node)
     {
         wxImageHandler *handler = (wxImageHandler *)node->GetData();
     while (node)
     {
         wxImageHandler *handler = (wxImageHandler *)node->GetData();

-        if (handler->GetMimeType().IsSameAs(mimetype, FALSE)) return handler;
+        if (handler->GetMimeType().IsSameAs(mimetype, false)) return handler;

         node = node->GetNext();
     }
     return 0;
         node = node->GetNext();
     }
     return 0;


@@ -1405,6 +1389,25 @@ void wxImage::CleanUpHandlers()
     }
 }
 
     }
 }
 

+
+wxString wxImage::GetImageExtWildcard()
+{
+    wxString fmts;
+
+    wxList& Handlers = wxImage::GetHandlers();
+    wxNode* Node = Handlers.GetFirst();
+    while ( Node )
+    {
+        wxImageHandler* Handler = (wxImageHandler*)Node->GetData();
+        fmts += wxT("*.") + Handler->GetExtension();
+        Node = Node->GetNext();
+        if ( Node ) fmts += wxT(";");
+    }
+
+    return wxT("(") + fmts + wxT(")|") + fmts;
+}
+
+

 //-----------------------------------------------------------------------------
 // wxImageHandler
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // wxImageHandler
 //-----------------------------------------------------------------------------


@@ -1414,12 +1417,12 @@ IMPLEMENT_ABSTRACT_CLASS(wxImageHandler,wxObject)
 #if wxUSE_STREAMS
 bool wxImageHandler::LoadFile( wxImage *WXUNUSED(image), wxInputStream& WXUNUSED(stream), bool WXUNUSED(verbose), int WXUNUSED(index) )
 {
 #if wxUSE_STREAMS
 bool wxImageHandler::LoadFile( wxImage *WXUNUSED(image), wxInputStream& WXUNUSED(stream), bool WXUNUSED(verbose), int WXUNUSED(index) )
 {

-    return FALSE;
+    return false;

 }
 
 bool wxImageHandler::SaveFile( wxImage *WXUNUSED(image), wxOutputStream& WXUNUSED(stream), bool WXUNUSED(verbose) )
 {
 }
 
 bool wxImageHandler::SaveFile( wxImage *WXUNUSED(image), wxOutputStream& WXUNUSED(stream), bool WXUNUSED(verbose) )
 {

-    return FALSE;
+    return false;

 }
 
 int wxImageHandler::GetImageCount( wxInputStream& WXUNUSED(stream) )
 }
 
 int wxImageHandler::GetImageCount( wxInputStream& WXUNUSED(stream) )


@@ -1437,7 +1440,7 @@ bool wxImageHandler::CanRead( const wxString& name )
 
     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;
+    return false;

 }
 
 bool wxImageHandler::CallDoCanRead(wxInputStream& stream)
 }
 
 bool wxImageHandler::CallDoCanRead(wxInputStream& stream)


@@ -1446,7 +1449,7 @@ bool wxImageHandler::CallDoCanRead(wxInputStream& stream)
     if ( posOld == wxInvalidOffset )
     {
         // can't test unseekable stream
     if ( posOld == wxInvalidOffset )
     {
         // can't test unseekable stream

-        return FALSE;
+        return false;

     }
 
     bool ok = DoCanRead(stream);
     }
 
     bool ok = DoCanRead(stream);


@@ -1457,7 +1460,7 @@ bool wxImageHandler::CallDoCanRead(wxInputStream& stream)
         wxLogDebug(_T("Failed to rewind the stream in wxImageHandler!"));
 
         // reading would fail anyhow as we're not at the right position
         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 ok;
     }
 
     return ok;


@@ -1525,7 +1528,7 @@ wxImageHistogram::FindFirstUnusedColour(unsigned char *r,
                 if ( b2 >= 255 )
                 {
                     wxLogError(_("GetUnusedColour:: No Unused Color in image ") );
                 if ( b2 >= 255 )
                 {
                     wxLogError(_("GetUnusedColour:: No Unused Color in image ") );

-                    return FALSE;
+                    return false;

                 }
             }
         }
                 }
             }
         }


@@ -1540,7 +1543,7 @@ wxImageHistogram::FindFirstUnusedColour(unsigned char *r,
     if ( b )
         *b = b2;
 
     if ( b )
         *b = b2;
 

-    return TRUE;
+    return true;

 }
 
 bool
 }
 
 bool


@@ -1690,7 +1693,7 @@ wxImage wxImage::Rotate(double angle, const wxPoint & centre_of_rotation, bool i
     int x2 = (int) ceil (wxMax (wxMax(p1.x, p2.x), wxMax(p3.x, p4.x)));
     int y2 = (int) ceil (wxMax (wxMax(p1.y, p2.y), wxMax(p3.y, p4.y)));
 
     int x2 = (int) ceil (wxMax (wxMax(p1.x, p2.x), wxMax(p3.x, p4.x)));
     int y2 = (int) ceil (wxMax (wxMax(p1.y, p2.y), wxMax(p3.y, p4.y)));
 

-    wxImage rotated (x2 - x1 + 1, y2 - y1 + 1);
+    wxImage rotated (x2 - x1 + 1, y2 - y1 + 1, false);

 
     if (offset_after_rotation != NULL)
     {
 
     if (offset_after_rotation != NULL)
     {


@@ -1893,7 +1896,7 @@ class wxImageModule: public wxModule
 DECLARE_DYNAMIC_CLASS(wxImageModule)
 public:
     wxImageModule() {}
 DECLARE_DYNAMIC_CLASS(wxImageModule)
 public:
     wxImageModule() {}

-    bool OnInit() { wxImage::InitStandardHandlers(); return TRUE; };
+    bool OnInit() { wxImage::InitStandardHandlers(); return true; };

     void OnExit() { wxImage::CleanUpHandlers(); };
 };
 
     void OnExit() { wxImage::CleanUpHandlers(); };
 };