Added CmdDown() to grid events

[wxWidgets.git] / include / wx / mac / carbon / private.h

diff --git a/include/wx/mac/carbon/private.h b/include/wx/mac/carbon/private.h
index 9e57b5f43a1d4518e7556fb7f846d061d8c17c8d..11298873af43a4d6c03cb84d8f4d5e28c160d2aa 100644 (file)
--- 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:
     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 ;
 } ;
 private :
     GrafPtr m_port ;
 } ;


@@ -227,7 +220,9 @@ template<> inline EventParamType wxMacGetEventParamType<HISize>() { return typeH
 template<> inline EventParamType wxMacGetEventParamType<HIRect>() { return typeHIRect ; }
 template<> inline EventParamType wxMacGetEventParamType<void*>() { return typeVoidPtr ; }
 #endif
 template<> inline EventParamType wxMacGetEventParamType<HIRect>() { return typeHIRect ; }
 template<> inline EventParamType wxMacGetEventParamType<void*>() { return typeVoidPtr ; }
 #endif

+#if TARGET_API_MAC_OSX && ( MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2 )

 template<> inline EventParamType wxMacGetEventParamType<CFDictionaryRef>() { return typeCFDictionaryRef ; }
 template<> inline EventParamType wxMacGetEventParamType<CFDictionaryRef>() { return typeCFDictionaryRef ; }

+#endif

 template<> inline EventParamType wxMacGetEventParamType<Collection>() { return typeCollection ; }
 template<> inline EventParamType wxMacGetEventParamType<CGContextRef>() { return typeCGContextRef ; }
 /*
 template<> inline EventParamType wxMacGetEventParamType<Collection>() { return typeCollection ; }
 template<> inline EventParamType wxMacGetEventParamType<CGContextRef>() { return typeCGContextRef ; }
 /*


@@ -394,7 +389,7 @@ public :
 
     ~wxMacCFRefHolder()
     {
 
     ~wxMacCFRefHolder()
     {

-        CFRelease( m_ref ) ;
+        Release() ;

     }
 
     void Release()
     }
 
     void Release()


@@ -835,7 +830,7 @@ private :
 
 ControlRef wxMacFindControlUnderMouse( wxTopLevelWindowMac* toplevelWindow, const Point& location , WindowRef window , ControlPartCode *outPart ) ;
 
 
 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 ; 
     inline Rect* wxMacGetPictureBounds( PicHandle pict , Rect* rect ) 
     { 
        *rect = (**pict).picFrame ;