From 74f9e8e3d90a960c8af50fef671ed0a705a106d5 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Fri, 20 Dec 2002 15:39:30 +0000 Subject: [PATCH] menu string of choice control allows for all characters now git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@18373 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/mac/carbon/choice.cpp | 5 ++++- src/mac/choice.cpp | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/mac/carbon/choice.cpp b/src/mac/carbon/choice.cpp index bc008702f4..7a6767833f 100644 --- a/src/mac/carbon/choice.cpp +++ b/src/mac/carbon/choice.cpp @@ -72,7 +72,10 @@ int wxChoice::DoAppend(const wxString& item) { Str255 label; wxMenuItem::MacBuildMenuString( label , NULL , NULL , item ,false); - AppendMenu( MAC_WXHMENU( m_macPopUpMenuHandle ) , label ) ; + 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 ) ; m_strings.Add( item ) ; m_datas.Add( NULL ) ; int index = m_strings.GetCount() - 1 ; diff --git a/src/mac/choice.cpp b/src/mac/choice.cpp index bc008702f4..7a6767833f 100644 --- a/src/mac/choice.cpp +++ b/src/mac/choice.cpp @@ -72,7 +72,10 @@ int wxChoice::DoAppend(const wxString& item) { Str255 label; wxMenuItem::MacBuildMenuString( label , NULL , NULL , item ,false); - AppendMenu( MAC_WXHMENU( m_macPopUpMenuHandle ) , label ) ; + 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 ) ; m_strings.Add( item ) ; m_datas.Add( NULL ) ; int index = m_strings.GetCount() - 1 ;