X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fbb7ee81b4af8eccbef20f738142d5c8048f0f4a..c5ce3dfb1efd5346682809f3d2702fd9c4edd52d:/include/wx/mac/carbon/private.h diff --git a/include/wx/mac/carbon/private.h b/include/wx/mac/carbon/private.h index 9e57b5f43a..11298873af 100644 --- a/include/wx/mac/carbon/private.h +++ b/include/wx/mac/carbon/private.h @@ -97,15 +97,8 @@ class WXDLLEXPORT wxMacPortSaver DECLARE_NO_COPY_CLASS(wxMacPortSaver) public: - wxMacPortSaver( GrafPtr port ) - { - ::GetPort( &m_port ) ; - ::SetPort( port ) ; - } - ~wxMacPortSaver() - { - ::SetPort( m_port ) ; - } + wxMacPortSaver( GrafPtr port ); + ~wxMacPortSaver(); private : GrafPtr m_port ; } ; @@ -227,7 +220,9 @@ template<> inline EventParamType wxMacGetEventParamType() { return typeH template<> inline EventParamType wxMacGetEventParamType() { return typeHIRect ; } template<> inline EventParamType wxMacGetEventParamType() { return typeVoidPtr ; } #endif +#if TARGET_API_MAC_OSX && ( MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2 ) template<> inline EventParamType wxMacGetEventParamType() { return typeCFDictionaryRef ; } +#endif template<> inline EventParamType wxMacGetEventParamType() { return typeCollection ; } template<> inline EventParamType wxMacGetEventParamType() { return typeCGContextRef ; } /* @@ -394,7 +389,7 @@ public : ~wxMacCFRefHolder() { - CFRelease( m_ref ) ; + Release() ; } void Release() @@ -835,7 +830,7 @@ private : ControlRef wxMacFindControlUnderMouse( wxTopLevelWindowMac* toplevelWindow, const Point& location , WindowRef window , ControlPartCode *outPart ) ; -#if WORDS_BIGENDIAN +#ifdef WORDS_BIGENDIAN inline Rect* wxMacGetPictureBounds( PicHandle pict , Rect* rect ) { *rect = (**pict).picFrame ;