From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Tue, 28 Jan 2003 08:22:48 +0000 (+0000)
Subject: new menu code
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/2e97b58c63b490d77efaac17d7d0fafd403d0468

new menu code


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18975 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/mac/carbon/choice.cpp b/src/mac/carbon/choice.cpp
index 9a9cf69647..46e08be0d5 100644
--- a/src/mac/carbon/choice.cpp
+++ b/src/mac/carbon/choice.cpp
@@ -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  ;
diff --git a/src/mac/choice.cpp b/src/mac/choice.cpp
index 9a9cf69647..46e08be0d5 100644
--- a/src/mac/choice.cpp
+++ b/src/mac/choice.cpp
@@ -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  ;