Font (possible) fix

[wxWidgets.git] / src / mac / carbon / app.cpp

diff --git a/src/mac/carbon/app.cpp b/src/mac/carbon/app.cpp
index 45a5dea76b7d42439bb0547e96fdab7e1d80dccb..deef92ad8a2e37fa0a58fd66d664e7a9f31d3a66 100644 (file)
--- a/src/mac/carbon/app.cpp
+++ b/src/mac/carbon/app.cpp
@@ -453,7 +453,15 @@ static pascal OSStatus wxMacAppCommandEventHandler( EventHandlerCallRef handler
     }
     else if ( id != 0 && command.menu.menuRef != 0 && command.menu.menuItemIndex != 0 )
     {
     }
     else if ( id != 0 && command.menu.menuRef != 0 && command.menu.menuItemIndex != 0 )
     {

-        GetMenuItemRefCon( command.menu.menuRef , command.menu.menuItemIndex , (UInt32*) &item ) ;
+        wxMenu* itsMenu = NULL ;
+        UInt32 refCon ;
+        GetMenuItemRefCon( command.menu.menuRef , command.menu.menuItemIndex , &refCon ) ;
+        // make sure it is one of our own menus, otherwise don't touch
+        itsMenu = wxFindMenuFromMacMenu( command.menu.menuRef ) ;
+        if ( itsMenu != NULL )
+        {
+            item = (wxMenuItem*) refCon ;
+        }

     }
 
     if ( item )
     }
 
     if ( item )