// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "menu.h"
#pragma implementation "menuitem.h"
#endif
// wxWidgets headers
// -----------------
+#include "wx/wxprec.h"
+
#include "wx/app.h"
#include "wx/menu.h"
#include "wx/menuitem.h"
// Find an item given the Macintosh Menu Reference
+#if KEY_wxList_DEPRECATED
wxList wxWinMacMenuList(wxKEY_INTEGER);
wxMenu *wxFindMenuFromMacMenu(MenuRef inMenuRef)
{
{
wxWinMacMenuList.DeleteObject(menu);
}
+#else
+WX_DECLARE_HASH_MAP(MenuRef, wxMenu*, wxPointerHash, wxPointerEqual, MacMenuMap);
+
+static MacMenuMap wxWinMacMenuList;
+
+wxMenu *wxFindMenuFromMacMenu(MenuRef inMenuRef)
+{
+ MacMenuMap::iterator node = wxWinMacMenuList.find(inMenuRef);
+
+ return (node == wxWinMacMenuList.end()) ? NULL : node->second;
+}
+
+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") );
+
+ wxWinMacMenuList[inMenuRef] = menu;
+}
+
+void wxRemoveMacMenuAssociation(wxMenu *menu) ;
+void wxRemoveMacMenuAssociation(wxMenu *menu)
+{
+ // iterate over all the elements in the class
+ MacMenuMap::iterator it;
+ for ( it = wxWinMacMenuList.begin(); it != wxWinMacMenuList.end(); ++it )
+ {
+ if ( it->second == menu )
+ {
+ wxWinMacMenuList.erase(it);
+ break;
+ }
+ }
+}
+#endif // deprecated wxList
// ============================================================================
// implementation
short wxMenu::s_macNextMenuId = 2 ;
#endif
+static
+wxMenu *
+_wxMenuAt(const wxMenuList &menuList, size_t pos)
+{
+ wxMenuList::compatibility_iterator menuIter = menuList.GetFirst();
+
+ while (pos-- > 0) menuIter = menuIter->GetNext();
+
+ return menuIter->GetData() ;
+}
+
void wxMenu::Init()
{
m_doBreak = FALSE;
{
// we need to update its end item
item->SetRadioGroupStart(m_startRadioGroup);
- wxMenuItemList::Node *node = GetMenuItems().Item(m_startRadioGroup);
+ wxMenuItemList::compatibility_iterator node = GetMenuItems().Item(m_startRadioGroup);
if ( node )
{
{
// we need to find the items position in the child list
size_t pos;
- wxMenuItemList::Node *node = GetMenuItems().GetFirst();
+ wxMenuItemList::compatibility_iterator node = GetMenuItems().GetFirst();
for ( pos = 0; node; pos++ )
{
if ( node->GetData() == item )
int wxMenu::MacGetIndexFromId( int id )
{
size_t pos;
- wxMenuItemList::Node *node = GetMenuItems().GetFirst();
+ wxMenuItemList::compatibility_iterator node = GetMenuItems().GetFirst();
for ( pos = 0; node; pos++ )
{
if ( node->GetData()->GetId() == id )
int wxMenu::MacGetIndexFromItem( wxMenuItem *pItem )
{
size_t pos;
- wxMenuItemList::Node *node = GetMenuItems().GetFirst();
+ wxMenuItemList::compatibility_iterator node = GetMenuItems().GetFirst();
for ( pos = 0; node; pos++ )
{
if ( node->GetData() == pItem )
{
wxMenuItem* previousItem = NULL ;
size_t pos ;
- wxMenuItemList::Node *node;
+ wxMenuItemList::compatibility_iterator node;
wxMenuItem *item;
for (pos = 0, node = GetMenuItems().GetFirst(); node; node = node->GetNext(), pos++)
{
{
subMenu->MacBeforeDisplay( true ) ;
}
- else
+ else // normal item
{
#if TARGET_CARBON
if ( UMAGetSystemVersion() >= 0x1000 )
{
- if ( item->GetId() == wxApp::s_macPreferencesMenuItemId || item->GetId() == wxApp::s_macExitMenuItemId)
+ // what we do here is to hide the special items which are
+ // shown in the application menu anyhow -- it doesn't make
+ // sense to show them in their normal place as well
+ 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 + 1, kMenuItemAttrHidden, 0 );
+
+ // also check for a separator which was used just to
+ // separate this item from the others, so don't leave
+ // separator at the menu start or end nor 2 consecutive
+ // separators
+ wxMenuItemList::compatibility_iterator nextNode = node->GetNext();
+ wxMenuItem *next = nextNode ? nextNode->GetData() : NULL;
+
+ size_t posSeptoHide;
+ if ( !previousItem && next && next->IsSeparator() )
+ {
+ // next (i.e. second as we must be first) item is
+ // the separator to hide
+ wxASSERT_MSG( pos == 0, _T("should be the menu start") );
+ posSeptoHide = 2;
+ }
+ else if ( GetMenuItems().GetCount() == pos + 1 &&
+ previousItem != NULL &&
+ previousItem->IsSeparator() )
+ {
+ // prev item is a trailing separator we want to hide
+ posSeptoHide = pos;
+ }
+ else if ( previousItem && previousItem->IsSeparator() &&
+ next && next->IsSeparator() )
+ {
+ // two consecutive separators, this is one too many
+ posSeptoHide = pos;
+ }
+ else // no separators to hide
{
- ChangeMenuItemAttributes( MAC_WXHMENU( GetHMenu() ) , pos , kMenuItemAttrHidden, 0 );
+ posSeptoHide = 0;
+ }
+
+ if ( posSeptoHide )
+ {
+ // hide the separator as well
+ ChangeMenuItemAttributes( MAC_WXHMENU( GetHMenu() ),
+ posSeptoHide,
+ kMenuItemAttrHidden,
+ 0 );
}
}
}
- #endif
+ #endif // TARGET_CARBON
}
previousItem = item ;
}
wxMenuItem* previousItem = NULL ;
int pos ;
- wxMenuItemList::Node *node;
+ wxMenuItemList::compatibility_iterator node;
wxMenuItem *item;
for (pos = 0, node = GetMenuItems().GetFirst(); node; node = node->GetNext(), pos++)
{
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
+
MacInsertMenuItem( appleMenu , "\pAbout..." , 0 ) ;
MacInsertMenu( appleMenu , 0 ) ;
EnableMenuCommand( NULL , kHICommandPreferences ) ;
}
#endif
- for (size_t i = 0; i < m_menus.GetCount(); i++)
+ wxMenuList::compatibility_iterator menuIter = m_menus.GetFirst();
+ //
+ for (size_t i = 0; i < m_menus.GetCount(); i++, menuIter = menuIter->GetNext())
{
- wxMenuItemList::Node *node;
+ wxMenuItemList::compatibility_iterator node;
wxMenuItem *item;
int pos ;
- wxMenu* menu = m_menus[i] , *subMenu = NULL ;
+ wxMenu* menu = menuIter->GetData() , *subMenu = NULL ;
if( m_titles[i] == wxT("?") || m_titles[i] == wxT("&?") || m_titles[i] == wxApp::s_macHelpMenuTitleName )
{
else
{
UMASetMenuTitle( MAC_WXHMENU(menu->GetHMenu()) , m_titles[i], m_font.GetEncoding() ) ;
- m_menus[i]->MacBeforeDisplay(false) ;
- ::InsertMenu(MAC_WXHMENU(m_menus[i]->GetHMenu()), 0);
+ menu->MacBeforeDisplay(false) ;
+ ::InsertMenu(MAC_WXHMENU(_wxMenuAt(m_menus, i)->GetHMenu()), 0);
}
}
::DrawMenuBar() ;
void wxMenuBar::EnableTop(size_t pos, bool enable)
{
wxCHECK_RET( IsAttached(), wxT("doesn't work with unattached menubars") );
- m_menus[pos]->MacEnableMenu( enable ) ;
+ _wxMenuAt(m_menus, pos)->MacEnableMenu( enable ) ;
Refresh();
}
return;
}
- m_menus[pos]->SetTitle( label ) ;
+ _wxMenuAt(m_menus, pos)->SetTitle( label ) ;
+
if (wxMenuBar::s_macInstalledMenuBar == this) // are we currently installed ?
{
::SetMenuBar( GetMenuBar() ) ;
}
else
{
- ::InsertMenu( MAC_WXHMENU(menu->GetHMenu()) , m_menus[pos+1]->MacGetMenuId() ) ;
+ ::InsertMenu( MAC_WXHMENU(menu->GetHMenu()) , _wxMenuAt(m_menus, pos+1)->MacGetMenuId() ) ;
}
}
}
Refresh();
}
+ if (m_invokingWindow)
+ wxMenubarSetInvokingWindow( menu, m_invokingWindow );
return menuOld;
}
}
else
{
- ::InsertMenu( MAC_WXHMENU(menu->GetHMenu()) , m_menus[pos+1]->MacGetMenuId() ) ;
+ ::InsertMenu( MAC_WXHMENU(menu->GetHMenu()) , _wxMenuAt(m_menus, pos+1)->MacGetMenuId() ) ;
}
}
Refresh();
}
+ if (m_invokingWindow)
+ wxMenubarSetInvokingWindow( menu, m_invokingWindow );
return TRUE;
}
Refresh();
}
- // m_invokingWindow is set after wxFrame::SetMenuBar(). This call enables
+ // m_invokingWindow is set after wxFrame::SetMenuBar(). This call enables
// adding menu later on.
if (m_invokingWindow)
wxMenubarSetInvokingWindow( menu, m_invokingWindow );
{
menu->SetInvokingWindow( (wxWindow*) NULL );
- wxMenuItemList::Node *node = menu->GetMenuItems().GetFirst();
+ wxMenuItemList::compatibility_iterator node = menu->GetMenuItems().GetFirst();
while (node)
{
wxMenuItem *menuitem = node->GetData();
{
menu->SetInvokingWindow( win );
- wxMenuItemList::Node *node = menu->GetMenuItems().GetFirst();
+ wxMenuItemList::compatibility_iterator node = menu->GetMenuItems().GetFirst();
while (node)
{
wxMenuItem *menuitem = node->GetData();
void wxMenuBar::UnsetInvokingWindow()
{
m_invokingWindow = (wxWindow*) NULL;
- wxMenuList::Node *node = m_menus.GetFirst();
+ wxMenuList::compatibility_iterator node = m_menus.GetFirst();
while (node)
{
wxMenu *menu = node->GetData();
void wxMenuBar::SetInvokingWindow(wxFrame *frame)
{
m_invokingWindow = frame;
- wxMenuList::Node *node = m_menus.GetFirst();
+ wxMenuList::compatibility_iterator node = m_menus.GetFirst();
while (node)
{
wxMenu *menu = node->GetData();
{
wxString title = wxStripMenuCodes(m_titles[i]);
if ( menuLabel == title )
- return m_menus[i]->FindItem(itemString);
+ return _wxMenuAt(m_menus, i)->FindItem(itemString);
}
return wxNOT_FOUND;
size_t count = GetMenuCount();
for ( size_t i = 0; !item && (i < count); i++ )
{
- item = m_menus[i]->FindItem(id, itemMenu);
+ item = _wxMenuAt(m_menus, i)->FindItem(id, itemMenu);
}
return item;
projects / wxWidgets.git / blobdiff