Fix the URL generated by Doxygen @sampledir macro.

[wxWidgets.git] / src / osx / core / bitmap.cpp

diff --git a/src/osx/core/bitmap.cpp b/src/osx/core/bitmap.cpp
index 0b4dfcf11a99d0ef35d9ce356d2f969e0bee26db..6e49503de663781e60e7f44bc4e293be028670df 100644 (file)
--- a/src/osx/core/bitmap.cpp
+++ b/src/osx/core/bitmap.cpp
@@ -57,6 +57,7 @@ class WXDLLEXPORT wxBitmapRefData: public wxGDIRefData
     friend class WXDLLIMPEXP_FWD_CORE wxCursor;
 public:
     wxBitmapRefData(int width , int height , int depth);
     friend class WXDLLIMPEXP_FWD_CORE wxCursor;
 public:
     wxBitmapRefData(int width , int height , int depth);

+    wxBitmapRefData(CGImageRef image);

     wxBitmapRefData();
     wxBitmapRefData(const wxBitmapRefData &tocopy);
 
     wxBitmapRefData();
     wxBitmapRefData(const wxBitmapRefData &tocopy);
 


@@ -111,6 +112,7 @@ public:
     int           GetBytesPerRow() const { return m_bytesPerRow; }
     private :
     bool Create(int width , int height , int depth);
     int           GetBytesPerRow() const { return m_bytesPerRow; }
     private :
     bool Create(int width , int height , int depth);

+    bool Create( CGImageRef image );

     void Init();
 
     int           m_width;
     void Init();
 
     int           m_width;


