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 9a9cf69647277492da327e2a4f70296eeba87ca7..46e08be0d526ac7bdb271b81fa2b5732745dab15 100644 (file)
--- 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)
 {
 // ----------------------------------------------------------------------------
 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  ;
        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 9a9cf69647277492da327e2a4f70296eeba87ca7..46e08be0d526ac7bdb271b81fa2b5732745dab15 100644 (file)
--- 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)
 {
 // ----------------------------------------------------------------------------
 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  ;
        m_strings.Add( item ) ;
        m_datas.Add( NULL ) ;
        int index = m_strings.GetCount()  - 1  ;