new menu code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18975 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -57,12 +57,7 @@ bool wxChoice::Create(wxWindow *parent, wxWindowID id,
|
||||
// ----------------------------------------------------------------------------
|
||||
int wxChoice::DoAppend(const wxString& item)
|
||||
{
|
||||
Str255 label;
|
||||
wxMenuItem::MacBuildMenuString( label , NULL , NULL , item ,false);
|
||||
MacAppendMenu(MAC_WXHMENU( m_macPopUpMenuHandle ) , "\pA");
|
||||
SetMenuItemText(MAC_WXHMENU( m_macPopUpMenuHandle ) ,
|
||||
(SInt16) ::CountMenuItems(MAC_WXHMENU( m_macPopUpMenuHandle ) ), label);
|
||||
// was AppendMenu( MAC_WXHMENU( m_macPopUpMenuHandle ) , label ) ;
|
||||
UMAAppendMenuItem(MAC_WXHMENU( m_macPopUpMenuHandle ) , item);
|
||||
m_strings.Add( item ) ;
|
||||
m_datas.Add( NULL ) ;
|
||||
int index = m_strings.GetCount() - 1 ;
|
||||
|
@@ -57,12 +57,7 @@ bool wxChoice::Create(wxWindow *parent, wxWindowID id,
|
||||
// ----------------------------------------------------------------------------
|
||||
int wxChoice::DoAppend(const wxString& item)
|
||||
{
|
||||
Str255 label;
|
||||
wxMenuItem::MacBuildMenuString( label , NULL , NULL , item ,false);
|
||||
MacAppendMenu(MAC_WXHMENU( m_macPopUpMenuHandle ) , "\pA");
|
||||
SetMenuItemText(MAC_WXHMENU( m_macPopUpMenuHandle ) ,
|
||||
(SInt16) ::CountMenuItems(MAC_WXHMENU( m_macPopUpMenuHandle ) ), label);
|
||||
// was AppendMenu( MAC_WXHMENU( m_macPopUpMenuHandle ) , label ) ;
|
||||
UMAAppendMenuItem(MAC_WXHMENU( m_macPopUpMenuHandle ) , item);
|
||||
m_strings.Add( item ) ;
|
||||
m_datas.Add( NULL ) ;
|
||||
int index = m_strings.GetCount() - 1 ;
|
||||
|
Reference in New Issue
Block a user