X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d1adc25737bf5c001a2218fd6d8281262a811ace..b16de7461ac6d97b0b04a5ce4e73447925e93416:/src/cocoa/choice.mm diff --git a/src/cocoa/choice.mm b/src/cocoa/choice.mm index ba97699d8e..3c5d479162 100644 --- a/src/cocoa/choice.mm +++ b/src/cocoa/choice.mm @@ -1,15 +1,18 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: cocoa/choice.mm +// Name: src/cocoa/choice.mm // Purpose: wxChoice // Author: David Elliott // Modified by: // Created: 2003/03/16 -// RCS-ID: $Id: +// Id: $Id$ // Copyright: (c) 2003 David Elliott -// Licence: wxWidgets licence +// Licence: wxWidgets licence ///////////////////////////////////////////////////////////////////////////// #include "wx/wxprec.h" + +#if wxUSE_CHOICE + #ifndef WX_PRECOMP #include "wx/log.h" #include "wx/app.h" @@ -170,8 +173,9 @@ void wxChoice::SetString(int n, const wxString& title) [item setTitle:wxNSStringWithWxString(title)]; } -int wxChoice::FindString(const wxString& title) const +int wxChoice::FindString(const wxString& title, bool bCase) const { + // FIXME: use wxItemContainerImmutable::FindString for bCase parameter return [(NSPopUpButton*)m_cocoaNSView indexOfItemWithTitle: wxNSStringWithWxString(title)]; } @@ -183,6 +187,7 @@ int wxChoice::GetSelection() const int wxChoice::DoAppend(const wxString& title) { + wxAutoNSAutoreleasePool pool; NSMenu *nsmenu = [(NSPopUpButton*)m_cocoaNSView menu]; NSMenuItem *item; if(m_sortedStrings) @@ -239,3 +244,4 @@ void wxChoice::SetSelection(int n) [(NSPopUpButton*)m_cocoaNSView selectItemAtIndex:n]; } +#endif