copying as much values from the dc as possible

[wxWidgets.git] / src / mac / carbon / bitmap.cpp

diff --git a/src/mac/carbon/bitmap.cpp b/src/mac/carbon/bitmap.cpp
index 2d354a3f2aef65c0527cd22ab5424a21de7abbc7..706db8ac401b3cf61387c77a152644f183f58263 100644 (file)
--- a/src/mac/carbon/bitmap.cpp
+++ b/src/mac/carbon/bitmap.cpp
@@ -15,10 +15,11 @@
 
 #ifndef WX_PRECOMP
     #include "wx/log.h"
 
 #ifndef WX_PRECOMP
     #include "wx/log.h"

+    #include "wx/dcmemory.h"
+    #include "wx/icon.h"
+    #include "wx/image.h"

 #endif
 
 #endif
 

-#include "wx/icon.h"
-#include "wx/image.h"

 #include "wx/metafile.h"
 #include "wx/xpmdecod.h"
 
 #include "wx/metafile.h"
 #include "wx/xpmdecod.h"
 


@@ -26,7 +27,6 @@
 
 IMPLEMENT_DYNAMIC_CLASS(wxBitmap, wxGDIObject)
 IMPLEMENT_DYNAMIC_CLASS(wxMask, wxObject)
 
 IMPLEMENT_DYNAMIC_CLASS(wxBitmap, wxGDIObject)
 IMPLEMENT_DYNAMIC_CLASS(wxMask, wxObject)

-IMPLEMENT_DYNAMIC_CLASS(wxBitmapHandler, wxObject)

 
 #ifdef __DARWIN__
     #include <ApplicationServices/ApplicationServices.h>
 
 #ifdef __DARWIN__
     #include <ApplicationServices/ApplicationServices.h>


@@ -35,7 +35,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxBitmapHandler, wxObject)
 #endif
 
 #include "wx/mac/uma.h"
 #endif
 
 #include "wx/mac/uma.h"

-#include "wx/dcmemory.h"

 
 // Implementation Notes
 // --------------------
 
 // Implementation Notes
 // --------------------


@@ -165,8 +164,8 @@ wxBitmapRefData::wxBitmapRefData( int w , int h , int d )
 
 bool wxBitmapRefData::Create( int w , int h , int d )
 {
 
 bool wxBitmapRefData::Create( int w , int h , int d )
 {

-    m_width = w ;
-    m_height = h ;
+    m_width = wxMax(1, w);
+    m_height = wxMax(1, h);

     m_depth = d ;
 
     m_bytesPerRow = w * 4 ;
     m_depth = d ;
 
     m_bytesPerRow = w * 4 ;


@@ -396,9 +395,14 @@ IconRef wxBitmapRefData::GetIconRef()
             PicHandle pic = GetPictHandle() ;
             SetIconFamilyData( iconFamily, 'PICT' , (Handle) pic ) ;
         }
             PicHandle pic = GetPictHandle() ;
             SetIconFamilyData( iconFamily, 'PICT' , (Handle) pic ) ;
         }

-

         // transform into IconRef
         // transform into IconRef

-
+#if defined( __WXMAC_OSX__ ) && MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2
+        // cleaner version existing from 10.3 upwards
+        HLock((Handle) iconFamily);
+        OSStatus err = GetIconRefFromIconFamilyPtr( *iconFamily, GetHandleSize((Handle) iconFamily), &m_iconRef );
+        HUnlock((Handle) iconFamily);
+        wxASSERT_MSG( err == noErr , wxT("Error when constructing icon ref") );
+#else

         static int iconCounter = 2 ;
 
         OSStatus err = RegisterIconRefFromIconFamily( 'WXNG' , (OSType) iconCounter, iconFamily, &m_iconRef ) ;
         static int iconCounter = 2 ;
 
         OSStatus err = RegisterIconRefFromIconFamily( 'WXNG' , (OSType) iconCounter, iconFamily, &m_iconRef ) ;


@@ -407,8 +411,9 @@ IconRef wxBitmapRefData::GetIconRef()
         // we have to retain a reference, as Unregister will decrement it
         AcquireIconRef( m_iconRef ) ;
         UnregisterIconRef( 'WXNG' , (OSType) iconCounter ) ;
         // we have to retain a reference, as Unregister will decrement it
         AcquireIconRef( m_iconRef ) ;
         UnregisterIconRef( 'WXNG' , (OSType) iconCounter ) ;

