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 b4c54a741820094773065775bcfa3e66d1fccd47..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
 /////////////////////////////////////////////////////////////////////////////
 // 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:
 //              with "wx".
 // Author:      Stefan Csomor
 // Modified by:


@@ -199,8 +199,10 @@ private :
     WindowRef m_data ;
 } ;
 
     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 , bool adjustForOrigin = true ) ;
 extern wxWindow* g_MacLastWindow ;
 pascal OSStatus wxMacTopLevelMouseEventHandler( EventHandlerCallRef handler , EventRef event , void *data ) ;
 Rect wxMacGetBoundsForControl( wxWindow* window , const wxPoint& pos , const wxSize &size , bool adjustForOrigin = true ) ;


@@ -282,7 +284,7 @@ public :
         return SetParameter<T>( inName, wxMacGetEventParamType<T>() , &data ) ;
     }
     
         return SetParameter<T>( inName, wxMacGetEventParamType<T>() , &data ) ;
     }
     

-    EventKind GetKind()
+    UInt32 GetKind()

     {
         return ::GetEventKind( m_eventRef ) ;
     }
     {
         return ::GetEventKind( m_eventRef ) ;
     }


@@ -381,6 +383,7 @@ private:
 
 wxUint32 wxMacGetSystemEncFromFontEnc(wxFontEncoding encoding) ;
 wxFontEncoding wxMacGetFontEncFromSystemEnc(wxUint32 encoding) ;
 
 wxUint32 wxMacGetSystemEncFromFontEnc(wxFontEncoding encoding) ;
 wxFontEncoding wxMacGetFontEncFromSystemEnc(wxUint32 encoding) ;

+void wxMacWakeUp() ;

 
 // toplevel.cpp
 
 
 // toplevel.cpp