X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/31c1cbc7bc2cff4db5f1bf1c7765ceb23e2b3a59..3570a1c6e596c358848c77c5b37d724097340ce8:/src/mac/carbon/menu.cpp

diff --git a/src/mac/carbon/menu.cpp b/src/mac/carbon/menu.cpp
index b7d881f126..23e288ea88 100644
--- a/src/mac/carbon/menu.cpp
+++ b/src/mac/carbon/menu.cpp
@@ -374,13 +374,13 @@ bool wxMenu::ProcessCommand(wxCommandEvent & event)
 
     // Try the menu's event handler
     if ( /* !processed && */ GetEventHandler())
-        processed = GetEventHandler()->ProcessEvent(event);
+        processed = GetEventHandler()->SafelyProcessEvent(event);
 
     // Try the window the menu was popped up from
     // (and up through the hierarchy)
     wxWindow *win = GetInvokingWindow();
     if ( !processed && win )
-        processed = win->GetEventHandler()->ProcessEvent(event);
+        processed = win->HandleWindowEvent(event);
 
     return processed;
 }
@@ -567,7 +567,7 @@ wxInt32 wxMenu::MacHandleCommandProcess( wxMenuItem* item, int id, wxWindow* tar
             event.SetEventObject(targetWindow);
             event.SetInt(item->IsCheckable() ? item->IsChecked() : -1);
 
-            if ( targetWindow->GetEventHandler()->ProcessEvent(event) )
+            if ( targetWindow->HandleWindowEvent(event) )
                 result = noErr ;
         }
     }
@@ -601,7 +601,7 @@ wxInt32 wxMenu::MacHandleCommandUpdateStatus(wxMenuItem* WXUNUSED(item),
             wxWindow *win = menu->GetInvokingWindow();
             if ( win )
             {
-                processed = win->GetEventHandler()->ProcessEvent(event);
+                processed = win->HandleWindowEvent(event);
                 break;
             }
 
@@ -611,7 +611,7 @@ wxInt32 wxMenu::MacHandleCommandUpdateStatus(wxMenuItem* WXUNUSED(item),
 
     if ( !processed && targetWindow != NULL)
     {
-        processed = targetWindow->GetEventHandler()->ProcessEvent(event);
+        processed = targetWindow->HandleWindowEvent(event);
     }
 
     if ( processed )
@@ -711,12 +711,7 @@ void wxMenuBar::MacInstallMenuBar()
 
     MenuBarHandle menubar = NULL ;
 
-#if TARGET_API_MAC_OSX
     menubar = NewHandleClear( 6 /* sizeof( MenuBarHeader ) */ ) ;
-#else
-    menubar = NewHandleClear( 12 ) ;
-    (*menubar)[3] = 0x0a ;
-#endif
 
     ::SetMenuBar( menubar ) ;
     DisposeMenuBar( menubar ) ;
@@ -728,10 +723,8 @@ void wxMenuBar::MacInstallMenuBar()
     // Add About/Preferences separator only on OS X
     // KH/RN: Separator is always present on 10.3 but not on 10.2
     // However, the change from 10.2 to 10.3 suggests it is preferred
-#if TARGET_API_MAC_OSX
     InsertMenuItemTextWithCFString( appleMenu,
                 CFSTR(""), 0, kMenuItemAttrSeparator, 0);
-#endif
     InsertMenuItemTextWithCFString( appleMenu,
                 CFSTR("About..."), 0, 0, 0);
     MacInsertMenu( appleMenu , 0 ) ;