menu events handling more closely to the menu instance itself, removing menubar wherever possible

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

src/mac/carbon/app.cpp

@@ -336,31 +336,17 @@ static const EventTypeSpec eventList[] =
 
 static pascal OSStatus
 wxMacAppMenuEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
-{
-    wxMenuBar* mbar = wxMenuBar::MacGetInstalledMenuBar();
-    
-    if ( mbar )
-    {
-        wxFrame* win = mbar->GetFrame();
-        if ( win )
 {
     EventRef formerEvent = (EventRef) wxTheApp->MacGetCurrentEvent() ;
     EventHandlerCallRef formerEventHandlerCallRef = (EventHandlerCallRef) wxTheApp->MacGetCurrentEventHandlerCallRef() ;
     wxTheApp->MacSetCurrentEvent( event , handler ) ;
     
-            // VZ: we could find the menu from its handle here by examining all
+    wxMacCarbonEvent cEvent( event ) ;
-            //     the menus in the menu bar recursively but knowing that neither
+    MenuRef menuRef = cEvent.GetParameter<MenuRef>(kEventParamDirectObject) ;
-            //     wxMSW nor wxGTK do it why bother...
+    wxMenu* menu = wxFindMenuFromMacMenu( menuRef ) ;
- #if 0
-            MenuRef menuRef;
-
-            GetEventParameter(event,
-                              kEventParamDirectObject,
-                              typeMenuRef, NULL,
-                              sizeof(menuRef), NULL,
-                              &menuRef);
- #endif // 0
     
+    if ( menu )
+    {
         wxEventType type=0;        
         MenuCommand cmd=0;
         switch (GetEventKind(event))
@@ -372,25 +358,35 @@ wxMacAppMenuEventHandler( EventHandlerCallRef handler , EventRef event , void *d
                 type = wxEVT_MENU_CLOSE;
                 break;
             case kEventMenuTargetItem:
+                cmd = cEvent.GetParameter<MenuCommand>(kEventParamMenuCommand,typeMenuCommand) ;
+                if (cmd != 0) 
                     type = wxEVT_MENU_HIGHLIGHT;
-                    GetEventParameter(event, kEventParamMenuCommand,
-                                      typeMenuCommand, NULL,
-                                      sizeof(cmd), NULL, &cmd);
-                    if (cmd == 0) return eventNotHandledErr;
                 break;
             default:
                 wxFAIL_MSG(wxT("Unexpected menu event kind"));
                 break;
         }
 
+        if ( type )
+        {
             wxMenuEvent wxevent(type, cmd);
-            wxevent.SetEventObject(win);
+            wxevent.SetEventObject(menu);
 
-            (void)win->GetEventHandler()->ProcessEvent(wxevent);
+            wxEvtHandler* handler = menu->GetEventHandler();
+            if (handler && handler->ProcessEvent(wxevent))
+            {
+                // handled
+            }
+            else
+            {
+                wxWindow *win = menu->GetInvokingWindow();
+                if (win) 
+                    win->GetEventHandler()->ProcessEvent(wxevent);
+                }
+            }
+    }
     
     wxTheApp->MacSetCurrentEvent( formerEvent, formerEventHandlerCallRef ) ;
-        }
-    }
 
     return eventNotHandledErr;
 }
@@ -401,32 +397,31 @@ static pascal OSStatus wxMacAppCommandEventHandler( EventHandlerCallRef handler
 
     HICommand command ;
 
-    GetEventParameter( event, kEventParamDirectObject, typeHICommand, NULL,
+    wxMacCarbonEvent cEvent( event ) ;
-        sizeof( HICommand ), NULL, &command );
+    cEvent.GetParameter<HICommand>(kEventParamDirectObject,typeHICommand,&command) ;
         
+    wxMenuItem* item = NULL ;
     MenuCommand id = command.commandID ;
+    // for items we don't really control
     if ( id == kHICommandPreferences )
+    {
         id = wxApp::s_macPreferencesMenuItemId ;
         
         wxMenuBar* mbar = wxMenuBar::MacGetInstalledMenuBar() ;
-    wxMenu* menu = NULL ;
-    wxMenuItem* item = NULL ;
-
         if ( mbar )
         {
+            wxMenu* menu = NULL ;
             item = mbar->FindItem( id , &menu ) ;
-        // it is not 100 % sure that an menu of id 0 is really ours, safety check
+        }
-        if ( id == 0 && menu != NULL && menu->GetHMenu() != command.menu.menuRef )
+    }
+    else if ( id != 0 && command.menu.menuRef != 0 && command.menu.menuItemIndex != 0 )
     {
-            item = NULL ;
+        GetMenuItemRefCon( command.menu.menuRef , command.menu.menuItemIndex , (UInt32*) &item ) ;
-            menu = NULL ;
-        }
     }
     
-    if ( item == NULL || menu == NULL || mbar == NULL )
+    if ( item )
-        return result ;
+    {
-
+       switch( cEvent.GetKind() )
-       switch( GetEventKind( event ) )
        {
            case kEventProcessCommand :
            {
@@ -435,7 +430,7 @@ static pascal OSStatus wxMacAppCommandEventHandler( EventHandlerCallRef handler
                     item->Check( !item->IsChecked() ) ;
                 }
 
-                menu->SendEvent( id , item->IsCheckable() ? item->IsChecked() : -1 ) ;
+                item->GetMenu()->SendEvent( id , item->IsCheckable() ? item->IsChecked() : -1 ) ;
                 result = noErr ;
             }
             break ;
@@ -446,7 +441,7 @@ static pascal OSStatus wxMacAppCommandEventHandler( EventHandlerCallRef handler
         default :
             break ;
         }
-
+    }
     return result ;
 }