@@ -147,7 +149,7 @@ static int GetBestBytesPerRow( int rawBytes )
 void wxMacCreateBitmapButton( ControlButtonContentInfo*info , const wxBitmap& bitmap , int forceType )
 {
     memset( info , 0 , sizeof(ControlButtonContentInfo) ) ;
 void wxMacCreateBitmapButton( ControlButtonContentInfo*info , const wxBitmap& bitmap , int forceType )
 {
     memset( info , 0 , sizeof(ControlButtonContentInfo) ) ;

-    if ( bitmap.Ok() )
+    if ( bitmap.IsOk() )

     {
         wxBitmapRefData * bmap = bitmap.GetBitmapData() ;
         if ( bmap == NULL )
     {
         wxBitmapRefData * bmap = bitmap.GetBitmapData() ;
         if ( bmap == NULL )


@@ -253,7 +255,7 @@ void wxBitmapRefData::Init()
     m_hasAlpha = false;
 }
 
     m_hasAlpha = false;
 }
 

-wxBitmapRefData::wxBitmapRefData(const wxBitmapRefData &tocopy)
+wxBitmapRefData::wxBitmapRefData(const wxBitmapRefData &tocopy) : wxGDIRefData()

 {
     Init();
     Create(tocopy.m_width, tocopy.m_height, tocopy.m_depth);
 {
     Init();
     Create(tocopy.m_width, tocopy.m_height, tocopy.m_depth);


@@ -280,6 +282,53 @@ wxBitmapRefData::wxBitmapRefData( int w , int h , int d )
     Create( w , h , d ) ;
 }
 
     Create( w , h , d ) ;
 }
 

+wxBitmapRefData::wxBitmapRefData(CGImageRef image)
+{
+    Init();
+    Create( image );
+}    
+// code from Technical Q&A QA1509
+
+bool wxBitmapRefData::Create(CGImageRef image)
+{
+    if ( image != NULL )
+    {
+        m_width = CGImageGetWidth(image);
+        m_height = CGImageGetHeight(image);
+        m_depth = 32;
+        m_hBitmap = NULL;
+        
+        m_bytesPerRow = GetBestBytesPerRow( m_width * 4 ) ;
+        size_t size = m_bytesPerRow * m_height ;
+        void* data = m_memBuf.GetWriteBuf( size ) ;
+        if ( data != NULL )
+        {
+            memset( data , 0 , size ) ;
+            m_memBuf.UngetWriteBuf( size ) ;
+            CGImageAlphaInfo alpha = CGImageGetAlphaInfo(image);
+            if ( alpha == kCGImageAlphaNone || alpha == kCGImageAlphaNoneSkipLast || alpha == kCGImageAlphaNoneSkipLast )
+            {
+                m_hBitmap = CGBitmapContextCreate((char*) data, m_width, m_height, 8, m_bytesPerRow, wxMacGetGenericRGBColorSpace(), kCGImageAlphaNoneSkipFirst );
+            }
+            else 
+            {
+                m_hasAlpha = true;
+                m_hBitmap = CGBitmapContextCreate((char*) data, m_width, m_height, 8, m_bytesPerRow, wxMacGetGenericRGBColorSpace(), kCGImageAlphaPremultipliedFirst );
+            }
+            CGRect rect = {{0,0},{m_width,m_height}}; 
+            CGContextDrawImage(m_hBitmap, rect, image);
+            
+            wxASSERT_MSG( m_hBitmap , wxT("Unable to create CGBitmapContext context") ) ;
+            CGContextTranslateCTM( m_hBitmap, 0,  m_height );
+            CGContextScaleCTM( m_hBitmap, 1, -1 );
+        } /* data != NULL */
+    }
+    m_ok = ( m_hBitmap != NULL ) ;
+    
+    return m_ok ;
+    
+}
+

 bool wxBitmapRefData::Create( int w , int h , int d )
 {
     m_width = wxMax(1, w);
 bool wxBitmapRefData::Create( int w , int h , int d )
 {
     m_width = wxMax(1, w);


@@ -287,8 +336,8 @@ bool wxBitmapRefData::Create( int w , int h , int d )
     m_depth = d ;
     m_hBitmap = NULL ;
 
     m_depth = d ;
     m_hBitmap = NULL ;
 

-    m_bytesPerRow = GetBestBytesPerRow( w * 4 ) ;
-    size_t size = m_bytesPerRow * h ;
+    m_bytesPerRow = GetBestBytesPerRow( m_width * 4 ) ;
+    size_t size = m_bytesPerRow * m_height ;

     void* data = m_memBuf.GetWriteBuf( size ) ;
     if ( data != NULL )
     {
     void* data = m_memBuf.GetWriteBuf( size ) ;
     if ( data != NULL )
     {


@@ -496,8 +545,13 @@ IconRef wxBitmapRefData::GetIconRef()
                      }
                 }
                 HUnlock( data );
                      }
                 }
                 HUnlock( data );

+

                 OSStatus err = SetIconFamilyData( iconFamily, dataType , data );
                 OSStatus err = SetIconFamilyData( iconFamily, dataType , data );

-                wxASSERT_MSG( err == noErr , wxT("Error when adding bitmap") );
+                if ( err != noErr )
+                {
+                    wxFAIL_MSG("Error when adding bitmap");
+                }
+

                 DisposeHandle( data );
             }
             else
                 DisposeHandle( data );
             }
             else


@@ -608,13 +662,13 @@ PicHandle wxBitmapRefData::GetPictHandle()
                 err = GraphicsExportDoExport(exporter, NULL);
                 CGImageRelease( imageRef );
 
                 err = GraphicsExportDoExport(exporter, NULL);
                 CGImageRelease( imageRef );
 

-                               size_t handleSize = GetHandleSize( (Handle) m_pictHandle );
-                               // the 512 bytes header is only needed for pict files, but not in memory
-                               if ( handleSize >= 512 )
-                               {
-                                       memmove( *m_pictHandle , (char*)(*m_pictHandle)+512, handleSize - 512 );
-                                       SetHandleSize( (Handle) m_pictHandle, handleSize - 512 );
-                               }
+                size_t handleSize = GetHandleSize( (Handle) m_pictHandle );
+                // the 512 bytes header is only needed for pict files, but not in memory
+                if ( handleSize >= 512 )
+                {
+                    memmove( *m_pictHandle , (char*)(*m_pictHandle)+512, handleSize - 512 );
+                    SetHandleSize( (Handle) m_pictHandle, handleSize - 512 );
+                }

             }
             CloseComponent( exporter );
         }
             }
             CloseComponent( exporter );
         }


