Output deprecated warning for --rezflags and permanently disable it.

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

diff --git a/src/mac/carbon/bitmap.cpp b/src/mac/carbon/bitmap.cpp
index bb3247be561ee3746ba9f31b9cc09df223eb0e07..1e84d4f2c388b4f2aefdff4ae101e1ae74c1b7e0 100644 (file)
--- a/src/mac/carbon/bitmap.cpp
+++ b/src/mac/carbon/bitmap.cpp
@@ -9,10 +9,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "bitmap.h"
-#endif
-

 #include "wx/wxprec.h"
 
 #include "wx/bitmap.h"
 #include "wx/wxprec.h"
 
 #include "wx/bitmap.h"


@@ -87,7 +83,7 @@ void wxMacCreateBitmapButton( ControlButtonContentInfo*info , const wxBitmap& bi
             info->u.iconRef = bmp->GetIconRef() ;
             AcquireIconRef( info->u.iconRef ) ;
         }
             info->u.iconRef = bmp->GetIconRef() ;
             AcquireIconRef( info->u.iconRef ) ;
         }

-#if wxMAC_USE_CORE_GRAPHICS && MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2
+#if defined( __WXMAC_OSX__ ) && MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2 

         else if ( forceType == kControlContentCGImageRef )
         {
             info->contentType = kControlContentCGImageRef ;
         else if ( forceType == kControlContentCGImageRef )
         {
             info->contentType = kControlContentCGImageRef ;


@@ -116,7 +112,7 @@ void wxMacReleaseBitmapButton( ControlButtonContentInfo*info )
     {
         // owned by the bitmap, no release here
     }
     {
         // owned by the bitmap, no release here
     }

-#if wxMAC_USE_CORE_GRAPHICS && MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2
+#if defined( __WXMAC_OSX__ ) && MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2 

     else if ( info->contentType == kControlContentCGImageRef )
     {
         CGImageRelease( info->u.imageRef ) ;
     else if ( info->contentType == kControlContentCGImageRef )
     {
         CGImageRelease( info->u.imageRef ) ;


@@ -146,7 +142,7 @@ void wxBitmapRefData::Init()
     m_pictHandle = NULL ;
     m_hBitmap = NULL ;
     m_hMaskBitmap = NULL;
     m_pictHandle = NULL ;
     m_hBitmap = NULL ;
     m_hMaskBitmap = NULL;

-    m_maskBytesPerRow = NULL ;
+    m_maskBytesPerRow = 0 ;

 
     m_rawAccessCount = 0 ;
     m_hasAlpha = false;
 
     m_rawAccessCount = 0 ;
     m_hasAlpha = false;