Make InheritAttributes and ShouldInheritColours public so they can be

[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 899266858b568e53bbaf268908dd6266ac318e7f..b41aecbf20a4737b50d4bca16557fd9de6ec9f0c 100644 (file)
--- a/include/wx/mac/carbon/private.h
+++ b/include/wx/mac/carbon/private.h
@@ -261,14 +261,22 @@ public :
 
 
     OSStatus SetParameter( EventParamName inName, EventParamType inType, UInt32 inSize, void * inData) ;
-    template <typename T> OSStatus SetParameter( EventParamName inName, EventParamType type , T *data )
+    template <typename T> OSStatus SetParameter( EventParamName inName, EventParamType inDesiredType , T *data )
     {
-        return SetParameter( inName, type , sizeof( T ) , data ) ;
+        return SetParameter( inName, inDesiredType , sizeof( T ) , data ) ;
+    }
+    template <typename T> OSStatus SetParameter( EventParamName inName, EventParamType inDesiredType , T data )
+    {
+        return SetParameter<T>( inName, inDesiredType , &data ) ;
     }
     template <typename T> OSStatus SetParameter( EventParamName inName, T *data )
     {
         return SetParameter<T>( inName, wxMacGetEventParamType<T>() , data ) ;
     }
+    template <typename T> OSStatus SetParameter( EventParamName inName, T data )
+    {
+        return SetParameter<T>( inName, wxMacGetEventParamType<T>() , &data ) ;
+    }
     
     EventKind GetKind()
     {
@@ -365,11 +373,14 @@ private:
 
 #endif
 
-
+// utils.cpp
 
 wxUint32 wxMacGetSystemEncFromFontEnc(wxFontEncoding encoding) ;
 wxFontEncoding wxMacGetFontEncFromSystemEnc(wxUint32 encoding) ;
 
+// toplevel.cpp
+
+ControlRef wxMacFindControlUnderMouse( Point location , WindowRef window , ControlPartCode *outPart ) ;
 
 #endif
     // _WX_PRIVATE_H_