Bail out if GetCurrentMenu returns NULL

[wxWidgets.git] / src / cocoa / checklst.mm

diff --git a/src/cocoa/checklst.mm b/src/cocoa/checklst.mm
index 1ddc6fc8d1c615712622d3b294198f58b2d5fcb8..2cfcc8b3e53fc93b9fea83ca904c06e8bd9a4150 100644 (file)
--- a/src/cocoa/checklst.mm
+++ b/src/cocoa/checklst.mm
@@ -6,18 +6,35 @@
 // Created:     2003/03/18
 // RCS-ID:      $Id: 
 // Copyright:   (c) 2003 David Elliott
-// Licence:    wxWindows license
+// Licence:    wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
-#include "wx/app.h"
-#include "wx/checklst.h"
-#include "wx/log.h"
+#include "wx/wxprec.h"
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+    #include "wx/app.h"
+    #include "wx/checklst.h"
+#endif //WX_PRECOMP
 
 IMPLEMENT_DYNAMIC_CLASS(wxCheckListBox, wxListBox)
 BEGIN_EVENT_TABLE(wxCheckListBox, wxCheckListBoxBase)
 END_EVENT_TABLE()
 // WX_IMPLEMENT_COCOA_OWNER(wxCheckListBox,NSButton,NSControl,NSView)
 
+bool wxCheckListBox::Create(wxWindow *parent, wxWindowID winid,
+            const wxPoint& pos,
+            const wxSize& size,
+            const wxArrayString& choices,
+            long style,
+            const wxValidator& validator,
+            const wxString& name)
+{
+    wxCArrayString chs(choices);
+
+    return Create(parent, winid, pos, size, chs.GetCount(), chs.GetStrings(),
+                  style, validator, name);
+}
+
 bool wxCheckListBox::Create(wxWindow *parent, wxWindowID winid,
             const wxPoint& pos,
             const wxSize& size,
@@ -36,7 +53,6 @@ bool wxCheckListBox::Create(wxWindow *parent, wxWindowID winid,
 
 wxCheckListBox::~wxCheckListBox()
 {
-    CocoaRemoveFromParent();
 }
 
 bool wxCheckListBox::IsChecked(size_t item) const