theme brush erasing and cleanup

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

diff --git a/src/mac/carbon/bitmap.cpp b/src/mac/carbon/bitmap.cpp
index 28c71c4336e53ec727608d6e5f6fd6c5db68ae6e..02788c2c8ef3f6d2d3cfcee9036df709830737dc 100644 (file)
--- a/src/mac/carbon/bitmap.cpp
+++ b/src/mac/carbon/bitmap.cpp
@@ -254,6 +254,7 @@ void wxMacReleaseBitmapButton( ControlButtonContentInfo*info )
     }
 }
 
+#define M_BITMAPDATA ((wxBitmapRefData *)m_refData)
 
 void wxBitmapRefData::Init()
 {
@@ -539,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 ;