X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/065e208ec09e3d08d51d9604497f92f53c210f93..43563ef2dde83b94a798be1788adcd256897c8bd:/src/cocoa/choice.mm?ds=inline diff --git a/src/cocoa/choice.mm b/src/cocoa/choice.mm index 401e7af1f7..266a2bdbbc 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" @@ -18,6 +21,7 @@ #endif //WX_PRECOMP #include "wx/cocoa/string.h" +#include "wx/cocoa/autorelease.h" #import #import @@ -56,6 +60,7 @@ bool wxChoice::Create(wxWindow *parent, wxWindowID winid, const wxValidator& validator, const wxString& name) { + wxAutoNSAutoreleasePool pool; if(!CreateControl(parent,winid,pos,size,style,validator,name)) return false; @@ -73,7 +78,7 @@ bool wxChoice::Create(wxWindow *parent, wxWindowID winid, { m_sortedStrings->Add(choices[i]); } - for(size_t i=0; i < m_sortedStrings->GetCount(); i++) + for(unsigned int i=0; i < m_sortedStrings->GetCount(); i++) { [nsmenu addItemWithTitle:wxNSStringWithWxString( m_sortedStrings->Item(i)) @@ -108,7 +113,7 @@ wxChoice::~wxChoice() if(HasClientObjectData()) { - for(size_t i=0; i < m_itemsClientData.GetCount(); i++) + for(unsigned int i=0; i < m_itemsClientData.GetCount(); i++) delete (wxClientData*)m_itemsClientData.Item(i); } m_itemsClientData.Clear(); @@ -134,14 +139,14 @@ void wxChoice::Clear() m_sortedStrings->Clear(); if(HasClientObjectData()) { - for(size_t i=0; i < m_itemsClientData.GetCount(); i++) + for(unsigned int i=0; i < m_itemsClientData.GetCount(); i++) delete (wxClientData*)m_itemsClientData.Item(i); } m_itemsClientData.Clear(); [(NSPopUpButton*)m_cocoaNSView removeAllItems]; } -void wxChoice::Delete(int n) +void wxChoice::Delete(unsigned int n) { if(m_sortedStrings) m_sortedStrings->RemoveAt(n); @@ -151,24 +156,26 @@ void wxChoice::Delete(int n) [(NSPopUpButton*)m_cocoaNSView removeItemAtIndex:n]; } -int wxChoice::GetCount() const +unsigned int wxChoice::GetCount() const { - return [(NSPopUpButton*)m_cocoaNSView numberOfItems]; + return (unsigned int)[(NSPopUpButton*)m_cocoaNSView numberOfItems]; } -wxString wxChoice::GetString(int n) const +wxString wxChoice::GetString(unsigned int n) const { + wxAutoNSAutoreleasePool pool; return wxStringWithNSString([(NSPopUpButton*)m_cocoaNSView itemTitleAtIndex:n]); } -void wxChoice::SetString(int n, const wxString& title) +void wxChoice::SetString(unsigned int n, const wxString& title) { NSMenuItem *item = [(NSPopUpButton*)m_cocoaNSView itemAtIndex:n]; [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)]; } @@ -180,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) @@ -199,7 +207,7 @@ int wxChoice::DoAppend(const wxString& title) return [nsmenu indexOfItem:item]; } -int wxChoice::DoInsert(const wxString& title, int pos) +int wxChoice::DoInsert(const wxString& title, unsigned int pos) { if(m_sortedStrings) return DoAppend(title); @@ -210,28 +218,30 @@ int wxChoice::DoInsert(const wxString& title, int pos) return [nsmenu indexOfItem:item]; } -void wxChoice::DoSetItemClientData(int n, void *data) +void wxChoice::DoSetItemClientData(unsigned int n, void *data) { m_itemsClientData.Item(n) = data; } -void* wxChoice::DoGetItemClientData(int n) const +void* wxChoice::DoGetItemClientData(unsigned int n) const { return m_itemsClientData.Item(n); } -void wxChoice::DoSetItemClientObject(int n, wxClientData *data) +void wxChoice::DoSetItemClientObject(unsigned int n, wxClientData *data) { m_itemsClientData.Item(n) = data; } -wxClientData* wxChoice::DoGetItemClientObject(int n) const +wxClientData* wxChoice::DoGetItemClientObject(unsigned int n) const { return (wxClientData*)m_itemsClientData.Item(n); } void wxChoice::SetSelection(int n) { + wxAutoNSAutoreleasePool pool; [(NSPopUpButton*)m_cocoaNSView selectItemAtIndex:n]; } +#endif