fixed fatal bug when moving the control after itself in tab order

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

diff --git a/src/mac/carbon/menu.cpp b/src/mac/carbon/menu.cpp
index 1d3195a6a70e5c343f6aded2d055084df4d43918..37e4141243a6f47951472945a1a52867506d458c 100644 (file)
--- a/src/mac/carbon/menu.cpp
+++ b/src/mac/carbon/menu.cpp
@@ -18,7 +18,7 @@
 // headers & declarations
 // ============================================================================
 
 // headers & declarations
 // ============================================================================
 

-// wxWindows headers
+// wxWidgets headers

 // -----------------
 
 #include "wx/app.h"
 // -----------------
 
 #include "wx/app.h"


@@ -41,12 +41,42 @@ IMPLEMENT_DYNAMIC_CLASS(wxMenuBar, wxEvtHandler)
 #endif
 
 // the (popup) menu title has this special id
 #endif
 
 // the (popup) menu title has this special id

-static const int idMenuTitle = -2;
+static const int idMenuTitle = -3;

 static MenuItemIndex firstUserHelpMenuItem = 0 ;
 
 const short kwxMacMenuBarResource = 1 ;
 const short kwxMacAppleMenuId = 1 ;
 
 static MenuItemIndex firstUserHelpMenuItem = 0 ;
 
 const short kwxMacMenuBarResource = 1 ;
 const short kwxMacAppleMenuId = 1 ;
 

+
+// Find an item given the Macintosh Menu Reference
+
+wxList wxWinMacMenuList(wxKEY_INTEGER);
+wxMenu *wxFindMenuFromMacMenu(MenuRef inMenuRef)
+{
+    wxNode *node = wxWinMacMenuList.Find((long)inMenuRef);
+    if (!node)
+        return NULL;
+    return (wxMenu *)node->GetData();
+}
+
+void wxAssociateMenuWithMacMenu(MenuRef inMenuRef, wxMenu *menu) ;
+void wxAssociateMenuWithMacMenu(MenuRef inMenuRef, wxMenu *menu)
+{
+    // adding NULL MenuRef is (first) surely a result of an error and
+    // (secondly) breaks menu command processing
+    wxCHECK_RET( inMenuRef != (MenuRef) NULL, wxT("attempt to add a NULL MenuRef to menu list") );
+
+    if ( !wxWinMacMenuList.Find((long)inMenuRef) )
+        wxWinMacMenuList.Append((long)inMenuRef, menu);
+}
+
+void wxRemoveMacMenuAssociation(wxMenu *menu) ;
+void wxRemoveMacMenuAssociation(wxMenu *menu)
+{
+    wxWinMacMenuList.DeleteObject(menu);
+}
+
+

 // ============================================================================
 // implementation
 // ============================================================================
 // ============================================================================
 // implementation
 // ============================================================================


@@ -69,14 +99,16 @@ void wxMenu::Init()
     m_startRadioGroup = -1;
 
     // create the menu
     m_startRadioGroup = -1;
 
     // create the menu

-    m_macMenuId = s_macNextMenuId++; 
-    m_hMenu = UMANewMenu(m_macMenuId, m_title);
+    m_macMenuId = s_macNextMenuId++;
+    m_hMenu = UMANewMenu(m_macMenuId, m_title, wxFont::GetDefaultEncoding() );

 
     if ( !m_hMenu )
     {
 
     if ( !m_hMenu )
     {

-        wxLogLastError("UMANewMenu failed");
+        wxLogLastError(wxT("UMANewMenu failed"));

     }
 
     }
 