-        DisposeHandle( (Handle) iconFamily ) ;

         ++iconCounter ;
         ++iconCounter ;

+#endif
+        DisposeHandle( (Handle) iconFamily ) ;

     }
 
     return m_iconRef ;
     }
 
     return m_iconRef ;


@@ -836,7 +841,7 @@ wxBitmap::wxBitmap(int w, int h, int d)
     (void)Create(w, h, d);
 }
 
     (void)Create(w, h, d);
 }
 

-wxBitmap::wxBitmap(void *data, wxBitmapType type, int width, int height, int depth)
+wxBitmap::wxBitmap(const void* data, wxBitmapType type, int width, int height, int depth)

 {
     (void) Create(data, type, width, height, depth);
 }
 {
     (void) Create(data, type, width, height, depth);
 }


@@ -846,16 +851,6 @@ wxBitmap::wxBitmap(const wxString& filename, wxBitmapType type)
     LoadFile(filename, type);
 }
 
     LoadFile(filename, type);
 }
 

-wxBitmap::wxBitmap(const char **bits)
-{
-    (void) CreateFromXpm(bits);
-}
-
-wxBitmap::wxBitmap(char **bits)
-{
-    (void) CreateFromXpm((const char **)bits);
-}
-

 void * wxBitmap::GetRawAccess() const
 {
     wxCHECK_MSG( Ok() , NULL , wxT("invalid bitmap") ) ;
 void * wxBitmap::GetRawAccess() const
 {
     wxCHECK_MSG( Ok() , NULL , wxT("invalid bitmap") ) ;


@@ -877,24 +872,6 @@ void wxBitmap::EndRawAccess()
     M_BITMAPDATA->EndRawAccess() ;
 }
 
     M_BITMAPDATA->EndRawAccess() ;
 }
 

-bool wxBitmap::CreateFromXpm(const char **bits)
-{
-#if wxUSE_IMAGE
-    wxCHECK_MSG( bits != NULL, false, wxT("invalid bitmap data") );
-
-    wxXPMDecoder decoder;
-    wxImage img = decoder.ReadData(bits);
-    wxCHECK_MSG( img.Ok(), false, wxT("invalid bitmap data") );
-
-    *this = wxBitmap(img);
-
-    return true;
-#else
-
-    return false;
-#endif
-}
-

 #ifdef __WXMAC_OSX__
 WXCGIMAGEREF wxBitmap::CGImageCreate() const
 {
 #ifdef __WXMAC_OSX__
 WXCGIMAGEREF wxBitmap::CGImageCreate() const
 {


@@ -1009,7 +986,7 @@ bool wxBitmap::LoadFile(const wxString& filename, wxBitmapType type)
     return false;
 }
 
     return false;
 }
 

-bool wxBitmap::Create(void *data, wxBitmapType type, int width, int height, int depth)
+bool wxBitmap::Create(const void* data, wxBitmapType type, int width, int height, int depth)

 {
     UnRef();
 
 {
     UnRef();
 


@@ -1219,7 +1196,7 @@ bool wxBitmap::SaveFile( const wxString& filename,
     return success;
 }
 
     return success;
 }
 

-bool wxBitmap::Ok() const
+bool wxBitmap::IsOk() const

 {
    return (M_BITMAPDATA && M_BITMAPDATA->Ok());
 }
 {
    return (M_BITMAPDATA && M_BITMAPDATA->Ok());
 }


@@ -1530,25 +1507,7 @@ WXHBITMAP wxMask::GetHBITMAP() const
 // wxBitmapHandler
 // ----------------------------------------------------------------------------
 
 // wxBitmapHandler
 // ----------------------------------------------------------------------------
 

-wxBitmapHandler::~wxBitmapHandler()
-{
-}
-
-bool wxBitmapHandler::Create(wxBitmap *bitmap, void *data, long type, int width, int height, int depth)
-{
-    return false;
-}
-
-bool wxBitmapHandler::LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
-        int desiredWidth, int desiredHeight)
-{
-    return false;
-}
-
-bool wxBitmapHandler::SaveFile(const wxBitmap *bitmap, const wxString& name, int type, const wxPalette *palette)
-{
-    return false;
-}
+IMPLEMENT_ABSTRACT_CLASS(wxBitmapHandler, wxBitmapHandlerBase)

 
 // ----------------------------------------------------------------------------
 // Standard Handlers
 
 // ----------------------------------------------------------------------------
 // Standard Handlers