MSVC 5 does not have BIF_EDITBOX.

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

diff --git a/src/mac/choice.cpp b/src/mac/choice.cpp
index 46e08be0d526ac7bdb271b81fa2b5732745dab15..ac29f3125b9256ec8c3d6bdbc09b7769f37a2f0d 100644 (file)
--- a/src/mac/choice.cpp
+++ b/src/mac/choice.cpp
@@ -21,7 +21,15 @@ IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControl)
 extern MenuHandle NewUniqueMenu() ;
 wxChoice::~wxChoice()
 {
 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,
        // DisposeMenu( m_macPopUpMenuHandle ) ;
 }
 bool wxChoice::Create(wxWindow *parent, wxWindowID id,


@@ -221,4 +229,4 @@ wxSize wxChoice::DoGetBestSize() const
            
        }
     return wxSize(lbWidth, lbHeight);
            
        }
     return wxSize(lbWidth, lbHeight);

-}
\ No newline at end of file
+}