+    wxAssociateMenuWithMacMenu( (MenuRef)m_hMenu , this ) ;
+

     // if we have a title, insert it in the beginning of the menu
     if ( !!m_title )
     {
     // if we have a title, insert it in the beginning of the menu
     if ( !!m_title )
     {


@@ -87,6 +119,7 @@ void wxMenu::Init()
 
 wxMenu::~wxMenu()
 {
 
 wxMenu::~wxMenu()
 {

+    wxRemoveMacMenuAssociation( this ) ;

     if (MAC_WXHMENU(m_hMenu))
         ::DisposeMenu(MAC_WXHMENU(m_hMenu));
 }
     if (MAC_WXHMENU(m_hMenu))
         ::DisposeMenu(MAC_WXHMENU(m_hMenu));
 }


@@ -107,7 +140,7 @@ void wxMenu::Attach(wxMenuBarBase *menubar)
 // append a new item or submenu to the menu
 bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos)
 {
 // append a new item or submenu to the menu
 bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos)
 {

-    wxASSERT_MSG( pItem != NULL, "can't append NULL item to the menu" );
+    wxASSERT_MSG( pItem != NULL, wxT("can't append NULL item to the menu") );

 
     if ( pItem->IsSeparator() )
     {
 
     if ( pItem->IsSeparator() )
     {


@@ -116,21 +149,23 @@ bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos)
         else
             MacInsertMenuItem(MAC_WXHMENU(m_hMenu), "\p-" , pos);
     }
         else
             MacInsertMenuItem(MAC_WXHMENU(m_hMenu), "\p-" , pos);
     }

-    else 
+    else

     {
         wxMenu *pSubMenu = pItem->GetSubMenu() ;
         if ( pSubMenu != NULL )
         {
     {
         wxMenu *pSubMenu = pItem->GetSubMenu() ;
         if ( pSubMenu != NULL )
         {

-               wxASSERT_MSG( pSubMenu->m_hMenu != NULL , "invalid submenu added");
+               wxASSERT_MSG( pSubMenu->m_hMenu != NULL , wxT("invalid submenu added"));

             pSubMenu->m_menuParent = this ;
             pSubMenu->m_menuParent = this ;

-        
-            if (wxMenuBar::MacGetInstalledMenuBar() == m_menuBar) 
-                ::InsertMenu( MAC_WXHMENU( pSubMenu->m_hMenu ) , -1 ) ;
-            
+
+            if (wxMenuBar::MacGetInstalledMenuBar() == GetMenuBar())
+            {
+                pSubMenu->MacBeforeDisplay( true ) ;
+             }
+

             if ( pos == (size_t)-1 )
             if ( pos == (size_t)-1 )

-                UMAAppendSubMenuItem(MAC_WXHMENU(m_hMenu), pItem->GetText(), pSubMenu->m_macMenuId);
+                UMAAppendSubMenuItem(MAC_WXHMENU(m_hMenu), pItem->GetText(), wxFont::GetDefaultEncoding() , pSubMenu->m_macMenuId);

             else
             else

-                UMAInsertSubMenuItem(MAC_WXHMENU(m_hMenu), pItem->GetText() , pos, pSubMenu->m_macMenuId);
+                UMAInsertSubMenuItem(MAC_WXHMENU(m_hMenu), pItem->GetText(), wxFont::GetDefaultEncoding()  , pos, pSubMenu->m_macMenuId);

             pItem->UpdateItemBitmap() ;
             pItem->UpdateItemStatus() ;
         }
             pItem->UpdateItemBitmap() ;
             pItem->UpdateItemStatus() ;
         }


@@ -138,20 +173,25 @@ bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos)
         {
             if ( pos == (size_t)-1 )
             {
         {
             if ( pos == (size_t)-1 )
             {

-                UMAAppendMenuItem(MAC_WXHMENU(m_hMenu), "a" );
+                UMAAppendMenuItem(MAC_WXHMENU(m_hMenu), wxT("a") , wxFont::GetDefaultEncoding() );

                 pos = CountMenuItems(MAC_WXHMENU(m_hMenu)) ;
             }
             else
             {
                 pos = CountMenuItems(MAC_WXHMENU(m_hMenu)) ;
             }
             else
             {

-                UMAInsertMenuItem(MAC_WXHMENU(m_hMenu), "a" , pos);
+                // MacOS counts menu items from 1 and inserts after, therefore having the
+                // same effect as wx 0 based and inserting before, we must correct pos
+                // after however for updates to be correct
+                UMAInsertMenuItem(MAC_WXHMENU(m_hMenu), wxT("a"), wxFont::GetDefaultEncoding(), pos);
+                pos += 1 ;

             }
 
             SetMenuItemCommandID( MAC_WXHMENU(m_hMenu) , pos , pItem->GetId() ) ;
             }
 
             SetMenuItemCommandID( MAC_WXHMENU(m_hMenu) , pos , pItem->GetId() ) ;

+            SetMenuItemRefCon( MAC_WXHMENU(m_hMenu) , pos , (UInt32) pItem ) ;

             pItem->UpdateItemText() ;
             pItem->UpdateItemBitmap() ;
             pItem->UpdateItemStatus() ;
 
             pItem->UpdateItemText() ;
             pItem->UpdateItemBitmap() ;
             pItem->UpdateItemStatus() ;
 

-              if ( pItem->GetId() == idMenuTitle ) 
+              if ( pItem->GetId() == idMenuTitle )

               {
                 UMAEnableMenuItem(MAC_WXHMENU(m_hMenu) , pos , false ) ;
               }
               {
                 UMAEnableMenuItem(MAC_WXHMENU(m_hMenu) , pos , false ) ;
               }


@@ -160,7 +200,7 @@ bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos)
     // if we're already attached to the menubar, we must update it
     if ( IsAttached() )
     {
     // if we're already attached to the menubar, we must update it
     if ( IsAttached() )
     {

-        m_menuBar->Refresh();
+        GetMenuBar()->Refresh();

     }
     return TRUE ;
 }
     }
     return TRUE ;
 }


@@ -171,9 +211,9 @@ void wxMenu::EndRadioGroup()
     m_startRadioGroup = -1;
 }
 
     m_startRadioGroup = -1;
 }
 

