// ----------------------------------------------------------------------------
//
-// Helper Functions to get Mac Menus the way they should be ;-)
-//
-
-void wxMacCtoPString(const char* theCString, Str255 thePString);
-
-// remove inappropriate characters, if useShortcuts is false, the ampersand will not auto-generate a mac menu-shortcut
-
-int wxMenuItem::MacBuildMenuString(StringPtr outMacItemText, SInt16 *outMacShortcutChar , UInt8 *outMacModifiers , const char *inItemText , bool useShortcuts )
-{
- char *p = (char *) &outMacItemText[1] ;
- short macModifiers = 0 ;
- SInt16 macShortCut = 0 ;
- const char *inItemName ;
- wxString inItemTextMac ;
-
- if (wxApp::s_macDefaultEncodingIsPC)
- {
- inItemTextMac = wxMacMakeMacStringFromPC( inItemText ) ;
- inItemName = inItemTextMac ;
- }
- else
- {
- inItemName = inItemText ;
- }
-
- if ( useShortcuts && !wxApp::s_macSupportPCMenuShortcuts )
- useShortcuts = false ;
-
- // we have problems with a leading hypen - it will be taken as a separator
-
- while ( *inItemName == '-' )
- inItemName++ ;
-
- while( *inItemName )
- {
- switch ( *inItemName )
- {
- // shortcuts
- case '&' :
- {
- ++inItemName ;
- if ( *inItemName )
- {
- *p++ = *inItemName ;
- if ( useShortcuts )
- macShortCut = *inItemName ;
- }
- else
- --inItemName ;
- }
- break ;
- // win-like accelerators
- case '\t' :
- {
- ++inItemName ;
- bool skip = false ;
- bool explicitCommandKey = false ;
- while( *inItemName && !skip )
- {
- if (wxStrnicmp("Ctrl", inItemName, 4) == 0)
- {
- inItemName = inItemName + 5;
- explicitCommandKey = true ;
- }
- else if (wxStrnicmp("Cntrl", inItemName, 5) == 0)
- {
- inItemName = inItemName + 6;
- explicitCommandKey = true ;
- }
- else if (wxStrnicmp("Alt", inItemName, 3) == 0)
- {
- inItemName = inItemName + 4;
- macModifiers |= kMenuOptionModifier ;
- }
- else if (wxStrnicmp("Shift", inItemName, 5) == 0)
- {
- inItemName = inItemName + 6;
- macModifiers |= kMenuShiftModifier ;
- }
- else
- {
- skip = true ;
- }
- }
- if ( *inItemName )
- {
- if ( strlen(inItemName) == 1 )
- {
- macShortCut = *inItemName;
- }
- else if ( !wxStricmp( inItemName , "Delete" ) || !wxStricmp( inItemName , "Del" ) )
- {
- macShortCut = WXK_DELETE ;
- }
- else if ( !wxStricmp( inItemName , "Back" ) || !wxStricmp( inItemName , "Backspace" ) )
- {
- macShortCut = WXK_BACK ;
- }
- else if ( !wxStricmp( inItemName , "Return" ) )
- {
- macShortCut = WXK_RETURN ;
- }
- else if ( !wxStricmp( inItemName , "Enter" ) )
- {
- macShortCut = kEnterCharCode ;
- }
- else if ( *inItemName == 'F' )
- {
- int fkey = atol(inItemName+1) ;
- if (fkey >= 1 && fkey < 15 )
- {
- macShortCut = WXK_F1 + fkey - 1 ;
- }
- if ( !explicitCommandKey )
- macModifiers |= kMenuNoCommandModifier ;
- }
- }
-
- inItemName += strlen( inItemName ) ;
-
- if ( *inItemName == 0 )
- --inItemName ;
-
- }
- break ;
- default :
- *p++ = *inItemName ;
- }
- ++inItemName ;
- }
-
- outMacItemText[0] = (p - (char *)outMacItemText) - 1;
- if ( outMacShortcutChar )
- *outMacShortcutChar = macShortCut ;
- if ( outMacModifiers )
- *outMacModifiers = macModifiers ;
-
- return 0 ;
-}
-
// ctor & dtor
// -----------
wxMenu *pSubMenu)
: wxMenuItemBase(pParentMenu, id, text, strHelp, kind, pSubMenu)
{
- // VZ: what about translations?? (FIXME)
- if ( m_text == "E&xit" ||m_text == "Exit" ||m_text.Left(5) == "Exit\t" || m_text.Left(6) == "E&xit\t" )
+ // In other languages there is no difference in naming the Exit/Quit menu item between MacOS and Windows guidelines
+ // therefore these item must not be translated
+ if ( wxStripMenuCodes(m_text).Upper() == "EXIT" )
{
m_text = "Quit\tCtrl+Q" ;
}
+
+ m_radioGroup.start = -1;
+ m_isRadioGroupStart = FALSE;
}
wxMenuItem::~wxMenuItem()
{
}
-bool wxMenuItem::IsChecked() const
-{
- return wxMenuItemBase::IsChecked() ;
-}
+// change item state
+// -----------------
-wxString wxMenuItem::GetLabel() const
-{
- return wxStripMenuCodes(m_text);
+void wxMenuItem::SetBitmap(const wxBitmap& bitmap)
+{
+ m_bitmap = bitmap;
+ UpdateItemBitmap() ;
}
-// accelerators
-// ------------
-
-#if wxUSE_ACCEL
-
-wxAcceleratorEntry *wxMenuItem::GetAccel() const
+void wxMenuItem::UpdateItemBitmap()
{
- return wxGetAccelFromString(GetText());
+ if ( !m_parentMenu )
+ return ;
+
+ MenuHandle mhandle = MAC_WXHMENU(m_parentMenu->GetHMenu()) ;
+ MenuItemIndex index = m_parentMenu->MacGetIndexFromItem( this ) ;
+ if( mhandle == NULL || index == 0)
+ return ;
+
+ if ( m_bitmap.Ok() )
+ {
+ ControlButtonContentInfo info ;
+ wxMacCreateBitmapButton( &info , m_bitmap , kControlContentCIconHandle ) ;
+ if ( info.contentType != kControlNoContent )
+ {
+ if ( info.contentType == kControlContentCIconHandle )
+ SetMenuItemIconHandle( mhandle , index ,
+ kMenuColorIconType , (Handle) info.u.cIconHandle ) ;
+ }
+
+ }
}
-#endif // wxUSE_ACCEL
-
-// misc
-// ----
-
-/*
-
-// delete the sub menu
-void wxMenuItem::DeleteSubMenu()
+void wxMenuItem::UpdateItemStatus()
{
- wxASSERT( m_subMenu != NULL );
+ if ( !m_parentMenu )
+ return ;
+
+ MenuHandle mhandle = MAC_WXHMENU(m_parentMenu->GetHMenu()) ;
+ MenuItemIndex index = m_parentMenu->MacGetIndexFromItem( this ) ;
+ if( mhandle == NULL || index == 0)
+ return ;
+
+ UMAEnableMenuItem( mhandle , index , m_isEnabled ) ;
+ if ( IsCheckable() && IsChecked() )
+ ::SetItemMark( mhandle , index , 0x12 ) ; // checkmark
+ else
+ ::SetItemMark( mhandle , index , 0 ) ; // no mark
- delete m_subMenu;
- m_subMenu = NULL;
+ UMASetMenuItemText( mhandle , index , m_text ) ;
+ wxAcceleratorEntry *entry = wxGetAccelFromString( m_text ) ;
+ UMASetMenuItemShortcut( mhandle , index , entry ) ;
+ delete entry ;
}
-*/
+void wxMenuItem::UpdateItemText()
+{
+ if ( !m_parentMenu )
+ return ;
+
+ MenuHandle mhandle = MAC_WXHMENU(m_parentMenu->GetHMenu()) ;
+ MenuItemIndex index = m_parentMenu->MacGetIndexFromItem( this ) ;
+ if( mhandle == NULL || index == 0)
+ return ;
+
+ UMASetMenuItemText( mhandle , index , m_text ) ;
+ wxAcceleratorEntry *entry = wxGetAccelFromString( m_text ) ;
+ UMASetMenuItemShortcut( mhandle , index , entry ) ;
+ delete entry ;
+}
-// change item state
-// -----------------
void wxMenuItem::Enable(bool bDoEnable)
{
- if ( m_isEnabled != bDoEnable ) {
- if ( m_subMenu == NULL )
- {
- // normal menu item
- if ( MAC_WXHMENU(m_parentMenu->GetHMenu()) )
- {
- int index = m_parentMenu->MacGetIndexFromItem( this ) ;
- if ( index >= 1 )
- {
- if ( bDoEnable )
- UMAEnableMenuItem( MAC_WXHMENU(m_parentMenu->GetHMenu()) , index ) ;
- else
- UMADisableMenuItem( MAC_WXHMENU(m_parentMenu->GetHMenu()) , index ) ;
- }
- }
- }
- else
- {
- // submenu
- if ( MAC_WXHMENU(m_parentMenu->GetHMenu()) )
- {
- int index = m_parentMenu->MacGetIndexFromItem( this ) ;
- if ( index >= 1 )
- {
- if ( bDoEnable )
- UMAEnableMenuItem( MAC_WXHMENU(m_parentMenu->GetHMenu()) , index ) ;
- else
- UMADisableMenuItem( MAC_WXHMENU(m_parentMenu->GetHMenu()) , index ) ;
- }
- }
- }
-
- m_isEnabled = bDoEnable;
- }
+ if ( m_isEnabled != bDoEnable )
+ {
+ wxMenuItemBase::Enable( bDoEnable ) ;
+ UpdateItemStatus() ;
+ }
+}
+void wxMenuItem::UncheckRadio()
+{
+ if ( m_isChecked )
+ {
+ wxMenuItemBase::Check( false ) ;
+ UpdateItemStatus() ;
+ }
}
void wxMenuItem::Check(bool bDoCheck)
{
- wxCHECK_RET( IsCheckable(), "only checkable items may be checked" );
+ wxCHECK_RET( IsCheckable(), "only checkable items may be checked" );
- if ( m_isChecked != bDoCheck )
- {
- m_isChecked = bDoCheck;
- if ( MAC_WXHMENU(m_parentMenu->GetHMenu()) )
- {
- int index = m_parentMenu->MacGetIndexFromItem( this ) ;
- if ( index >= 1 )
- {
- if ( bDoCheck )
- ::SetItemMark( MAC_WXHMENU(m_parentMenu->GetHMenu()) , index , 0x12 ) ; // checkmark
- else
- ::SetItemMark( MAC_WXHMENU(m_parentMenu->GetHMenu()) , index , 0 ) ; // no mark
- }
- }
- }
+ if ( m_isChecked != bDoCheck )
+ {
+ if ( GetKind() == wxITEM_RADIO )
+ {
+ if ( bDoCheck )
+ {
+ wxMenuItemBase::Check( bDoCheck ) ;
+ UpdateItemStatus() ;
+
+ // get the index of this item in the menu
+ const wxMenuItemList& items = m_parentMenu->GetMenuItems();
+ int pos = items.IndexOf(this);
+ wxCHECK_RET( pos != wxNOT_FOUND,
+ _T("menuitem not found in the menu items list?") );
+
+ // get the radio group range
+ int start,
+ end;
+
+ if ( m_isRadioGroupStart )
+ {
+ // we already have all information we need
+ start = pos;
+ end = m_radioGroup.end;
+ }
+ else // next radio group item
+ {
+ // get the radio group end from the start item
+ start = m_radioGroup.start;
+ end = items.Item(start)->GetData()->m_radioGroup.end;
+ }
+
+ // also uncheck all the other items in this radio group
+ wxMenuItemList::Node *node = items.Item(start);
+ for ( int n = start; n <= end && node; n++ )
+ {
+ if ( n != pos )
+ {
+ ((wxMenuItem*)node->GetData())->UncheckRadio();
+ }
+ node = node->GetNext();
+ }
+ }
+ }
+ else
+ {
+ wxMenuItemBase::Check( bDoCheck ) ;
+ UpdateItemStatus() ;
+ }
+ }
}
void wxMenuItem::SetText(const wxString& text)
return;
wxMenuItemBase::SetText(text);
-// OWNER_DRAWN_ONLY( wxOwnerDrawn::SetName(text) );
+
+ UpdateItemText() ;
+}
- wxCHECK_RET( m_parentMenu && m_parentMenu->GetHMenu(), wxT("menuitem without menu") );
- if ( MAC_WXHMENU(m_parentMenu->GetHMenu()) )
- {
- int index = m_parentMenu->MacGetIndexFromItem( this ) ;
- if ( index >= 1 )
- {
- Str255 label;
- MacBuildMenuString( label , NULL , NULL , text ,false);
- ::SetMenuItemText( MAC_WXHMENU(m_parentMenu->GetHMenu()) , index , label ) ; // checkmark
- }
- }
-
-#if wxUSE_ACCEL
- m_parentMenu->UpdateAccel(this);
-#endif // wxUSE_ACCEL
+// radio group stuff
+// -----------------
+void wxMenuItem::SetAsRadioGroupStart()
+{
+ m_isRadioGroupStart = TRUE;
}
-void wxMenuItem::SetCheckable(bool checkable)
+
+void wxMenuItem::SetRadioGroupStart(int start)
{
- wxMenuItemBase::SetCheckable(checkable);
- // OWNER_DRAWN_ONLY( wxOwnerDrawn::SetCheckable(checkable) );
+ wxASSERT_MSG( !m_isRadioGroupStart,
+ _T("should only be called for the next radio items") );
+
+ m_radioGroup.start = start;
+}
+
+void wxMenuItem::SetRadioGroupEnd(int end)
+{
+ wxASSERT_MSG( m_isRadioGroupStart,
+ _T("should only be called for the first radio item") );
+
+ m_radioGroup.end = end;
}
// ----------------------------------------------------------------------------
// menu manager
-void UMASetMenuTitle( MenuRef menu , StringPtr title )
+MenuRef UMANewMenu( SInt16 id , const wxString& title )
{
-/*
-#if !TARGET_CARBON
- long size = GetHandleSize( (Handle) menu ) ;
- const long headersize = 14 ;
- int oldlen = (**menu).menuData[0] + 1;
- int newlen = title[0] + 1 ;
-
- if ( oldlen < newlen )
- {
- // enlarge before adjusting
- SetHandleSize( (Handle) menu , size + (newlen - oldlen ) );
- }
-
- if ( oldlen != newlen )
- memmove( (char*) (**menu).menuData + newlen , (char*) (**menu).menuData + oldlen , size - headersize - oldlen ) ;
+ wxString str = wxStripMenuCodes( title ) ;
+ MenuRef menu ;
+#if TARGET_CARBON
+ CFStringRef cfs = wxMacCreateCFString( str ) ;
+ CreateNewMenu( id , 0 , &menu ) ;
+ SetMenuTitleWithCFString( menu , cfs ) ;
+ CFRelease( cfs ) ;
+#else
+ Str255 ptitle ;
+ wxMacStringToPascal( str , ptitle ) ;
+ menu = ::NewMenu( id , ptitle ) ;
+#endif
+ return menu ;
+}
- memcpy( (char*) (**menu).menuData , title , newlen ) ;
- if ( oldlen > newlen )
- {
- // shrink after
- SetHandleSize( (Handle) menu , size + (newlen - oldlen ) ) ;
- }
+void UMASetMenuTitle( MenuRef menu , const wxString& title )
+{
+ wxString str = wxStripMenuCodes( title ) ;
+#if TARGET_CARBON
+ CFStringRef cfs = wxMacCreateCFString( str ) ;
+ SetMenuTitleWithCFString( menu , cfs ) ;
+ CFRelease( cfs ) ;
#else
-*/
- SetMenuTitle( menu , title ) ;
-//#endif
+ Str255 ptitle ;
+ wxMacStringToPascal( str , ptitle ) ;
+ SetMenuTitle( menu , ptitle ) ;
+#endif
}
-UInt32 UMAMenuEvent( EventRecord *inEvent )
+void UMASetMenuItemText( MenuRef menu, MenuItemIndex item, const wxString& title )
{
- return MenuEvent( inEvent ) ;
+ wxString str = wxStripMenuCodes( title ) ;
+#if TARGET_CARBON
+ CFStringRef cfs = wxMacCreateCFString( str ) ;
+ SetMenuItemTextWithCFString( menu , item , cfs ) ;
+ CFRelease( cfs ) ;
+#else
+ Str255 ptitle ;
+ wxMacStringToPascal( str , ptitle ) ;
+ SetMenuItemText( menu , item , ptitle ) ;
+#endif
}
-void UMAEnableMenuItem( MenuRef inMenu , MenuItemIndex inItem )
+
+UInt32 UMAMenuEvent( EventRecord *inEvent )
{
- EnableMenuItem( inMenu , inItem ) ;
+ return MenuEvent( inEvent ) ;
}
-void UMADisableMenuItem( MenuRef inMenu , MenuItemIndex inItem )
+void UMAEnableMenuItem( MenuRef inMenu , MenuItemIndex inItem , bool enable)
{
- DisableMenuItem( inMenu , inItem ) ;
+ if ( enable )
+ EnableMenuItem( inMenu , inItem ) ;
+ else
+ DisableMenuItem( inMenu , inItem ) ;
}
-void UMAAppendSubMenuItem( MenuRef menu , StringPtr l , SInt16 id )
+void UMAAppendSubMenuItem( MenuRef menu , const wxString& title , SInt16 id )
{
- MacAppendMenu(menu, l);
+ MacAppendMenu(menu, "\pA");
+ UMASetMenuItemText(menu, (SInt16) ::CountMenuItems(menu), title );
SetMenuItemHierarchicalID( menu , CountMenuItems( menu ) , id ) ;
}
-void UMAInsertSubMenuItem( MenuRef menu , StringPtr l , MenuItemIndex item , SInt16 id )
+void UMAInsertSubMenuItem( MenuRef menu , const wxString& title , MenuItemIndex item , SInt16 id )
{
- MacInsertMenuItem(menu, l , item);
+ MacInsertMenuItem(menu, "\pA" , item);
+ UMASetMenuItemText(menu, item , title );
SetMenuItemHierarchicalID( menu , item , id ) ;
}
-void UMASetMenuItemShortcut( MenuRef menu , MenuItemIndex item , SInt16 key , UInt8 modifiers )
+void UMASetMenuItemShortcut( MenuRef menu , MenuItemIndex item , wxAcceleratorEntry *entry )
{
+ if ( !entry )
+ return ;
+
+ UInt8 modifiers = 0 ;
+ SInt16 key = entry->GetKeyCode() ;
if ( key )
{
+ bool explicitCommandKey = false ;
+
+ if ( entry->GetFlags() & wxACCEL_CTRL )
+ {
+ explicitCommandKey = true ;
+ }
+
+ if (entry->GetFlags() & wxACCEL_ALT )
+ {
+ modifiers |= kMenuOptionModifier ;
+ }
+
+ if (entry->GetFlags() & wxACCEL_SHIFT)
+ {
+ modifiers |= kMenuShiftModifier ;
+ }
+
SInt16 glyph = 0 ;
SInt16 macKey = key ;
if ( key >= WXK_F1 && key <= WXK_F15 )
glyph = kMenuF1Glyph + ( key - WXK_F1 ) ;
if ( key >= WXK_F13 )
glyph += 13 ;
- switch( key )
+ if ( !explicitCommandKey )
+ modifiers |= kMenuNoCommandModifier ;
+
+ switch( key )
{
case WXK_F1 :
macKey += ( 0x7a << 8 ) ;
break ;
}
}
-
+
SetItemCmd( menu, item , macKey );
SetMenuItemModifiers(menu, item , modifiers ) ;
}
}
-void UMAAppendMenuItem( MenuRef menu , StringPtr l , SInt16 key, UInt8 modifiers )
+void UMAAppendMenuItem( MenuRef menu , const wxString& title , wxAcceleratorEntry *entry )
{
MacAppendMenu(menu, "\pA");
- SetMenuItemText(menu, (SInt16) ::CountMenuItems(menu), l);
- UMASetMenuItemShortcut( menu , (SInt16) ::CountMenuItems(menu), key , modifiers ) ;
+ UMASetMenuItemText(menu, (SInt16) ::CountMenuItems(menu), title );
+ UMASetMenuItemShortcut( menu , (SInt16) ::CountMenuItems(menu), entry ) ;
}
-void UMAInsertMenuItem( MenuRef menu , StringPtr l , MenuItemIndex item , SInt16 key, UInt8 modifiers )
+void UMAInsertMenuItem( MenuRef menu , const wxString& title , MenuItemIndex item , wxAcceleratorEntry *entry )
{
MacInsertMenuItem( menu , "\p" , item) ;
- SetMenuItemText(menu, item , l);
- UMASetMenuItemShortcut( menu , item , key , modifiers ) ;
+ UMASetMenuItemText(menu, item , title );
+ UMASetMenuItemShortcut( menu , item , entry ) ;
}
// quickdraw
// ----------------------------------------------------------------------------
//
-// Helper Functions to get Mac Menus the way they should be ;-)
-//
-
-void wxMacCtoPString(const char* theCString, Str255 thePString);
-
-// remove inappropriate characters, if useShortcuts is false, the ampersand will not auto-generate a mac menu-shortcut
-
-int wxMenuItem::MacBuildMenuString(StringPtr outMacItemText, SInt16 *outMacShortcutChar , UInt8 *outMacModifiers , const char *inItemText , bool useShortcuts )
-{
- char *p = (char *) &outMacItemText[1] ;
- short macModifiers = 0 ;
- SInt16 macShortCut = 0 ;
- const char *inItemName ;
- wxString inItemTextMac ;
-
- if (wxApp::s_macDefaultEncodingIsPC)
- {
- inItemTextMac = wxMacMakeMacStringFromPC( inItemText ) ;
- inItemName = inItemTextMac ;
- }
- else
- {
- inItemName = inItemText ;
- }
-
- if ( useShortcuts && !wxApp::s_macSupportPCMenuShortcuts )
- useShortcuts = false ;
-
- // we have problems with a leading hypen - it will be taken as a separator
-
- while ( *inItemName == '-' )
- inItemName++ ;
-
- while( *inItemName )
- {
- switch ( *inItemName )
- {
- // shortcuts
- case '&' :
- {
- ++inItemName ;
- if ( *inItemName )
- {
- *p++ = *inItemName ;
- if ( useShortcuts )
- macShortCut = *inItemName ;
- }
- else
- --inItemName ;
- }
- break ;
- // win-like accelerators
- case '\t' :
- {
- ++inItemName ;
- bool skip = false ;
- bool explicitCommandKey = false ;
- while( *inItemName && !skip )
- {
- if (wxStrnicmp("Ctrl", inItemName, 4) == 0)
- {
- inItemName = inItemName + 5;
- explicitCommandKey = true ;
- }
- else if (wxStrnicmp("Cntrl", inItemName, 5) == 0)
- {
- inItemName = inItemName + 6;
- explicitCommandKey = true ;
- }
- else if (wxStrnicmp("Alt", inItemName, 3) == 0)
- {
- inItemName = inItemName + 4;
- macModifiers |= kMenuOptionModifier ;
- }
- else if (wxStrnicmp("Shift", inItemName, 5) == 0)
- {
- inItemName = inItemName + 6;
- macModifiers |= kMenuShiftModifier ;
- }
- else
- {
- skip = true ;
- }
- }
- if ( *inItemName )
- {
- if ( strlen(inItemName) == 1 )
- {
- macShortCut = *inItemName;
- }
- else if ( !wxStricmp( inItemName , "Delete" ) || !wxStricmp( inItemName , "Del" ) )
- {
- macShortCut = WXK_DELETE ;
- }
- else if ( !wxStricmp( inItemName , "Back" ) || !wxStricmp( inItemName , "Backspace" ) )
- {
- macShortCut = WXK_BACK ;
- }
- else if ( !wxStricmp( inItemName , "Return" ) )
- {
- macShortCut = WXK_RETURN ;
- }
- else if ( !wxStricmp( inItemName , "Enter" ) )
- {
- macShortCut = kEnterCharCode ;
- }
- else if ( *inItemName == 'F' )
- {
- int fkey = atol(inItemName+1) ;
- if (fkey >= 1 && fkey < 15 )
- {
- macShortCut = WXK_F1 + fkey - 1 ;
- }
- if ( !explicitCommandKey )
- macModifiers |= kMenuNoCommandModifier ;
- }
- }
-
- inItemName += strlen( inItemName ) ;
-
- if ( *inItemName == 0 )
- --inItemName ;
-
- }
- break ;
- default :
- *p++ = *inItemName ;
- }
- ++inItemName ;
- }
-
- outMacItemText[0] = (p - (char *)outMacItemText) - 1;
- if ( outMacShortcutChar )
- *outMacShortcutChar = macShortCut ;
- if ( outMacModifiers )
- *outMacModifiers = macModifiers ;
-
- return 0 ;
-}
-
// ctor & dtor
// -----------
wxMenu *pSubMenu)
: wxMenuItemBase(pParentMenu, id, text, strHelp, kind, pSubMenu)
{
- // VZ: what about translations?? (FIXME)
- if ( m_text == "E&xit" ||m_text == "Exit" ||m_text.Left(5) == "Exit\t" || m_text.Left(6) == "E&xit\t" )
+ // In other languages there is no difference in naming the Exit/Quit menu item between MacOS and Windows guidelines
+ // therefore these item must not be translated
+ if ( wxStripMenuCodes(m_text).Upper() == "EXIT" )
{
m_text = "Quit\tCtrl+Q" ;
}
+
+ m_radioGroup.start = -1;
+ m_isRadioGroupStart = FALSE;
}
wxMenuItem::~wxMenuItem()
{
}
-bool wxMenuItem::IsChecked() const
-{
- return wxMenuItemBase::IsChecked() ;
-}
+// change item state
+// -----------------
-wxString wxMenuItem::GetLabel() const
-{
- return wxStripMenuCodes(m_text);
+void wxMenuItem::SetBitmap(const wxBitmap& bitmap)
+{
+ m_bitmap = bitmap;
+ UpdateItemBitmap() ;
}
-// accelerators
-// ------------
-
-#if wxUSE_ACCEL
-
-wxAcceleratorEntry *wxMenuItem::GetAccel() const
+void wxMenuItem::UpdateItemBitmap()
{
- return wxGetAccelFromString(GetText());
+ if ( !m_parentMenu )
+ return ;
+
+ MenuHandle mhandle = MAC_WXHMENU(m_parentMenu->GetHMenu()) ;
+ MenuItemIndex index = m_parentMenu->MacGetIndexFromItem( this ) ;
+ if( mhandle == NULL || index == 0)
+ return ;
+
+ if ( m_bitmap.Ok() )
+ {
+ ControlButtonContentInfo info ;
+ wxMacCreateBitmapButton( &info , m_bitmap , kControlContentCIconHandle ) ;
+ if ( info.contentType != kControlNoContent )
+ {
+ if ( info.contentType == kControlContentCIconHandle )
+ SetMenuItemIconHandle( mhandle , index ,
+ kMenuColorIconType , (Handle) info.u.cIconHandle ) ;
+ }
+
+ }
}
-#endif // wxUSE_ACCEL
-
-// misc
-// ----
-
-/*
-
-// delete the sub menu
-void wxMenuItem::DeleteSubMenu()
+void wxMenuItem::UpdateItemStatus()
{
- wxASSERT( m_subMenu != NULL );
+ if ( !m_parentMenu )
+ return ;
+
+ MenuHandle mhandle = MAC_WXHMENU(m_parentMenu->GetHMenu()) ;
+ MenuItemIndex index = m_parentMenu->MacGetIndexFromItem( this ) ;
+ if( mhandle == NULL || index == 0)
+ return ;
+
+ UMAEnableMenuItem( mhandle , index , m_isEnabled ) ;
+ if ( IsCheckable() && IsChecked() )
+ ::SetItemMark( mhandle , index , 0x12 ) ; // checkmark
+ else
+ ::SetItemMark( mhandle , index , 0 ) ; // no mark
- delete m_subMenu;
- m_subMenu = NULL;
+ UMASetMenuItemText( mhandle , index , m_text ) ;
+ wxAcceleratorEntry *entry = wxGetAccelFromString( m_text ) ;
+ UMASetMenuItemShortcut( mhandle , index , entry ) ;
+ delete entry ;
}
-*/
+void wxMenuItem::UpdateItemText()
+{
+ if ( !m_parentMenu )
+ return ;
+
+ MenuHandle mhandle = MAC_WXHMENU(m_parentMenu->GetHMenu()) ;
+ MenuItemIndex index = m_parentMenu->MacGetIndexFromItem( this ) ;
+ if( mhandle == NULL || index == 0)
+ return ;
+
+ UMASetMenuItemText( mhandle , index , m_text ) ;
+ wxAcceleratorEntry *entry = wxGetAccelFromString( m_text ) ;
+ UMASetMenuItemShortcut( mhandle , index , entry ) ;
+ delete entry ;
+}
-// change item state
-// -----------------
void wxMenuItem::Enable(bool bDoEnable)
{
- if ( m_isEnabled != bDoEnable ) {
- if ( m_subMenu == NULL )
- {
- // normal menu item
- if ( MAC_WXHMENU(m_parentMenu->GetHMenu()) )
- {
- int index = m_parentMenu->MacGetIndexFromItem( this ) ;
- if ( index >= 1 )
- {
- if ( bDoEnable )
- UMAEnableMenuItem( MAC_WXHMENU(m_parentMenu->GetHMenu()) , index ) ;
- else
- UMADisableMenuItem( MAC_WXHMENU(m_parentMenu->GetHMenu()) , index ) ;
- }
- }
- }
- else
- {
- // submenu
- if ( MAC_WXHMENU(m_parentMenu->GetHMenu()) )
- {
- int index = m_parentMenu->MacGetIndexFromItem( this ) ;
- if ( index >= 1 )
- {
- if ( bDoEnable )
- UMAEnableMenuItem( MAC_WXHMENU(m_parentMenu->GetHMenu()) , index ) ;
- else
- UMADisableMenuItem( MAC_WXHMENU(m_parentMenu->GetHMenu()) , index ) ;
- }
- }
- }
-
- m_isEnabled = bDoEnable;
- }
+ if ( m_isEnabled != bDoEnable )
+ {
+ wxMenuItemBase::Enable( bDoEnable ) ;
+ UpdateItemStatus() ;
+ }
+}
+void wxMenuItem::UncheckRadio()
+{
+ if ( m_isChecked )
+ {
+ wxMenuItemBase::Check( false ) ;
+ UpdateItemStatus() ;
+ }
}
void wxMenuItem::Check(bool bDoCheck)
{
- wxCHECK_RET( IsCheckable(), "only checkable items may be checked" );
+ wxCHECK_RET( IsCheckable(), "only checkable items may be checked" );
- if ( m_isChecked != bDoCheck )
- {
- m_isChecked = bDoCheck;
- if ( MAC_WXHMENU(m_parentMenu->GetHMenu()) )
- {
- int index = m_parentMenu->MacGetIndexFromItem( this ) ;
- if ( index >= 1 )
- {
- if ( bDoCheck )
- ::SetItemMark( MAC_WXHMENU(m_parentMenu->GetHMenu()) , index , 0x12 ) ; // checkmark
- else
- ::SetItemMark( MAC_WXHMENU(m_parentMenu->GetHMenu()) , index , 0 ) ; // no mark
- }
- }
- }
+ if ( m_isChecked != bDoCheck )
+ {
+ if ( GetKind() == wxITEM_RADIO )
+ {
+ if ( bDoCheck )
+ {
+ wxMenuItemBase::Check( bDoCheck ) ;
+ UpdateItemStatus() ;
+
+ // get the index of this item in the menu
+ const wxMenuItemList& items = m_parentMenu->GetMenuItems();
+ int pos = items.IndexOf(this);
+ wxCHECK_RET( pos != wxNOT_FOUND,
+ _T("menuitem not found in the menu items list?") );
+
+ // get the radio group range
+ int start,
+ end;
+
+ if ( m_isRadioGroupStart )
+ {
+ // we already have all information we need
+ start = pos;
+ end = m_radioGroup.end;
+ }
+ else // next radio group item
+ {
+ // get the radio group end from the start item
+ start = m_radioGroup.start;
+ end = items.Item(start)->GetData()->m_radioGroup.end;
+ }
+
+ // also uncheck all the other items in this radio group
+ wxMenuItemList::Node *node = items.Item(start);
+ for ( int n = start; n <= end && node; n++ )
+ {
+ if ( n != pos )
+ {
+ ((wxMenuItem*)node->GetData())->UncheckRadio();
+ }
+ node = node->GetNext();
+ }
+ }
+ }
+ else
+ {
+ wxMenuItemBase::Check( bDoCheck ) ;
+ UpdateItemStatus() ;
+ }
+ }
}
void wxMenuItem::SetText(const wxString& text)
return;
wxMenuItemBase::SetText(text);
-// OWNER_DRAWN_ONLY( wxOwnerDrawn::SetName(text) );
+
+ UpdateItemText() ;
+}
- wxCHECK_RET( m_parentMenu && m_parentMenu->GetHMenu(), wxT("menuitem without menu") );
- if ( MAC_WXHMENU(m_parentMenu->GetHMenu()) )
- {
- int index = m_parentMenu->MacGetIndexFromItem( this ) ;
- if ( index >= 1 )
- {
- Str255 label;
- MacBuildMenuString( label , NULL , NULL , text ,false);
- ::SetMenuItemText( MAC_WXHMENU(m_parentMenu->GetHMenu()) , index , label ) ; // checkmark
- }
- }
-
-#if wxUSE_ACCEL
- m_parentMenu->UpdateAccel(this);
-#endif // wxUSE_ACCEL
+// radio group stuff
+// -----------------
+void wxMenuItem::SetAsRadioGroupStart()
+{
+ m_isRadioGroupStart = TRUE;
}
-void wxMenuItem::SetCheckable(bool checkable)
+
+void wxMenuItem::SetRadioGroupStart(int start)
{
- wxMenuItemBase::SetCheckable(checkable);
- // OWNER_DRAWN_ONLY( wxOwnerDrawn::SetCheckable(checkable) );
+ wxASSERT_MSG( !m_isRadioGroupStart,
+ _T("should only be called for the next radio items") );
+
+ m_radioGroup.start = start;
+}
+
+void wxMenuItem::SetRadioGroupEnd(int end)
+{
+ wxASSERT_MSG( m_isRadioGroupStart,
+ _T("should only be called for the first radio item") );
+
+ m_radioGroup.end = end;
}
// ----------------------------------------------------------------------------
// menu manager
-void UMASetMenuTitle( MenuRef menu , StringPtr title )
+MenuRef UMANewMenu( SInt16 id , const wxString& title )
{
-/*
-#if !TARGET_CARBON
- long size = GetHandleSize( (Handle) menu ) ;
- const long headersize = 14 ;
- int oldlen = (**menu).menuData[0] + 1;
- int newlen = title[0] + 1 ;
-
- if ( oldlen < newlen )
- {
- // enlarge before adjusting
- SetHandleSize( (Handle) menu , size + (newlen - oldlen ) );
- }
-
- if ( oldlen != newlen )
- memmove( (char*) (**menu).menuData + newlen , (char*) (**menu).menuData + oldlen , size - headersize - oldlen ) ;
+ wxString str = wxStripMenuCodes( title ) ;
+ MenuRef menu ;
+#if TARGET_CARBON
+ CFStringRef cfs = wxMacCreateCFString( str ) ;
+ CreateNewMenu( id , 0 , &menu ) ;
+ SetMenuTitleWithCFString( menu , cfs ) ;
+ CFRelease( cfs ) ;
+#else
+ Str255 ptitle ;
+ wxMacStringToPascal( str , ptitle ) ;
+ menu = ::NewMenu( id , ptitle ) ;
+#endif
+ return menu ;
+}
- memcpy( (char*) (**menu).menuData , title , newlen ) ;
- if ( oldlen > newlen )
- {
- // shrink after
- SetHandleSize( (Handle) menu , size + (newlen - oldlen ) ) ;
- }
+void UMASetMenuTitle( MenuRef menu , const wxString& title )
+{
+ wxString str = wxStripMenuCodes( title ) ;
+#if TARGET_CARBON
+ CFStringRef cfs = wxMacCreateCFString( str ) ;
+ SetMenuTitleWithCFString( menu , cfs ) ;
+ CFRelease( cfs ) ;
#else
-*/
- SetMenuTitle( menu , title ) ;
-//#endif
+ Str255 ptitle ;
+ wxMacStringToPascal( str , ptitle ) ;
+ SetMenuTitle( menu , ptitle ) ;
+#endif
}
-UInt32 UMAMenuEvent( EventRecord *inEvent )
+void UMASetMenuItemText( MenuRef menu, MenuItemIndex item, const wxString& title )
{
- return MenuEvent( inEvent ) ;
+ wxString str = wxStripMenuCodes( title ) ;
+#if TARGET_CARBON
+ CFStringRef cfs = wxMacCreateCFString( str ) ;
+ SetMenuItemTextWithCFString( menu , item , cfs ) ;
+ CFRelease( cfs ) ;
+#else
+ Str255 ptitle ;
+ wxMacStringToPascal( str , ptitle ) ;
+ SetMenuItemText( menu , item , ptitle ) ;
+#endif
}
-void UMAEnableMenuItem( MenuRef inMenu , MenuItemIndex inItem )
+
+UInt32 UMAMenuEvent( EventRecord *inEvent )
{
- EnableMenuItem( inMenu , inItem ) ;
+ return MenuEvent( inEvent ) ;
}
-void UMADisableMenuItem( MenuRef inMenu , MenuItemIndex inItem )
+void UMAEnableMenuItem( MenuRef inMenu , MenuItemIndex inItem , bool enable)
{
- DisableMenuItem( inMenu , inItem ) ;
+ if ( enable )
+ EnableMenuItem( inMenu , inItem ) ;
+ else
+ DisableMenuItem( inMenu , inItem ) ;
}
-void UMAAppendSubMenuItem( MenuRef menu , StringPtr l , SInt16 id )
+void UMAAppendSubMenuItem( MenuRef menu , const wxString& title , SInt16 id )
{
- MacAppendMenu(menu, l);
+ MacAppendMenu(menu, "\pA");
+ UMASetMenuItemText(menu, (SInt16) ::CountMenuItems(menu), title );
SetMenuItemHierarchicalID( menu , CountMenuItems( menu ) , id ) ;
}
-void UMAInsertSubMenuItem( MenuRef menu , StringPtr l , MenuItemIndex item , SInt16 id )
+void UMAInsertSubMenuItem( MenuRef menu , const wxString& title , MenuItemIndex item , SInt16 id )
{
- MacInsertMenuItem(menu, l , item);
+ MacInsertMenuItem(menu, "\pA" , item);
+ UMASetMenuItemText(menu, item , title );
SetMenuItemHierarchicalID( menu , item , id ) ;
}
-void UMASetMenuItemShortcut( MenuRef menu , MenuItemIndex item , SInt16 key , UInt8 modifiers )
+void UMASetMenuItemShortcut( MenuRef menu , MenuItemIndex item , wxAcceleratorEntry *entry )
{
+ if ( !entry )
+ return ;
+
+ UInt8 modifiers = 0 ;
+ SInt16 key = entry->GetKeyCode() ;
if ( key )
{
+ bool explicitCommandKey = false ;
+
+ if ( entry->GetFlags() & wxACCEL_CTRL )
+ {
+ explicitCommandKey = true ;
+ }
+
+ if (entry->GetFlags() & wxACCEL_ALT )
+ {
+ modifiers |= kMenuOptionModifier ;
+ }
+
+ if (entry->GetFlags() & wxACCEL_SHIFT)
+ {
+ modifiers |= kMenuShiftModifier ;
+ }
+
SInt16 glyph = 0 ;
SInt16 macKey = key ;
if ( key >= WXK_F1 && key <= WXK_F15 )
glyph = kMenuF1Glyph + ( key - WXK_F1 ) ;
if ( key >= WXK_F13 )
glyph += 13 ;
- switch( key )
+ if ( !explicitCommandKey )
+ modifiers |= kMenuNoCommandModifier ;
+
+ switch( key )
{
case WXK_F1 :
macKey += ( 0x7a << 8 ) ;
break ;
}
}
-
+
SetItemCmd( menu, item , macKey );
SetMenuItemModifiers(menu, item , modifiers ) ;
}
}
-void UMAAppendMenuItem( MenuRef menu , StringPtr l , SInt16 key, UInt8 modifiers )
+void UMAAppendMenuItem( MenuRef menu , const wxString& title , wxAcceleratorEntry *entry )
{
MacAppendMenu(menu, "\pA");
- SetMenuItemText(menu, (SInt16) ::CountMenuItems(menu), l);
- UMASetMenuItemShortcut( menu , (SInt16) ::CountMenuItems(menu), key , modifiers ) ;
+ UMASetMenuItemText(menu, (SInt16) ::CountMenuItems(menu), title );
+ UMASetMenuItemShortcut( menu , (SInt16) ::CountMenuItems(menu), entry ) ;
}
-void UMAInsertMenuItem( MenuRef menu , StringPtr l , MenuItemIndex item , SInt16 key, UInt8 modifiers )
+void UMAInsertMenuItem( MenuRef menu , const wxString& title , MenuItemIndex item , wxAcceleratorEntry *entry )
{
MacInsertMenuItem( menu , "\p" , item) ;
- SetMenuItemText(menu, item , l);
- UMASetMenuItemShortcut( menu , item , key , modifiers ) ;
+ UMASetMenuItemText(menu, item , title );
+ UMASetMenuItemShortcut( menu , item , entry ) ;
}
// quickdraw
projects / wxWidgets.git / commitdiff
