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 c64fcbb0b37104a61192165d0b3c39280a8ff286..b41aecbf20a4737b50d4bca16557fd9de6ec9f0c 100644 (file)
--- a/include/wx/mac/carbon/private.h
+++ b/include/wx/mac/carbon/private.h
@@ -105,10 +105,23 @@ public:
     wxMacWindowClipper( const wxWindow* win ) ;
     ~wxMacWindowClipper() ;
 private:
     wxMacWindowClipper( const wxWindow* win ) ;
     ~wxMacWindowClipper() ;
 private:

+    GrafPtr   m_newPort ;

     RgnHandle m_formerClip ;
     RgnHandle m_newClip ;
 } ;
 
     RgnHandle m_formerClip ;
     RgnHandle m_newClip ;
 } ;
 

+class WXDLLEXPORT wxMacWindowStateSaver : public wxMacWindowClipper
+{
+    DECLARE_NO_COPY_CLASS(wxMacWindowStateSaver)
+        
+public:
+    wxMacWindowStateSaver( const wxWindow* win ) ;
+    ~wxMacWindowStateSaver() ;
+private:
+    GrafPtr   m_newPort ;
+    ThemeDrawingState m_themeDrawingState ;
+} ;
+

 /*
 class wxMacDrawingHelper
 {
 /*
 class wxMacDrawingHelper
 {


@@ -186,7 +199,7 @@ wxWindow *wxFindControlFromMacControl(ControlRef inControl ) ;
 wxTopLevelWindowMac* wxFindWinFromMacWindow( WindowRef inWindow ) ;
 extern wxWindow* g_MacLastWindow ;
 pascal OSStatus wxMacTopLevelMouseEventHandler( EventHandlerCallRef handler , EventRef event , void *data ) ;
 wxTopLevelWindowMac* wxFindWinFromMacWindow( WindowRef inWindow ) ;
 extern wxWindow* g_MacLastWindow ;
 pascal OSStatus wxMacTopLevelMouseEventHandler( EventHandlerCallRef handler , EventRef event , void *data ) ;

-Rect wxMacGetBoundsForControl( wxWindow* window , const wxPoint& pos , const wxSize &size ) ;
+Rect wxMacGetBoundsForControl( wxWindow* window , const wxPoint& pos , const wxSize &size , bool adjustForOrigin = true ) ;

 
 template<typename T> EventParamType wxMacGetEventParamType() { wxFAIL_MSG( wxT("Unknown Param Type") ) ; return 0 ; }
 template<> inline EventParamType wxMacGetEventParamType<RgnHandle>() { return typeQDRgnHandle ; }
 
 template<typename T> EventParamType wxMacGetEventParamType() { wxFAIL_MSG( wxT("Unknown Param Type") ) ; return 0 ; }
 template<> inline EventParamType wxMacGetEventParamType<RgnHandle>() { return typeQDRgnHandle ; }


@@ -248,14 +261,22 @@ public :
 
 
     OSStatus SetParameter( EventParamName inName, EventParamType inType, UInt32 inSize, void * inData) ;
 
 
     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 ) ;
     }

+    template <typename T> OSStatus SetParameter( EventParamName inName, T data )
+    {
+        return SetParameter<T>( inName, wxMacGetEventParamType<T>() , &data ) ;
+    }

     
     EventKind GetKind()
     {
     
     EventKind GetKind()
     {


@@ -352,11 +373,14 @@ private:
 
 #endif
 
 
 #endif
 

-
+// utils.cpp

 
 wxUint32 wxMacGetSystemEncFromFontEnc(wxFontEncoding encoding) ;
 wxFontEncoding wxMacGetFontEncFromSystemEnc(wxUint32 encoding) ;
 
 
 wxUint32 wxMacGetSystemEncFromFontEnc(wxFontEncoding encoding) ;
 wxFontEncoding wxMacGetFontEncFromSystemEnc(wxUint32 encoding) ;
 

+// toplevel.cpp
+
+ControlRef wxMacFindControlUnderMouse( Point location , WindowRef window , ControlPartCode *outPart ) ;

 
 #endif
     // _WX_PRIVATE_H_
 
 #endif
     // _WX_PRIVATE_H_