@@ -634,6 +688,9 @@ CGImageRef wxBitmapRefData::CreateCGImage() const
     {
         if ( m_depth != 1 && m_bitmapMask == NULL )
         {
     {
         if ( m_depth != 1 && m_bitmapMask == NULL )
         {

+#if 0
+            // in order for this code to work properly, wxMask would have to invert black and white
+            // in the native bitmap

             if ( m_bitmapMask )
             {
                 CGImageRef tempImage = CGBitmapContextCreateImage( m_hBitmap );
             if ( m_bitmapMask )
             {
                 CGImageRef tempImage = CGBitmapContextCreateImage( m_hBitmap );


@@ -643,6 +700,7 @@ CGImageRef wxBitmapRefData::CreateCGImage() const
                 CGImageRelease(tempImage);
             }
             else
                 CGImageRelease(tempImage);
             }
             else

+#endif

                 image = CGBitmapContextCreateImage( m_hBitmap );
         }
         else
                 image = CGBitmapContextCreateImage( m_hBitmap );
         }
         else


@@ -773,11 +831,7 @@ void wxBitmapRefData::Free()
         m_hBitmap = NULL ;
     }
 
         m_hBitmap = NULL ;
     }
 

-    if (m_bitmapMask)
-    {
-        delete m_bitmapMask;
-        m_bitmapMask = NULL;
-    }
+    wxDELETE(m_bitmapMask);

 }
 
 wxBitmapRefData::~wxBitmapRefData()
 }
 
 wxBitmapRefData::~wxBitmapRefData()


@@ -785,14 +839,20 @@ wxBitmapRefData::~wxBitmapRefData()
     Free() ;
 }
 
     Free() ;
 }
 

