From: Stefan Csomor Date: Sun, 13 Jan 2002 19:16:14 +0000 (+0000) Subject: corrected GetDepth method and wrong disposal calls for pixmap X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/c99d6f997c48ab79dd301ca18b7a66d260a99636 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 aaabc6607b..de479fbeec 100644 --- 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)); - DisposePixMap( (PixMapHandle) m_macForegroundPixMap ) ; + DisposePixPat( (PixPatHandle) m_macForegroundPixMap ) ; m_macForegroundPixMap = NULL ; } if ( m_macBackgroundPixMap ) { Pattern whiteColor ; ::BackPat(GetQDGlobalsWhite(&whiteColor)); - DisposePixMap( (PixMapHandle) m_macBackgroundPixMap ) ; + DisposePixPat( (PixPatHandle) m_macBackgroundPixMap ) ; m_macBackgroundPixMap = NULL ; } } @@ -563,7 +563,11 @@ wxSize wxDC::GetPPI() const int wxDC::GetDepth() const { - return wxDisplayDepth() ; + if ( IsPortColor( (CGrafPtr) m_macPort ) ) + { + return ( (**GetPortPixMap( (CGrafPtr) m_macPort)).pixelSize ) ; + } + return 1 ; } void wxDC::ComputeScaleAndOrigin() diff --git a/src/mac/dc.cpp b/src/mac/dc.cpp index aaabc6607b..de479fbeec 100644 --- 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)); - DisposePixMap( (PixMapHandle) m_macForegroundPixMap ) ; + DisposePixPat( (PixPatHandle) m_macForegroundPixMap ) ; m_macForegroundPixMap = NULL ; } if ( m_macBackgroundPixMap ) { Pattern whiteColor ; ::BackPat(GetQDGlobalsWhite(&whiteColor)); - DisposePixMap( (PixMapHandle) m_macBackgroundPixMap ) ; + DisposePixPat( (PixPatHandle) m_macBackgroundPixMap ) ; m_macBackgroundPixMap = NULL ; } } @@ -563,7 +563,11 @@ wxSize wxDC::GetPPI() const int wxDC::GetDepth() const { - return wxDisplayDepth() ; + if ( IsPortColor( (CGrafPtr) m_macPort ) ) + { + return ( (**GetPortPixMap( (CGrafPtr) m_macPort)).pixelSize ) ; + } + return 1 ; } void wxDC::ComputeScaleAndOrigin()