MSVC 5 does not have BIF_EDITBOX.

[wxWidgets.git] / src / mac / carbon / choice.cpp

diff --git a/src/mac/carbon/choice.cpp b/src/mac/carbon/choice.cpp
index 9a9cf69647277492da327e2a4f70296eeba87ca7..ac29f3125b9256ec8c3d6bdbc09b7769f37a2f0d 100644 (file)
--- a/src/mac/carbon/choice.cpp
+++ b/src/mac/carbon/choice.cpp
@@ -21,7 +21,15 @@ IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControl)
 extern MenuHandle NewUniqueMenu() ;
 wxChoice::~wxChoice()
 {
-       // DeleteMenu( m_macPopUpMenuId ) ;
+    if ( HasClientObjectData() )
+    {
+        size_t i, max = GetCount();
+
+        for ( i = 0; i < max; ++i )
+            delete GetClientObject(i);
+    }
+
+        // DeleteMenu( m_macPopUpMenuId ) ;
        // DisposeMenu( m_macPopUpMenuHandle ) ;
 }
 bool wxChoice::Create(wxWindow *parent, wxWindowID id,
@@ -57,12 +65,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  ;
@@ -226,4 +229,4 @@ wxSize wxChoice::DoGetBestSize() const
            
        }
     return wxSize(lbWidth, lbHeight);
-}
\ No newline at end of file
+}