+
+
+// ----------------------------------------------------------------------------
+// wxBitmap
+// ----------------------------------------------------------------------------
+

 bool wxBitmap::CopyFromIcon(const wxIcon& icon)
 {
     bool created = false ;
     int w = icon.GetWidth() ;
     int h = icon.GetHeight() ;
 
 bool wxBitmap::CopyFromIcon(const wxIcon& icon)
 {
     bool created = false ;
     int w = icon.GetWidth() ;
     int h = icon.GetHeight() ;
 

-    Create( icon.GetWidth() , icon.GetHeight() ) ;
-#ifndef __WXOSX_IPHONE__
+    Create( w , h ) ;
+#ifdef __WXOSX_CARBON__

     if ( w == h && ( w == 16 || w == 32 || w == 48 || w == 128 ) )
     {
         IconFamilyHandle iconFamily = NULL ;
     if ( w == h && ( w == 16 || w == 32 || w == 48 || w == 128 ) )
     {
         IconFamilyHandle iconFamily = NULL ;


@@ -890,14 +950,6 @@ bool wxBitmap::CopyFromIcon(const wxIcon& icon)
     return true;
 }
 
     return true;
 }
 

-wxBitmap::wxBitmap()
-{
-}
-
-wxBitmap::~wxBitmap()
-{
-}
-

 wxBitmap::wxBitmap(const char bits[], int the_width, int the_height, int no_bits)
 {
     wxBitmapRefData* bitmapRefData;
 wxBitmap::wxBitmap(const char bits[], int the_width, int the_height, int no_bits)
 {
     wxBitmapRefData* bitmapRefData;


@@ -952,11 +1004,6 @@ wxBitmap::wxBitmap(const char bits[], int the_width, int the_height, int no_bits
     } /* bitmapRefData->IsOk() */
 }
 
     } /* bitmapRefData->IsOk() */
 }
 

-wxBitmap::wxBitmap(int w, int h, int d)
-{
-    (void)Create(w, h, d);
-}
-

 wxBitmap::wxBitmap(const void* data, wxBitmapType type, int width, int height, int depth)
 {
     (void) Create(data, type, width, height, depth);
 wxBitmap::wxBitmap(const void* data, wxBitmapType type, int width, int height, int depth)
 {
     (void) Create(data, type, width, height, depth);


@@ -967,6 +1014,11 @@ wxBitmap::wxBitmap(const wxString& filename, wxBitmapType type)
     LoadFile(filename, type);
 }
 
     LoadFile(filename, type);
 }
 

+wxBitmap::wxBitmap(CGImageRef image)
+{
+    (void) Create(image);
+}
+

 wxGDIRefData* wxBitmap::CreateGDIRefData() const
 {
     return new wxBitmapRefData;
 wxGDIRefData* wxBitmap::CreateGDIRefData() const
 {
     return new wxBitmapRefData;


@@ -974,33 +1026,33 @@ wxGDIRefData* wxBitmap::CreateGDIRefData() const
 
 wxGDIRefData* wxBitmap::CloneGDIRefData(const wxGDIRefData* data) const
 {
 
 wxGDIRefData* wxBitmap::CloneGDIRefData(const wxGDIRefData* data) const
 {

-    return new wxBitmapRefData(*wx_static_cast(const wxBitmapRefData *, data));
+    return new wxBitmapRefData(*static_cast<const wxBitmapRefData *>(data));

 }
 
 void * wxBitmap::GetRawAccess() const
 {
 }
 
 void * wxBitmap::GetRawAccess() const
 {

-    wxCHECK_MSG( Ok() , NULL , wxT("invalid bitmap") ) ;
+    wxCHECK_MSG( IsOk() , NULL , wxT("invalid bitmap") ) ;

 
     return M_BITMAPDATA->GetRawAccess() ;
 }
 
 void * wxBitmap::BeginRawAccess()
 {
 
     return M_BITMAPDATA->GetRawAccess() ;
 }
 
 void * wxBitmap::BeginRawAccess()
 {

-    wxCHECK_MSG( Ok() , NULL , wxT("invalid bitmap") ) ;
+    wxCHECK_MSG( IsOk() , NULL , wxT("invalid bitmap") ) ;

 
     return M_BITMAPDATA->BeginRawAccess() ;
 }
 
 void wxBitmap::EndRawAccess()
 {
 
     return M_BITMAPDATA->BeginRawAccess() ;
 }
 
 void wxBitmap::EndRawAccess()
 {

-    wxCHECK_RET( Ok() , wxT("invalid bitmap") ) ;
+    wxCHECK_RET( IsOk() , wxT("invalid bitmap") ) ;

 
     M_BITMAPDATA->EndRawAccess() ;
 }
 
 CGImageRef wxBitmap::CreateCGImage() const
 {
 
     M_BITMAPDATA->EndRawAccess() ;
 }
 
 CGImageRef wxBitmap::CreateCGImage() const
 {

-    wxCHECK_MSG( Ok(), NULL , wxT("invalid bitmap") ) ;
+    wxCHECK_MSG( IsOk(), NULL , wxT("invalid bitmap") ) ;

 
     return M_BITMAPDATA->CreateCGImage() ;
 }
 
     return M_BITMAPDATA->CreateCGImage() ;
 }


@@ -1008,7 +1060,7 @@ CGImageRef wxBitmap::CreateCGImage() const
 #ifndef  __WXOSX_IPHONE__
 IconRef wxBitmap::GetIconRef() const
 {
 #ifndef  __WXOSX_IPHONE__
 IconRef wxBitmap::GetIconRef() const
 {

-    wxCHECK_MSG( Ok(), NULL , wxT("invalid bitmap") ) ;
+    wxCHECK_MSG( IsOk(), NULL , wxT("invalid bitmap") ) ;

 
     return M_BITMAPDATA->GetIconRef() ;
 }
 
     return M_BITMAPDATA->GetIconRef() ;
 }


@@ -1021,16 +1073,35 @@ IconRef wxBitmap::CreateIconRef() const
 }
 #endif
 
 }
 #endif
 

+#if wxOSX_USE_COCOA
+
+WX_NSImage wxBitmap::GetNSImage() const
+{
+    wxCFRef< CGImageRef > cgimage(CreateCGImage());
+    return wxOSXGetNSImageFromCGImage( cgimage );
+}
+
+#endif
+
+#if wxOSX_USE_IPHONE
+
+WX_UIImage wxBitmap::GetUIImage() const
+{
+    wxCFRef< CGImageRef > cgimage(CreateCGImage());
+    return wxOSXGetUIImageFromCGImage( cgimage );
+}
+
+#endif

 wxBitmap wxBitmap::GetSubBitmap(const wxRect &rect) const
 {
 wxBitmap wxBitmap::GetSubBitmap(const wxRect &rect) const
 {

-    wxCHECK_MSG( Ok() &&
+    wxCHECK_MSG( IsOk() &&

                 (rect.x >= 0) && (rect.y >= 0) &&
                 (rect.x+rect.width <= GetWidth()) &&
                 (rect.y+rect.height <= GetHeight()),
                 wxNullBitmap, wxT("invalid bitmap or bitmap region") );
 
     wxBitmap ret( rect.width, rect.height, GetDepth() );
                 (rect.x >= 0) && (rect.y >= 0) &&
                 (rect.x+rect.width <= GetWidth()) &&
                 (rect.y+rect.height <= GetHeight()),
                 wxNullBitmap, wxT("invalid bitmap or bitmap region") );
 
     wxBitmap ret( rect.width, rect.height, GetDepth() );

-    wxASSERT_MSG( ret.Ok(), wxT("GetSubBitmap error") );
+    wxASSERT_MSG( ret.IsOk(), wxT("GetSubBitmap error") );

 
     int destwidth = rect.width ;
     int destheight = rect.height ;
 
     int destwidth = rect.width ;
     int destheight = rect.height ;


@@ -1095,6 +1166,16 @@ bool wxBitmap::Create(int w, int h, int d)
     return M_BITMAPDATA->IsOk() ;
 }
 
     return M_BITMAPDATA->IsOk() ;
 }
 

+
+bool wxBitmap::Create(CGImageRef image)
+{
+    UnRef();
+    
+    m_refData = new wxBitmapRefData( image );
+    
+    return M_BITMAPDATA->IsOk() ;
+}
+

 bool wxBitmap::LoadFile(const wxString& filename, wxBitmapType type)
 {
     UnRef();
 bool wxBitmap::LoadFile(const wxString& filename, wxBitmapType type)
 {
     UnRef();


@@ -1111,7 +1192,7 @@ bool wxBitmap::LoadFile(const wxString& filename, wxBitmapType type)
     {
 #if wxUSE_IMAGE
         wxImage loadimage(filename, type);
     {
 #if wxUSE_IMAGE
         wxImage loadimage(filename, type);

-        if (loadimage.Ok())
+        if (loadimage.IsOk())

         {
             *this = loadimage;
 
         {
             *this = loadimage;
 


@@ -1147,14 +1228,14 @@ bool wxBitmap::Create(const void* data, wxBitmapType type, int width, int height
 
 wxBitmap::wxBitmap(const wxImage& image, int depth)
 {
 
 wxBitmap::wxBitmap(const wxImage& image, int depth)
 {

-    wxCHECK_RET( image.Ok(), wxT("invalid image") );
+    wxCHECK_RET( image.IsOk(), wxT("invalid image") );

 
     // width and height of the device-dependent bitmap
     int width = image.GetWidth();
     int height = image.GetHeight();
 
     wxBitmapRefData* bitmapRefData;
 
     // width and height of the device-dependent bitmap
     int width = image.GetWidth();
     int height = image.GetHeight();
 
     wxBitmapRefData* bitmapRefData;

-    
+

     m_refData = bitmapRefData = new wxBitmapRefData( width , height , depth ) ;
 
     if ( bitmapRefData->IsOk())
     m_refData = bitmapRefData = new wxBitmapRefData( width , height , depth ) ;
 
     if ( bitmapRefData->IsOk())


@@ -1221,7 +1302,7 @@ wxImage wxBitmap::ConvertToImage() const
 {
     wxImage image;
 
 {
     wxImage image;
 

-    wxCHECK_MSG( Ok(), wxNullImage, wxT("invalid bitmap") );
+    wxCHECK_MSG( IsOk(), wxNullImage, wxT("invalid bitmap") );

 
     // create an wxImage object
     int width = GetWidth();
 
     // create an wxImage object
     int width = GetWidth();


@@ -1353,35 +1434,35 @@ bool wxBitmap::SaveFile( const wxString& filename,
 
 int wxBitmap::GetHeight() const
 {
 
 int wxBitmap::GetHeight() const
 {

-   wxCHECK_MSG( Ok(), -1, wxT("invalid bitmap") );
+   wxCHECK_MSG( IsOk(), -1, wxT("invalid bitmap") );

 
    return M_BITMAPDATA->GetHeight();
 }
 
 int wxBitmap::GetWidth() const
 {
 
    return M_BITMAPDATA->GetHeight();
 }
 
 int wxBitmap::GetWidth() const
 {

-   wxCHECK_MSG( Ok(), -1, wxT("invalid bitmap") );
+   wxCHECK_MSG( IsOk(), -1, wxT("invalid bitmap") );

 
    return M_BITMAPDATA->GetWidth() ;
 }
 
 int wxBitmap::GetDepth() const
 {
 
    return M_BITMAPDATA->GetWidth() ;
 }
 
 int wxBitmap::GetDepth() const
 {

-   wxCHECK_MSG( Ok(), -1, wxT("invalid bitmap") );
+   wxCHECK_MSG( IsOk(), -1, wxT("invalid bitmap") );

 
    return M_BITMAPDATA->GetDepth();
 }
 
 wxMask *wxBitmap::GetMask() const
 {
 
    return M_BITMAPDATA->GetDepth();
 }
 
 wxMask *wxBitmap::GetMask() const
 {

-   wxCHECK_MSG( Ok(), (wxMask *) NULL, wxT("invalid bitmap") );
+   wxCHECK_MSG( IsOk(), NULL, wxT("invalid bitmap") );

 
    return M_BITMAPDATA->m_bitmapMask;
 }
 
 bool wxBitmap::HasAlpha() const
 {
 
    return M_BITMAPDATA->m_bitmapMask;
 }
 
 bool wxBitmap::HasAlpha() const
 {

-   wxCHECK_MSG( Ok(), false , wxT("invalid bitmap") );
+   wxCHECK_MSG( IsOk(), false , wxT("invalid bitmap") );

 
    return M_BITMAPDATA->HasAlpha() ;
 }
 
    return M_BITMAPDATA->HasAlpha() ;
 }


@@ -1413,7 +1494,7 @@ void wxBitmap::SetOk(bool isOk)
 #if wxUSE_PALETTE
 wxPalette *wxBitmap::GetPalette() const
 {
 #if wxUSE_PALETTE
 wxPalette *wxBitmap::GetPalette() const
 {

-   wxCHECK_MSG( Ok(), NULL, wxT("Invalid bitmap  GetPalette()") );
+   wxCHECK_MSG( IsOk(), NULL, wxT("Invalid bitmap  GetPalette()") );

 
    return &M_BITMAPDATA->m_bitmapPalette;
 }
 
    return &M_BITMAPDATA->m_bitmapPalette;
 }


@@ -1450,7 +1531,7 @@ wxMask::wxMask()
     Init() ;
 }
 
     Init() ;
 }
 

-wxMask::wxMask(const wxMask &tocopy)
+wxMask::wxMask(const wxMask &tocopy) : wxObject()

 {
     Init();
 
 {
     Init();
 


@@ -1557,26 +1638,29 @@ bool wxMask::Create(const wxBitmap& bitmap)
     size_t size = m_bytesPerRow * m_height ;
     unsigned char * destdatabase = (unsigned char*) m_memBuf.GetWriteBuf( size ) ;
     wxASSERT( destdatabase != NULL ) ;
     size_t size = m_bytesPerRow * m_height ;
     unsigned char * destdatabase = (unsigned char*) m_memBuf.GetWriteBuf( size ) ;
     wxASSERT( destdatabase != NULL ) ;

-
-    memset( destdatabase , 0 , size ) ;
-    unsigned char * srcdata = (unsigned char*) bitmap.GetRawAccess() ;
-
-    for ( int y = 0 ; y < m_height ; ++y , destdatabase += m_bytesPerRow )
+    
+    if ( destdatabase )

     {
     {

-        unsigned char *destdata = destdatabase ;
-        unsigned char r, g, b;
+        memset( destdatabase , 0 , size ) ;
+        unsigned char * srcdata = (unsigned char*) bitmap.GetRawAccess() ;

 
 

-        for ( int x = 0 ; x < m_width ; ++x )
+        for ( int y = 0 ; y < m_height ; ++y , destdatabase += m_bytesPerRow )

         {
         {

-            srcdata++ ;
-            r = *srcdata++ ;
-            g = *srcdata++ ;
-            b = *srcdata++ ;
+            unsigned char *destdata = destdatabase ;
+            unsigned char r, g, b;

 
 

-            if ( ( r + g + b ) > 0x10 )
-                *destdata++ = 0xFF ;
-            else
-                *destdata++ = 0x00 ;
+            for ( int x = 0 ; x < m_width ; ++x )
+            {
+                srcdata++ ;
+                r = *srcdata++ ;
+                g = *srcdata++ ;
+                b = *srcdata++ ;
+
+                if ( ( r + g + b ) > 0x10 )
+                    *destdata++ = 0xFF ;
+                else
+                    *destdata++ = 0x00 ;
+            }

         }
     }
 
         }
     }
 


@@ -1637,7 +1721,89 @@ WXHBITMAP wxMask::GetHBITMAP() const
 // Standard Handlers
 // ----------------------------------------------------------------------------
 
 // Standard Handlers
 // ----------------------------------------------------------------------------
 

-#if !defined( __LP64__ ) && !defined(__WXOSX_IPHONE__) 
+class WXDLLEXPORT wxBundleResourceHandler: public wxBitmapHandler
+{
+    DECLARE_ABSTRACT_CLASS(wxBundleResourceHandler)
+    
+public:
+    inline wxBundleResourceHandler()
+    {
+    };
+    
+    virtual bool LoadFile(wxBitmap *bitmap,
+                          const wxString& name,
+                          wxBitmapType type,
+                          int desiredWidth,
+                          int desiredHeight);
+};
+
+IMPLEMENT_ABSTRACT_CLASS(wxBundleResourceHandler, wxBitmapHandler);
+
+class WXDLLEXPORT wxPNGResourceHandler: public wxBundleResourceHandler
+{
+    DECLARE_DYNAMIC_CLASS(wxPNGResourceHandler)
+    
+public:
+    inline wxPNGResourceHandler()
+    {
+        SetName(wxT("PNG resource"));
+        SetExtension("PNG");
+        SetType(wxBITMAP_TYPE_PNG_RESOURCE);
+    };
+};
+
+IMPLEMENT_DYNAMIC_CLASS(wxPNGResourceHandler, wxBundleResourceHandler)
+
+class WXDLLEXPORT wxJPEGResourceHandler: public wxBundleResourceHandler
+{
+    DECLARE_DYNAMIC_CLASS(wxPNGResourceHandler)
+    
+public:
+    inline wxJPEGResourceHandler()
+    {
+        SetName(wxT("JPEG resource"));
+        SetExtension("JPEG");
+        SetType(wxBITMAP_TYPE_JPEG_RESOURCE);
+    };
+};
+
+IMPLEMENT_DYNAMIC_CLASS(wxJPEGResourceHandler, wxBundleResourceHandler)
+
+bool wxBundleResourceHandler::LoadFile(wxBitmap *bitmap,
+                                     const wxString& name,
+                                     wxBitmapType WXUNUSED(type),
+                                     int WXUNUSED(desiredWidth),
+                                     int WXUNUSED(desiredHeight))
+{
+    wxString ext = GetExtension().Lower();
+    wxCFStringRef resname(name);
+    wxCFStringRef restype(ext);
+    
+    wxCFRef<CFURLRef> imageURL(CFBundleCopyResourceURL(CFBundleGetMainBundle(), resname, restype, NULL));
+    
+    if ( imageURL.get() != NULL )
+    {
+        // Create the data provider object
+        wxCFRef<CGDataProviderRef> provider(CGDataProviderCreateWithURL (imageURL) );
+        CGImageRef image = NULL;
+        
+        if ( ext == "jpeg" )
+            image = CGImageCreateWithJPEGDataProvider (provider, NULL, true,
+                                                   kCGRenderingIntentDefault);
+        else if ( ext == "png" )
+            image = CGImageCreateWithPNGDataProvider (provider, NULL, true,
+                                                       kCGRenderingIntentDefault);
+        if ( image != NULL )
+        {
+            bitmap->Create(image);
+            CGImageRelease(image);
+        }
+    }
+        
+    return false ;
+}
+
+#if !defined( __LP64__ ) && !defined(__WXOSX_IPHONE__)

 
 class WXDLLEXPORT wxPICTResourceHandler: public wxBitmapHandler
 {
 
 class WXDLLEXPORT wxPICTResourceHandler: public wxBitmapHandler
 {


@@ -1651,8 +1817,11 @@ public:
         SetType(wxBITMAP_TYPE_PICT_RESOURCE);
     };
 
         SetType(wxBITMAP_TYPE_PICT_RESOURCE);
     };
 

-    virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
-          int desiredWidth, int desiredHeight);
+    virtual bool LoadFile(wxBitmap *bitmap,
+                          const wxString& name,
+                          wxBitmapType type,
+                          int desiredWidth,
+                          int desiredHeight);

 };
 
 IMPLEMENT_DYNAMIC_CLASS(wxPICTResourceHandler, wxBitmapHandler)
 };
 
 IMPLEMENT_DYNAMIC_CLASS(wxPICTResourceHandler, wxBitmapHandler)


@@ -1660,7 +1829,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxPICTResourceHandler, wxBitmapHandler)
 
 bool wxPICTResourceHandler::LoadFile(wxBitmap *bitmap,
                                      const wxString& name,
 
 bool wxPICTResourceHandler::LoadFile(wxBitmap *bitmap,
                                      const wxString& name,

-                                     long WXUNUSED(flags),
+                                     wxBitmapType WXUNUSED(type),

                                      int WXUNUSED(desiredWidth),
                                      int WXUNUSED(desiredHeight))
 {
                                      int WXUNUSED(desiredWidth),
                                      int WXUNUSED(desiredHeight))
 {


@@ -1696,6 +1865,8 @@ void wxBitmap::InitStandardHandlers()
 #if wxOSX_USE_COCOA_OR_CARBON
     AddHandler( new wxICONResourceHandler ) ;
 #endif
 #if wxOSX_USE_COCOA_OR_CARBON
     AddHandler( new wxICONResourceHandler ) ;
 #endif

+    AddHandler( new wxPNGResourceHandler );
+    AddHandler( new wxJPEGResourceHandler );

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -1704,7 +1875,7 @@ void wxBitmap::InitStandardHandlers()
 
 void *wxBitmap::GetRawData(wxPixelDataBase& data, int WXUNUSED(bpp))
 {
 
 void *wxBitmap::GetRawData(wxPixelDataBase& data, int WXUNUSED(bpp))
 {

-    if ( !Ok() )
+    if ( !IsOk() )

         // no bitmap, no data (raw or otherwise)
         return NULL;
 
         // no bitmap, no data (raw or otherwise)
         return NULL;