setting correct refcon in menus (was incorrectly changed to menuimpl), fixes #11611

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

diff --git a/src/osx/carbon/app.cpp b/src/osx/carbon/app.cpp
index af71ecc6a35c261cf8f9809f5ebd140d8f5a6b54..9560c31dd1d0b3348583abce04da1cdd1c3afc04 100644 (file)
--- a/src/osx/carbon/app.cpp
+++ b/src/osx/carbon/app.cpp
@@ -513,7 +513,7 @@ wxMenu* wxFindMenuFromMacCommand( const HICommand &command , wxMenuItem* &item )
             GetMenuItemRefCon( command.menu.menuRef , command.menu.menuItemIndex , &refCon ) ;
             itemMenu = wxFindMenuFromMacMenu( command.menu.menuRef ) ;
             if ( itemMenu != NULL && refCon != 0)
             GetMenuItemRefCon( command.menu.menuRef , command.menu.menuItemIndex , &refCon ) ;
             itemMenu = wxFindMenuFromMacMenu( command.menu.menuRef ) ;
             if ( itemMenu != NULL && refCon != 0)

-                item = ((wxMenuItemImpl*) refCon)->GetWXPeer() ;
+                item = (wxMenuItem*) refCon;

         }
     }
 #endif
         }
     }
 #endif

diff --git a/src/osx/carbon/menu.cpp b/src/osx/carbon/menu.cpp
index 3b258bba5cab7ff9768c30f35011f6fbe9d6378b..ab442f635f1942347dc73a00fa1cb2ca7791c8a1 100644 (file)
--- a/src/osx/carbon/menu.cpp
+++ b/src/osx/carbon/menu.cpp
@@ -151,7 +151,7 @@ public :
     {
         m_parentMenuRef = parentMenuRef;
         if ( m_parentMenuRef && index > 0 )
     {
         m_parentMenuRef = parentMenuRef;
         if ( m_parentMenuRef && index > 0 )

-            SetMenuItemRefCon( m_parentMenuRef, index, (URefCon) this );
+            SetMenuItemRefCon( m_parentMenuRef, index, (URefCon) m_peer );

     }
 
     MenuItemIndex FindMenuItemIndex()
     }
 
     MenuItemIndex FindMenuItemIndex()


@@ -163,7 +163,7 @@ public :
             {
                 URefCon storedRef = 0;
                 GetMenuItemRefCon(m_parentMenuRef, i, &storedRef );
             {
                 URefCon storedRef = 0;
                 GetMenuItemRefCon(m_parentMenuRef, i, &storedRef );

-                if ( storedRef == (URefCon) this )
+                if ( storedRef == (URefCon) m_peer )

                 {
                     hit = i;
                     break;
                 {
                     hit = i;
                     break;