corrected GetDepth method and wrong disposal calls for pixmap

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13552 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/mac/carbon/dc.cpp b/src/mac/carbon/dc.cpp
index aaabc6607b0a9bb5b64ce63d3dc3e8923a52acf8..de479fbeec167aca6d8ac00a15645229a45b819f 100644 (file)
--- a/src/mac/carbon/dc.cpp
+++ b/src/mac/carbon/dc.cpp
@@ -250,14 +250,14 @@ void wxDC::MacCleanupPort(wxMacPortStateHelper* help) const
     {
         Pattern blackColor ;
         ::PenPat(GetQDGlobalsBlack(&blackColor));
     {
         Pattern blackColor ;
         ::PenPat(GetQDGlobalsBlack(&blackColor));

-        DisposePixMap( (PixMapHandle) m_macForegroundPixMap ) ;
+        DisposePixPat( (PixPatHandle) m_macForegroundPixMap ) ;

         m_macForegroundPixMap = NULL ;
     }
     if ( m_macBackgroundPixMap )
     {
         Pattern whiteColor ;
         ::BackPat(GetQDGlobalsWhite(&whiteColor));
         m_macForegroundPixMap = NULL ;
     }
     if ( m_macBackgroundPixMap )
     {
         Pattern whiteColor ;
         ::BackPat(GetQDGlobalsWhite(&whiteColor));

-        DisposePixMap( (PixMapHandle) m_macBackgroundPixMap ) ;
+        DisposePixPat( (PixPatHandle) m_macBackgroundPixMap ) ;

         m_macBackgroundPixMap = NULL ;
     }
 }
         m_macBackgroundPixMap = NULL ;
     }
 }


@@ -563,7 +563,11 @@ wxSize wxDC::GetPPI() const
 
 int wxDC::GetDepth() const
 {
 
 int wxDC::GetDepth() const
 {

-       return wxDisplayDepth() ;
+    if ( IsPortColor( (CGrafPtr) m_macPort ) )
+    {
+        return ( (**GetPortPixMap( (CGrafPtr) m_macPort)).pixelSize ) ;
+    }
+    return 1 ;

 }
 
 void wxDC::ComputeScaleAndOrigin()
 }
 
 void wxDC::ComputeScaleAndOrigin()

diff --git a/src/mac/dc.cpp b/src/mac/dc.cpp
index aaabc6607b0a9bb5b64ce63d3dc3e8923a52acf8..de479fbeec167aca6d8ac00a15645229a45b819f 100644 (file)
--- a/src/mac/dc.cpp
+++ b/src/mac/dc.cpp
@@ -250,14 +250,14 @@ void wxDC::MacCleanupPort(wxMacPortStateHelper* help) const
     {
         Pattern blackColor ;
         ::PenPat(GetQDGlobalsBlack(&blackColor));
     {
         Pattern blackColor ;
         ::PenPat(GetQDGlobalsBlack(&blackColor));

-        DisposePixMap( (PixMapHandle) m_macForegroundPixMap ) ;
+        DisposePixPat( (PixPatHandle) m_macForegroundPixMap ) ;

         m_macForegroundPixMap = NULL ;
     }
     if ( m_macBackgroundPixMap )
     {
         Pattern whiteColor ;
         ::BackPat(GetQDGlobalsWhite(&whiteColor));
         m_macForegroundPixMap = NULL ;
     }
     if ( m_macBackgroundPixMap )
     {
         Pattern whiteColor ;
         ::BackPat(GetQDGlobalsWhite(&whiteColor));

-        DisposePixMap( (PixMapHandle) m_macBackgroundPixMap ) ;
+        DisposePixPat( (PixPatHandle) m_macBackgroundPixMap ) ;

         m_macBackgroundPixMap = NULL ;
     }
 }
         m_macBackgroundPixMap = NULL ;
     }
 }


@@ -563,7 +563,11 @@ wxSize wxDC::GetPPI() const
 
 int wxDC::GetDepth() const
 {
 
 int wxDC::GetDepth() const
 {

-       return wxDisplayDepth() ;
+    if ( IsPortColor( (CGrafPtr) m_macPort ) )
+    {
+        return ( (**GetPortPixMap( (CGrafPtr) m_macPort)).pixelSize ) ;
+    }
+    return 1 ;

 }
 
 void wxDC::ComputeScaleAndOrigin()
 }
 
 void wxDC::ComputeScaleAndOrigin()