added missing check for wxUSE_JOYSTICK

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

diff --git a/src/mac/carbon/bitmap.cpp b/src/mac/carbon/bitmap.cpp
index 70d0a077612a6375e9e246a6593960b1476c6103..d049af15efb8cca8bf3c16218ba695cb5ee5bcc4 100644 (file)
--- a/src/mac/carbon/bitmap.cpp
+++ b/src/mac/carbon/bitmap.cpp
@@ -23,10 +23,6 @@
 #include "wx/image.h"
 #include "wx/xpmdecod.h"
 
-#ifndef __UNIX__
-  #define OBSOLETE_XPM_DATA_HANDLER
-#endif
-
 extern "C"
 {
 #ifdef OBSOLETE_XPM_DATA_HANDLER
@@ -205,6 +201,7 @@ wxBitmapRefData::wxBitmapRefData()
     m_bitmapMask = NULL;
     m_hBitmap = NULL ;
     m_hPict = NULL ;
+    m_hIcon = NULL ;
     m_bitmapType = kMacBitmapTypeUnknownType ;
 }
 
@@ -230,6 +227,13 @@ wxBitmapRefData::~wxBitmapRefData()
                                }
                        }
                        break ;
+               case kMacBitmapTypeIcon :
+               if ( m_hIcon )
+               {
+                       DisposeCIcon( m_hIcon ) ;
+                       m_hIcon = NULL ;
+               }
+               
                default :
                        // unkown type ?
                        break ;
@@ -492,7 +496,7 @@ void wxBitmap::SetHBITMAP(WXHBITMAP bmp)
 {
     M_BITMAPDATA->m_bitmapType = kMacBitmapTypeGrafWorld ;
     M_BITMAPDATA->m_hBitmap = bmp ;
-               M_BITMAPDATA->m_ok = (M_BITMAPDATA->m_hBitmap != NULL ) ;
+       M_BITMAPDATA->m_ok = (M_BITMAPDATA->m_hBitmap != NULL ) ;
 }
 
 bool wxBitmap::LoadFile(const wxString& filename, long type)
@@ -588,7 +592,7 @@ wxBitmap::wxBitmap(const wxImage& image, int depth)
 
     // Create mask
     if ( image.HasMask() ) {
-        SetMask(new wxMask( maskBitmap ));
+//        SetMask(new wxMask( maskBitmap ));
     }
     
     UnlockPixels( GetGWorldPixMap(GetHBITMAP()) );