debug method added for flashing invalid areas

[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 fcb7cb0aa23b0a2bbacf579c9ab7c542ca2b2c01..acbf5273fd72bd8324d8ab8aadd9440df148a7c4 100644 (file)
--- a/include/wx/mac/carbon/private.h
+++ b/include/wx/mac/carbon/private.h
@@ -1,7 +1,7 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        private.h
 // Purpose:     Private declarations: as this header is only included by
-//              wxWindows itself, it may contain identifiers which don't start
+//              wxWidgets itself, it may contain identifiers which don't start
 //              with "wx".
 // Author:      Stefan Csomor
 // Modified by:
@@ -34,6 +34,10 @@
     #error "please update to Apple's lastest universal headers from http://developer.apple.com/sdk/"
 #endif
 
+#ifndef MAC_OS_X_VERSION_10_3
+    #define MAC_OS_X_VERSION_10_3 1030
+#endif
+
 #if wxUSE_GUI
 
 #include "wx/window.h"
@@ -195,11 +199,13 @@ private :
     WindowRef m_data ;
 } ;
 
-wxWindow *wxFindControlFromMacControl(ControlRef inControl ) ;
-wxTopLevelWindowMac* wxFindWinFromMacWindow( WindowRef inWindow ) ;
+wxWindow *              wxFindControlFromMacControl(ControlRef inControl ) ;
+wxTopLevelWindowMac*    wxFindWinFromMacWindow( WindowRef inWindow ) ;
+wxMenu*                 wxFindMenuFromMacMenu(MenuRef inMenuRef) ;
+
 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 ; }
@@ -261,16 +267,24 @@ 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, inDesiredType , sizeof( T ) , data ) ;
+    }
+    template <typename T> OSStatus SetParameter( EventParamName inName, EventParamType inDesiredType , T data )
     {
-        return SetParameter( inName, type , sizeof( 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()
+    UInt32 GetKind()
     {
         return ::GetEventKind( m_eventRef ) ;
     }
@@ -365,11 +379,15 @@ private:
 
 #endif
 
-
+// utils.cpp
 
 wxUint32 wxMacGetSystemEncFromFontEnc(wxFontEncoding encoding) ;
 wxFontEncoding wxMacGetFontEncFromSystemEnc(wxUint32 encoding) ;
+void wxMacWakeUp() ;
+
+// toplevel.cpp
 
+ControlRef wxMacFindControlUnderMouse( Point location , WindowRef window , ControlPartCode *outPart ) ;
 
 #endif
     // _WX_PRIVATE_H_