Try to better revert to the original string value in wxBitmapComboBox::RecreateControl()

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

diff --git a/src/osx/core/bitmap.cpp b/src/osx/core/bitmap.cpp
index 563eaf515aa031efa48a8d69c577b7bc704d7c84..64d0b39e2d21096129a8c4130126d87bdf0498d9 100644 (file)
--- a/src/osx/core/bitmap.cpp
+++ b/src/osx/core/bitmap.cpp
@@ -287,8 +287,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 +496,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 +613,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 +639,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 +651,7 @@ CGImageRef wxBitmapRefData::CreateCGImage() const
                 CGImageRelease(tempImage);
             }
             else
                 CGImageRelease(tempImage);
             }
             else

+#endif

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


@@ -773,11 +782,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,6 +790,12 @@ wxBitmapRefData::~wxBitmapRefData()
     Free() ;
 }
 
     Free() ;
 }
 

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

 bool wxBitmap::CopyFromIcon(const wxIcon& icon)
 {
     bool created = false ;
 bool wxBitmap::CopyFromIcon(const wxIcon& icon)
 {
     bool created = false ;


@@ -890,14 +901,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 +955,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);


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

-#if wxOSX_USE_COCOA_OR_IPHONE
+#if wxOSX_USE_COCOA

 
 WX_NSImage wxBitmap::GetNSImage() const
 {
     wxCFRef< CGImageRef > cgimage(CreateCGImage());
 
 WX_NSImage wxBitmap::GetNSImage() const
 {
     wxCFRef< CGImageRef > cgimage(CreateCGImage());

-    return wxOSXCreateNSImageFromCGImage( cgimage );
+    return wxOSXGetNSImageFromCGImage( cgimage );

 }
 
 #endif
 
 }
 
 #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
 {
     wxCHECK_MSG( Ok() &&
 wxBitmap wxBitmap::GetSubBitmap(const wxRect &rect) const
 {
     wxCHECK_MSG( Ok() &&


@@ -1164,7 +1171,7 @@ wxBitmap::wxBitmap(const wxImage& image, int depth)
     int height = image.GetHeight();
 
     wxBitmapRefData* bitmapRefData;
     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())


@@ -1384,7 +1391,7 @@ int wxBitmap::GetDepth() const
 
 wxMask *wxBitmap::GetMask() const
 {
 
 wxMask *wxBitmap::GetMask() const
 {

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

 
    return M_BITMAPDATA->m_bitmapMask;
 }
 
    return M_BITMAPDATA->m_bitmapMask;
 }


@@ -1647,7 +1654,7 @@ WXHBITMAP wxMask::GetHBITMAP() const
 // Standard Handlers
 // ----------------------------------------------------------------------------
 
 // Standard Handlers
 // ----------------------------------------------------------------------------
 

-#if !defined( __LP64__ ) && !defined(__WXOSX_IPHONE__) 
+#if !defined( __LP64__ ) && !defined(__WXOSX_IPHONE__)

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


@@ -1661,8 +1668,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)


@@ -1670,7 +1680,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))
 {