slowly approaching dcscreen...

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

diff --git a/src/mac/carbon/bitmap.cpp b/src/mac/carbon/bitmap.cpp
index 89a0e4998cd0ce4dc77d3ede0e913b29a04fff6b..02788c2c8ef3f6d2d3cfcee9036df709830737dc 100644 (file)
--- a/src/mac/carbon/bitmap.cpp
+++ b/src/mac/carbon/bitmap.cpp
@@ -36,6 +36,8 @@ IMPLEMENT_DYNAMIC_CLASS(wxBitmapHandler, wxObject )
 
 #include "wx/mac/uma.h"
 
+#include "wx/dcmemory.h"
+
 // Implementation Notes
 // -------------------- 
 //
@@ -240,7 +242,7 @@ void wxMacReleaseBitmapButton( ControlButtonContentInfo*info )
     {
         ReleaseIconRef(info->u.iconRef) ;
     }
-#if wxMAC_USE_CORE_GRAPHICS
+#if wxMAC_USE_CORE_GRAPHICS && MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2
     else if ( info->contentType == kControlContentCGImageRef )
     {
         CGImageRelease( info->u.imageRef ) ;
@@ -252,6 +254,7 @@ void wxMacReleaseBitmapButton( ControlButtonContentInfo*info )
     }
 }
 
+#define M_BITMAPDATA ((wxBitmapRefData *)m_refData)
 
 void wxBitmapRefData::Init()
 {
@@ -537,9 +540,9 @@ bool wxBitmap::CopyFromIcon(const wxIcon& icon)
         Handle imagehandle = NewHandle(0) ;
         Handle maskhandle = NewHandle(0) ;
         
-        OSType maskType ;
-        OSType dataType ;
-        IconSelectorValue selector ;    
+        OSType maskType = 0;
+        OSType dataType = 0;
+        IconSelectorValue selector = 0 ;    
         if ( w == 128 )
         {
             dataType = kThumbnail32BitData ;