Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix so wxMenu::InsertItem actually inserts rather than overwrites

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@20974 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2003-06-06 23:46:36 +00:00
parent 6844c083a1
commit 27f4f38e85
4 changed files with 94 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/mac/carbon/menu.cpp
View File

@@ -234,7 +234,7 @@ bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos)
else else
{ {
UMAInsertMenuItem(MAC_WXHMENU(m_hMenu), label , pos,key,modifiers); UMAInsertMenuItem(MAC_WXHMENU(m_hMenu), label , pos,key,modifiers);
SetMenuItemCommandID( MAC_WXHMENU(m_hMenu) , pos , pItem->GetId() ) ; SetMenuItemCommandID( MAC_WXHMENU(m_hMenu) , pos+1 , pItem->GetId() ) ;
if ( pItem->GetBitmap().Ok() ) if ( pItem->GetBitmap().Ok() )
{ {
ControlButtonContentInfo info ; ControlButtonContentInfo info ;

6
src/mac/carbon/uma.cpp
View File

@@ -388,9 +388,9 @@ void UMAAppendMenuItem( MenuRef menu , StringPtr l , SInt16 key, UInt8 modifiers
void UMAInsertMenuItem( MenuRef menu , StringPtr l , MenuItemIndex item , SInt16 key, UInt8 modifiers ) void UMAInsertMenuItem( MenuRef menu , StringPtr l , MenuItemIndex item , SInt16 key, UInt8 modifiers )
{ {
MacInsertMenuItem( menu , "\p" , item) ; MacInsertMenuItem( menu , "\pA" , item) ;
SetMenuItemText(menu, item , l); SetMenuItemText(menu, item+1 , l);
UMASetMenuItemShortcut( menu , item , key , modifiers ) ; UMASetMenuItemShortcut( menu , item+1 , key , modifiers ) ;
} }
// quickdraw // quickdraw

2
src/mac/menu.cpp
View File

@@ -234,7 +234,7 @@ bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos)
else else
{ {
UMAInsertMenuItem(MAC_WXHMENU(m_hMenu), label , pos,key,modifiers); UMAInsertMenuItem(MAC_WXHMENU(m_hMenu), label , pos,key,modifiers);
SetMenuItemCommandID( MAC_WXHMENU(m_hMenu) , pos , pItem->GetId() ) ; SetMenuItemCommandID( MAC_WXHMENU(m_hMenu) , pos+1 , pItem->GetId() ) ;
if ( pItem->GetBitmap().Ok() ) if ( pItem->GetBitmap().Ok() )
{ {
ControlButtonContentInfo info ; ControlButtonContentInfo info ;

6
src/mac/uma.cpp
View File

@@ -388,9 +388,9 @@ void UMAAppendMenuItem( MenuRef menu , StringPtr l , SInt16 key, UInt8 modifiers
void UMAInsertMenuItem( MenuRef menu , StringPtr l , MenuItemIndex item , SInt16 key, UInt8 modifiers ) void UMAInsertMenuItem( MenuRef menu , StringPtr l , MenuItemIndex item , SInt16 key, UInt8 modifiers )
{ {
MacInsertMenuItem( menu , "\p" , item) ; MacInsertMenuItem( menu , "\pA" , item) ;
SetMenuItemText(menu, item , l); SetMenuItemText(menu, item+1 , l);
UMASetMenuItemShortcut( menu , item , key , modifiers ) ; UMASetMenuItemShortcut( menu , item+1 , key , modifiers ) ;
} }
// quickdraw // quickdraw