X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b0c0a393c4027a46b83187ea1328949ca75971d0..a646203a023d3f6b00459ef94930d539ac02d85f:/src/cocoa/choice.mm diff --git a/src/cocoa/choice.mm b/src/cocoa/choice.mm index 3840e0994b..401e7af1f7 100644 --- a/src/cocoa/choice.mm +++ b/src/cocoa/choice.mm @@ -6,7 +6,7 @@ // Created: 2003/03/16 // RCS-ID: $Id: // Copyright: (c) 2003 David Elliott -// Licence: wxWindows license +// Licence: wxWidgets licence ///////////////////////////////////////////////////////////////////////////// #include "wx/wxprec.h" @@ -14,6 +14,7 @@ #include "wx/log.h" #include "wx/app.h" #include "wx/choice.h" + #include "wx/arrstr.h" #endif //WX_PRECOMP #include "wx/cocoa/string.h" @@ -33,6 +34,20 @@ void wxChoice::Init() m_sortedStrings = NULL; } +bool wxChoice::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 wxChoice::Create(wxWindow *parent, wxWindowID winid, const wxPoint& pos, const wxSize& size, @@ -97,8 +112,6 @@ wxChoice::~wxChoice() delete (wxClientData*)m_itemsClientData.Item(i); } m_itemsClientData.Clear(); - - CocoaRemoveFromParent(); } void wxChoice::CocoaNotification_menuDidSendAction(WX_NSNotification notification) @@ -107,7 +120,7 @@ void wxChoice::CocoaNotification_menuDidSendAction(WX_NSNotification notificatio NSMenuItem *menuitem = [userInfo objectForKey:@"MenuItem"]; int index = [[(NSPopUpButton*)m_cocoaNSView menu] indexOfItem: menuitem]; int selectedItem = [(NSPopUpButton*)m_cocoaNSView indexOfSelectedItem]; - wxLogDebug(wxT("menuDidSendAction, index=%d, selectedItem=%d"), index, selectedItem); + wxLogTrace(wxTRACE_COCOA,wxT("menuDidSendAction, index=%d, selectedItem=%d"), index, selectedItem); wxCommandEvent event(wxEVT_COMMAND_CHOICE_SELECTED, m_windowId); event.SetInt(index); event.SetEventObject(this);