menu associations

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27462 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/mac/carbon/private.h b/include/wx/mac/carbon/private.h
index 14f164d56a9e8963df89885b53ca6d5f4c152d33..acbf5273fd72bd8324d8ab8aadd9440df148a7c4 100644 (file)
--- a/include/wx/mac/carbon/private.h
+++ b/include/wx/mac/carbon/private.h
@@ -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 ) ;
     }