-bool wxMenu::DoAppend(wxMenuItem *item)
+wxMenuItem* wxMenu::DoAppend(wxMenuItem *item)

 {
 {

-    wxCHECK_MSG( item, FALSE, _T("NULL item in wxMenu::DoAppend") );
+    wxCHECK_MSG( item, NULL, _T("NULL item in wxMenu::DoAppend") );

 
     bool check = FALSE;
 
 
     bool check = FALSE;
 


@@ -216,7 +256,7 @@ bool wxMenu::DoAppend(wxMenuItem *item)
 
     if ( !wxMenuBase::DoAppend(item) || !DoInsertOrAppend(item) )
     {
 
     if ( !wxMenuBase::DoAppend(item) || !DoInsertOrAppend(item) )
     {

-        return FALSE;
+        return NULL;

     }
 
     if ( check )
     }
 
     if ( check )


@@ -225,12 +265,15 @@ bool wxMenu::DoAppend(wxMenuItem *item)
         item->Check(TRUE);
     }
 
         item->Check(TRUE);
     }
 

-    return TRUE;
+    return item;

 }
 
 }
 

-bool wxMenu::DoInsert(size_t pos, wxMenuItem *item)
+wxMenuItem* wxMenu::DoInsert(size_t pos, wxMenuItem *item)

 {
 {

-    return wxMenuBase::DoInsert(pos, item) && DoInsertOrAppend(item, pos);
+    if (wxMenuBase::DoInsert(pos, item) && DoInsertOrAppend(item, pos))
+        return item;
+    else
+        return NULL;

 }
 
 wxMenuItem *wxMenu::DoRemove(wxMenuItem *item)
 }
 
 wxMenuItem *wxMenu::DoRemove(wxMenuItem *item)


@@ -254,7 +297,7 @@ wxMenuItem *wxMenu::DoRemove(wxMenuItem *item)
     if ( IsAttached() )
     {
         // otherwise, the change won't be visible
     if ( IsAttached() )
     {
         // otherwise, the change won't be visible

-        m_menuBar->Refresh();
+        GetMenuBar()->Refresh();

     }
 
     // and from internal data structures
     }
 
     // and from internal data structures


@@ -264,21 +307,12 @@ wxMenuItem *wxMenu::DoRemove(wxMenuItem *item)
 void wxMenu::SetTitle(const wxString& label)
 {
        m_title = label ;
 void wxMenu::SetTitle(const wxString& label)
 {
        m_title = label ;

-    UMASetMenuTitle(MAC_WXHMENU(m_hMenu) , label ) ;
+    UMASetMenuTitle(MAC_WXHMENU(m_hMenu) , label , wxFont::GetDefaultEncoding() ) ;

 }
 bool wxMenu::ProcessCommand(wxCommandEvent & event)
 {
     bool processed = FALSE;
 
 }
 bool wxMenu::ProcessCommand(wxCommandEvent & event)
 {
     bool processed = FALSE;
 

-#if WXWIN_COMPATIBILITY
-    // Try a callback
-    if (m_callback)
-    {
-        (void)(*(m_callback))(*this, event);
-        processed = TRUE;
-    }
-#endif WXWIN_COMPATIBILITY
-

     // Try the menu's event handler
     if ( !processed && GetEventHandler())
     {
     // Try the menu's event handler
     if ( !processed && GetEventHandler())
     {


@@ -303,16 +337,16 @@ wxWindow *wxMenu::GetWindow() const
 {
     if ( m_invokingWindow != NULL )
         return m_invokingWindow;
 {
     if ( m_invokingWindow != NULL )
         return m_invokingWindow;

-    else if ( m_menuBar != NULL)
-        return (wxWindow *) m_menuBar->GetFrame();
+    else if ( GetMenuBar() != NULL)
+        return (wxWindow *) GetMenuBar()->GetFrame();

 
     return NULL;
 }
 
 
     return NULL;
 }
 

-// helper functions returning the mac menu position for a certain item, note that this is 
+// helper functions returning the mac menu position for a certain item, note that this is

 // mac-wise 1 - based, i.e. the first item has index 1 whereas on MSWin it has pos 0
 
 // mac-wise 1 - based, i.e. the first item has index 1 whereas on MSWin it has pos 0
 

-int wxMenu::MacGetIndexFromId( int id ) 
+int wxMenu::MacGetIndexFromId( int id )

 {
     size_t pos;
     wxMenuItemList::Node *node = GetMenuItems().GetFirst();
 {
     size_t pos;
     wxMenuItemList::Node *node = GetMenuItems().GetFirst();


@@ -323,14 +357,14 @@ int wxMenu::MacGetIndexFromId( int id )
 
         node = node->GetNext();
     }
 
         node = node->GetNext();
     }

-    
+

     if (!node)
         return 0;
     if (!node)
         return 0;

-        
+

     return pos + 1 ;
 }
 
     return pos + 1 ;
 }
 

-int wxMenu::MacGetIndexFromItem( wxMenuItem *pItem ) 
+int wxMenu::MacGetIndexFromItem( wxMenuItem *pItem )

 {
     size_t pos;
     wxMenuItemList::Node *node = GetMenuItems().GetFirst();
 {
     size_t pos;
     wxMenuItemList::Node *node = GetMenuItems().GetFirst();


@@ -344,20 +378,88 @@ int wxMenu::MacGetIndexFromItem( wxMenuItem *pItem )
 
     if (!node)
         return 0;
 
     if (!node)
         return 0;

-        
+

     return pos + 1 ;
 }
 
     return pos + 1 ;
 }
 

-void wxMenu::MacEnableMenu( bool bDoEnable ) 
+void wxMenu::MacEnableMenu( bool bDoEnable )

 {
     UMAEnableMenuItem(MAC_WXHMENU(m_hMenu) , 0 , bDoEnable ) ;
 {
     UMAEnableMenuItem(MAC_WXHMENU(m_hMenu) , 0 , bDoEnable ) ;

-        
+

     ::DrawMenuBar() ;
 }
 
     ::DrawMenuBar() ;
 }
 

+// MacOS needs to know about submenus somewhere within this menu
+// before it can be displayed , also hide special menu items like preferences
+// that are handled by the OS
+void wxMenu::MacBeforeDisplay( bool isSubMenu )
+{
+    wxMenuItem* previousItem = NULL ;
+    size_t pos ;
+    wxMenuItemList::Node *node;
+    wxMenuItem *item;
+    for (pos = 0, node = GetMenuItems().GetFirst(); node; node = node->GetNext(), pos++)
+    {
+        item = (wxMenuItem *)node->GetData();
+        wxMenu* subMenu = item->GetSubMenu() ;
+        if (subMenu)
+        {
+            subMenu->MacBeforeDisplay( true ) ;
+        }
+        else
+        {
+            #if TARGET_CARBON
+            if ( UMAGetSystemVersion() >= 0x1000 )
+            {
+                if ( item->GetId() == wxApp::s_macPreferencesMenuItemId || item->GetId() == wxApp::s_macExitMenuItemId)
+                {
+                    ChangeMenuItemAttributes( MAC_WXHMENU( GetHMenu() ) , pos + 1, kMenuItemAttrHidden, 0 );
+                    if ( GetMenuItems().GetCount() == pos + 1 &&
+                            previousItem != NULL &&
+                                previousItem->IsSeparator() )
+                    {
+                        ChangeMenuItemAttributes( MAC_WXHMENU( GetHMenu() ) , pos , kMenuItemAttrHidden, 0 );
+                    }
+                }
+            }
+            #endif
+        }
+        previousItem = item ;
+    }
+
+    if ( isSubMenu )
+        ::InsertMenu(MAC_WXHMENU( GetHMenu()), -1);
+
+}
+// undo all changes from the MacBeforeDisplay call
+void wxMenu::MacAfterDisplay( bool isSubMenu )
+{
+    if ( isSubMenu )
+        ::DeleteMenu(MacGetMenuId());
+
+    wxMenuItem* previousItem = NULL ;
+    int pos ;
+    wxMenuItemList::Node *node;
+    wxMenuItem *item;
+    for (pos = 0, node = GetMenuItems().GetFirst(); node; node = node->GetNext(), pos++)
+    {
+        item = (wxMenuItem *)node->GetData();
+        wxMenu* subMenu = item->GetSubMenu() ;
+        if (subMenu)
+        {
+            subMenu->MacAfterDisplay( true ) ;
+        }
+        else
+        {
+            // no need to undo hidings
+        }
+        previousItem = item ;
+    }
+}
+

 // Menu Bar
 
 // Menu Bar
 

-/* 
+/*

 
 Mac Implementation note :
 
 
 Mac Implementation note :
 


@@ -365,16 +467,17 @@ The Mac has only one global menubar, so we attempt to install the currently
 active menubar from a frame, we currently don't take into account mdi-frames
 which would ask for menu-merging
 
 active menubar from a frame, we currently don't take into account mdi-frames
 which would ask for menu-merging
 

-Secondly there is no mac api for changing a menubar that is not the current 
+Secondly there is no mac api for changing a menubar that is not the current

 menubar, so we have to wait for preparing the actual menubar until the
 wxMenubar is to be used
 
 menubar, so we have to wait for preparing the actual menubar until the
 wxMenubar is to be used
 

-We can in subsequent versions use MacInstallMenuBar to provide some sort of 
+We can in subsequent versions use MacInstallMenuBar to provide some sort of

 auto-merge for MDI in case this will be necessary
 
 */
 
 wxMenuBar* wxMenuBar::s_macInstalledMenuBar = NULL ;
 auto-merge for MDI in case this will be necessary
 
 */
 
 wxMenuBar* wxMenuBar::s_macInstalledMenuBar = NULL ;

+wxMenuBar* wxMenuBar::s_macCommonMenuBar = NULL ;

 
 void wxMenuBar::Init()
 {
 
 void wxMenuBar::Init()
 {


@@ -411,6 +514,8 @@ wxMenuBar::wxMenuBar(int count, wxMenu *menus[], const wxString titles[])
 
 wxMenuBar::~wxMenuBar()
 {
 
 wxMenuBar::~wxMenuBar()
 {

+    if (s_macCommonMenuBar == this)
+        s_macCommonMenuBar = NULL;

     if (s_macInstalledMenuBar == this)
     {
         ::ClearMenuBar();
     if (s_macInstalledMenuBar == this)
     {
         ::ClearMenuBar();


@@ -426,31 +531,36 @@ void wxMenuBar::Refresh(bool WXUNUSED(eraseBackground), const wxRect *WXUNUSED(r
     DrawMenuBar();
 }
 
     DrawMenuBar();
 }
 

-void wxMenuBar::MacInstallMenuBar() 
+void wxMenuBar::MacInstallMenuBar()

 {
     if ( s_macInstalledMenuBar == this )
         return ;
 {
     if ( s_macInstalledMenuBar == this )
         return ;

-        
-    wxStAppResource resload ;
-        
-    Handle menubar = ::GetNewMBar( kwxMacMenuBarResource ) ;
-    wxString message ;
-    wxCHECK_RET( menubar != NULL, "can't read MBAR resource" );
-    ::SetMenuBar( menubar ) ;
-#if TARGET_API_MAC_CARBON
-    ::DisposeMenuBar( menubar ) ;
+
+    MenuBarHandle menubar = NULL ;
+#if TARGET_API_MAC_OSX
+    menubar = NewHandleClear( 6 /* sizeof( MenuBarHeader ) */ ) ;

 #else
 #else

-    ::DisposeHandle( menubar ) ;
+    menubar = NewHandleClear( 12 ) ;
+    (*menubar)[3] = 0x0a ;

 #endif
 #endif

-
-#if TARGET_API_MAC_OS8
-    MenuHandle menu = ::GetMenuHandle( kwxMacAppleMenuId ) ;
-    if ( CountMenuItems( menu ) == 2 )
-    {
-        ::AppendResMenu(menu, 'DRVR');
-    }
+    ::SetMenuBar( menubar ) ;
+    DisposeMenuBar( menubar ) ;
+    MenuHandle appleMenu = NULL ;
+    char appleMenuTitle[3] = { 01 , kMenuAppleLogoFilledGlyph , 0 } ;
+
+    verify_noerr( CreateNewMenu( kwxMacAppleMenuId , 0 , &appleMenu ) ) ;
+    verify_noerr( SetMenuTitle( appleMenu , (ConstStr255Param) appleMenuTitle ) );
+
+    // 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
+    MacInsertMenuItem( appleMenu , "\p-" , 0 ) ;

 #endif
 #endif

- 
+
+    MacInsertMenuItem( appleMenu , "\pAbout..." , 0 ) ;
+    MacInsertMenu( appleMenu , 0 ) ;
+

     // clean-up the help menu before adding new items
     MenuHandle mh = NULL ;
     if ( UMAGetHelpMenu( &mh , &firstUserHelpMenuItem) == noErr )
     // clean-up the help menu before adding new items
     MenuHandle mh = NULL ;
     if ( UMAGetHelpMenu( &mh , &firstUserHelpMenuItem) == noErr )


@@ -476,28 +586,27 @@ void wxMenuBar::MacInstallMenuBar()
 #endif
        for (size_t i = 0; i < m_menus.GetCount(); i++)
       {
 #endif
        for (size_t i = 0; i < m_menus.GetCount(); i++)
       {

-        Str255     label;

         wxMenuItemList::Node *node;
         wxMenuItem *item;
         int pos ;
         wxMenu* menu = m_menus[i] , *subMenu = NULL ;
 
         wxMenuItemList::Node *node;
         wxMenuItem *item;
         int pos ;
         wxMenu* menu = m_menus[i] , *subMenu = NULL ;
 

-        if( m_titles[i] == "?" || m_titles[i] == "&?"  || m_titles[i] == wxApp::s_macHelpMenuTitleName )
+        if( m_titles[i] == wxT("?") || m_titles[i] == wxT("&?")  || m_titles[i] == wxApp::s_macHelpMenuTitleName )

         {
             if ( mh == NULL )
             {
                 continue ;
             }
         {
             if ( mh == NULL )
             {
                 continue ;
             }

-                
-              for (pos = 0 , node = menu->GetMenuItems().GetFirst(); node; node = node->GetNext(), pos++) 
+
+              for (pos = 0 , node = menu->GetMenuItems().GetFirst(); node; node = node->GetNext(), pos++)

               {
                  item = (wxMenuItem *)node->GetData();
                  subMenu = item->GetSubMenu() ;
               {
                  item = (wxMenuItem *)node->GetData();
                  subMenu = item->GetSubMenu() ;

-                if (subMenu)             
+                if (subMenu)

                 {
                     // we don't support hierarchical menus in the help menu yet
                 }
                 {
                     // we don't support hierarchical menus in the help menu yet
                 }

-                else        
+                else

                 {
                     if ( item->IsSeparator() )
                     {
                 {
                     if ( item->IsSeparator() )
                     {


@@ -509,21 +618,23 @@ void wxMenuBar::MacInstallMenuBar()
                         wxAcceleratorEntry* entry = wxGetAccelFromString( item->GetText() ) ;
 
                         if ( item->GetId() == wxApp::s_macAboutMenuItemId )
                         wxAcceleratorEntry* entry = wxGetAccelFromString( item->GetText() ) ;
 
                         if ( item->GetId() == wxApp::s_macAboutMenuItemId )

-                        { 
-                                UMASetMenuItemText( GetMenuHandle( kwxMacAppleMenuId ) , 1 , item->GetText()  );
+                        {
+                                UMASetMenuItemText( GetMenuHandle( kwxMacAppleMenuId ) , 1 , item->GetText() , wxFont::GetDefaultEncoding() );

                                 UMAEnableMenuItem( GetMenuHandle( kwxMacAppleMenuId ) , 1 , true );
                                 SetMenuItemCommandID( GetMenuHandle( kwxMacAppleMenuId ) , 1 , item->GetId() ) ;
                                 UMAEnableMenuItem( GetMenuHandle( kwxMacAppleMenuId ) , 1 , true );
                                 SetMenuItemCommandID( GetMenuHandle( kwxMacAppleMenuId ) , 1 , item->GetId() ) ;

+                                SetMenuItemRefCon(GetMenuHandle( kwxMacAppleMenuId ) , 1 , (UInt32)item ) ;

                                 UMASetMenuItemShortcut( GetMenuHandle( kwxMacAppleMenuId ) , 1 , entry ) ;
                          }
                         else
                         {
                             if ( mh )
                             {
                                 UMASetMenuItemShortcut( GetMenuHandle( kwxMacAppleMenuId ) , 1 , entry ) ;
                          }
                         else
                         {
                             if ( mh )
                             {

-                                UMAAppendMenuItem(mh, item->GetText()  , entry );
+                                UMAAppendMenuItem(mh, item->GetText()  , wxFont::GetDefaultEncoding(), entry);

                                 SetMenuItemCommandID( mh , CountMenuItems(mh) , item->GetId() ) ;
                                 SetMenuItemCommandID( mh , CountMenuItems(mh) , item->GetId() ) ;

+                                SetMenuItemRefCon( mh , CountMenuItems(mh) , (UInt32)item ) ;

                             }
                         }
                             }
                         }

-                        
+

                         delete entry ;
                     }
                 }
                         delete entry ;
                     }
                 }


@@ -531,53 +642,9 @@ void wxMenuBar::MacInstallMenuBar()
         }
         else
         {
         }
         else
         {

-            UMASetMenuTitle( MAC_WXHMENU(menu->GetHMenu()) , m_titles[i] ) ;
-            wxArrayPtrVoid submenus ;
-            wxMenuItem* previousItem = NULL ;
-              for (pos = 0, node = menu->GetMenuItems().GetFirst(); node; node = node->GetNext(), pos++) 
-              {
-                 item = (wxMenuItem *)node->GetData();
-                 subMenu = item->GetSubMenu() ;
-                if (subMenu)             
-                {
-                  submenus.Add(subMenu) ;
-                }
-                else
-                {
-#if TARGET_CARBON
-                    if ( UMAGetSystemVersion() >= 0x1000 )
-                    {
-                        if ( item->GetId() == wxApp::s_macPreferencesMenuItemId || item->GetId() == wxApp::s_macExitMenuItemId)
-                        {
-                            ChangeMenuItemAttributes( MAC_WXHMENU( menu->GetHMenu() ) , pos + 1, kMenuItemAttrHidden, 0 );
-                            if ( menu->GetMenuItems().GetCount() == pos + 1 && previousItem != NULL && previousItem->IsSeparator() )
-                            {
-                                ChangeMenuItemAttributes( MAC_WXHMENU( menu->GetHMenu() ) , pos , kMenuItemAttrHidden, 0 );
-                            }
-                        }
-                    }
-#endif    
-                }
-                previousItem = item ;
-            }
+            UMASetMenuTitle( MAC_WXHMENU(menu->GetHMenu()) , m_titles[i], m_font.GetEncoding()  ) ;
+            m_menus[i]->MacBeforeDisplay(false) ;

             ::InsertMenu(MAC_WXHMENU(m_menus[i]->GetHMenu()), 0);
             ::InsertMenu(MAC_WXHMENU(m_menus[i]->GetHMenu()), 0);

-            for ( size_t i = 0 ; i < submenus.GetCount() ; ++i )
-            {
-                wxMenu* submenu = (wxMenu*) submenus[i] ;
-                wxMenuItemList::Node *subnode;
-                wxMenuItem *subitem;
-                int subpos ;
-                for ( subpos = 0 , subnode = submenu->GetMenuItems().GetFirst(); subnode; subnode = subnode->GetNext(), subpos++) 
-                  {
-                       subitem = (wxMenuItem *)subnode->GetData();
-                       wxMenu* itsSubMenu = subitem->GetSubMenu() ;
-                      if (itsSubMenu)             
-                      {
-                          submenus.Add(itsSubMenu) ;
-                      }                  
-                  }
-                ::InsertMenu( MAC_WXHMENU(submenu->GetHMenu()) , -1 ) ;
-            }

         }
     }
     ::DrawMenuBar() ;
         }
     }
     ::DrawMenuBar() ;


@@ -591,6 +658,17 @@ void wxMenuBar::EnableTop(size_t pos, bool enable)
     Refresh();
 }
 
     Refresh();
 }
 

+bool wxMenuBar::Enable( bool enable)
+{
+    wxCHECK_MSG( IsAttached(), false, wxT("doesn't work with unattached menubars") );
+    size_t i;
+    for (i = 0; i < GetMenuCount(); i++)
+    {
+        EnableTop(i, enable);
+    }
+    return true;
+}
+

 void wxMenuBar::SetLabelTop(size_t pos, const wxString& label)
 {
     wxCHECK_RET( pos < GetMenuCount(), wxT("invalid menu index") );
 void wxMenuBar::SetLabelTop(size_t pos, const wxString& label)
 {
     wxCHECK_RET( pos < GetMenuCount(), wxT("invalid menu index") );


@@ -627,7 +705,7 @@ int wxMenuBar::FindMenu(const wxString& title)
     {
         wxString title = wxStripMenuCodes(m_titles[i]);
         if ( menuTitle == title )
     {
         wxString title = wxStripMenuCodes(m_titles[i]);
         if ( menuTitle == title )

-            return i; 
+            return i;

     }
 
     return wxNOT_FOUND;
     }
 
     return wxNOT_FOUND;


@@ -654,9 +732,11 @@ wxMenu *wxMenuBar::Replace(size_t pos, wxMenu *menu, const wxString& title)
     {
         if (s_macInstalledMenuBar == this)
         {
     {
         if (s_macInstalledMenuBar == this)
         {

+            menuOld->MacAfterDisplay( false ) ;

             ::DeleteMenu( menuOld->MacGetMenuId() /* m_menus[pos]->MacGetMenuId() */ ) ;
             {
             ::DeleteMenu( menuOld->MacGetMenuId() /* m_menus[pos]->MacGetMenuId() */ ) ;
             {

-                UMASetMenuTitle( MAC_WXHMENU(menu->GetHMenu()) , title ) ;
+                menu->MacBeforeDisplay( false ) ;
+                UMASetMenuTitle( MAC_WXHMENU(menu->GetHMenu()) , title , m_font.GetEncoding() ) ;

                 if ( pos == m_menus.GetCount() - 1)
                 {
                     ::InsertMenu( MAC_WXHMENU(menu->GetHMenu()) , 0 ) ;
                 if ( pos == m_menus.GetCount() - 1)
                 {
                     ::InsertMenu( MAC_WXHMENU(menu->GetHMenu()) , 0 ) ;


@@ -681,17 +761,21 @@ bool wxMenuBar::Insert(size_t pos, wxMenu *menu, const wxString& title)
 
     m_titles.Insert(title, pos);
 
 
     m_titles.Insert(title, pos);
 

-    UMASetMenuTitle( MAC_WXHMENU(menu->GetHMenu()) , title ) ;
+    UMASetMenuTitle( MAC_WXHMENU(menu->GetHMenu()) , title , m_font.GetEncoding() ) ;

 
 

-    if ( IsAttached() )
+    if ( IsAttached() && s_macInstalledMenuBar == this )

     {
     {

-        if ( pos == (size_t) -1  || pos + 1 == m_menus.GetCount() )
-        {
-            ::InsertMenu( MAC_WXHMENU(menu->GetHMenu()) , 0 ) ;
-        }
-        else
+        if (s_macInstalledMenuBar == this)

         {
         {

-            ::InsertMenu( MAC_WXHMENU(menu->GetHMenu()) , m_menus[pos+1]->MacGetMenuId() ) ;
+            menu->MacBeforeDisplay( false ) ;
+            if ( pos == (size_t) -1  || pos + 1 == m_menus.GetCount() )
+            {
+                ::InsertMenu( MAC_WXHMENU(menu->GetHMenu()) , 0 ) ;
+            }
+            else
+            {
+                ::InsertMenu( MAC_WXHMENU(menu->GetHMenu()) , m_menus[pos+1]->MacGetMenuId() ) ;
+            }

         }
         Refresh();
     }
         }
         Refresh();
     }


@@ -712,12 +796,10 @@ wxMenu *wxMenuBar::Remove(size_t pos)
             ::DeleteMenu( menu->MacGetMenuId() /* m_menus[pos]->MacGetMenuId() */ ) ;
         }
 
             ::DeleteMenu( menu->MacGetMenuId() /* m_menus[pos]->MacGetMenuId() */ ) ;
         }
 

-        menu->Detach();
-

         Refresh();
     }
 
         Refresh();
     }
 

-    m_titles.Remove(pos);
+    m_titles.RemoveAt(pos);

 
     return menu;
 }
 
     return menu;
 }


@@ -731,8 +813,8 @@ bool wxMenuBar::Append(wxMenu *menu, const wxString& title)
         return FALSE;
 
     m_titles.Add(title);
         return FALSE;
 
     m_titles.Add(title);

-    
-    UMASetMenuTitle( MAC_WXHMENU(menu->GetHMenu()) , title ) ;
+
+    UMASetMenuTitle( MAC_WXHMENU(menu->GetHMenu()) , title , m_font.GetEncoding() ) ;

 
     if ( IsAttached() )
     {
 
     if ( IsAttached() )
     {


@@ -826,7 +908,7 @@ int wxMenuBar::FindMenuItem(const wxString& menuString,
     for ( size_t i = 0; i < count; i++ )
     {
         wxString title = wxStripMenuCodes(m_titles[i]);
     for ( size_t i = 0; i < count; i++ )
     {
         wxString title = wxStripMenuCodes(m_titles[i]);

-        if ( menuString == title )
+        if ( menuLabel == title )

             return m_menus[i]->FindItem(itemString);
     }
 
             return m_menus[i]->FindItem(itemString);
     }