X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d77ea20c7528b96fae506a7dc8ad68d4a04489b2..7e837615b95205297821dc0b85791ad9e0055df6:/src/cocoa/choice.mm?ds=sidebyside

diff --git a/src/cocoa/choice.mm b/src/cocoa/choice.mm
index dad736da5a..30c9dab74a 100644
--- a/src/cocoa/choice.mm
+++ b/src/cocoa/choice.mm
@@ -1,25 +1,58 @@
 /////////////////////////////////////////////////////////////////////////////
-// 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:   	wxWindows license
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#include "wx/app.h"
+#include "wx/wxprec.h"
+
+#if wxUSE_CHOICE
+
 #include "wx/choice.h"
-#include "wx/log.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+    #include "wx/app.h"
+    #include "wx/arrstr.h"
+#endif //WX_PRECOMP
+
+#include "wx/cocoa/string.h"
+#include "wx/cocoa/autorelease.h"
 
 #import <AppKit/NSPopUpButton.h>
+#import <AppKit/NSMenu.h>
+#import <Foundation/NSNotification.h>
+#import <Foundation/NSDictionary.h>
 
-IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControl)
+IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControlWithItems)
 BEGIN_EVENT_TABLE(wxChoice, wxChoiceBase)
 END_EVENT_TABLE()
 // WX_IMPLEMENT_COCOA_OWNER(wxChoice,NSButton,NSControl,NSView)
 
+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,
@@ -28,13 +61,42 @@ 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;
 
     SetNSView([[NSPopUpButton alloc] initWithFrame:MakeDefaultNSRect(size)
         pullsDown: NO]);
-
-    [m_cocoaNSView sizeToFit];
+    [m_cocoaNSView release];
+
+    NSMenu *nsmenu = [(NSPopUpButton*)m_cocoaNSView menu];
+    AssociateNSMenu(nsmenu, OBSERVE_DidSendAction);
+
+    if(style&wxCB_SORT)
+    {
+        m_sortedStrings = new wxSortedArrayString;
+        for(int i=0; i<n; i++)
+        {
+            m_sortedStrings->Add(choices[i]);
+        }
+        for(unsigned int i=0; i < m_sortedStrings->GetCount(); i++)
+        {
+            [nsmenu addItemWithTitle:wxNSStringWithWxString(
+                    m_sortedStrings->Item(i))
+                action: nil keyEquivalent:@""];
+        }
+    }
+    else
+    {
+        for(int i=0; i<n; i++)
+        {
+            [nsmenu addItemWithTitle:wxNSStringWithWxString(choices[i])
+                action: nil keyEquivalent:@""];
+        }
+    }
+    m_itemsClientData.SetCount(n);
+
+    [(NSPopUpButton*)m_cocoaNSView sizeToFit];
     if(m_parent)
         m_parent->CocoaAddChild(this);
     SetInitialFrameRect(pos,size);
@@ -44,70 +106,105 @@ bool wxChoice::Create(wxWindow *parent, wxWindowID winid,
 
 wxChoice::~wxChoice()
 {
-    CocoaRemoveFromParent();
-}
+    DisassociateNSMenu([(NSPopUpButton*)m_cocoaNSView menu]);
 
-void wxChoice::Clear()
-{
+    Clear();
 }
 
-void wxChoice::Delete(int)
+void wxChoice::CocoaNotification_menuDidSendAction(WX_NSNotification notification)
 {
+    NSDictionary *userInfo = [notification userInfo];
+    NSMenuItem *menuitem = [userInfo objectForKey:@"MenuItem"];
+    int index = [[(NSPopUpButton*)m_cocoaNSView menu] indexOfItem: menuitem];
+    int selectedItem = [(NSPopUpButton*)m_cocoaNSView indexOfSelectedItem];
+    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);
+    event.SetString(GetStringSelection());
+    HandleWindowEvent(event);
 }
 
-int wxChoice::GetCount() const
+void wxChoice::DoClear()
 {
-    return 0;
+    if(m_sortedStrings)
+        m_sortedStrings->Clear();
+    m_itemsClientData.Clear();
+    [(NSPopUpButton*)m_cocoaNSView removeAllItems];
 }
 
-wxString wxChoice::GetString(int) const
+void wxChoice::DoDeleteOneItem(unsigned int n)
 {
-    return wxEmptyString;
+    if(m_sortedStrings)
+        m_sortedStrings->RemoveAt(n);
+    m_itemsClientData.RemoveAt(n);
+    [(NSPopUpButton*)m_cocoaNSView removeItemAtIndex:n];
 }
 
-void wxChoice::SetString(int, const wxString&)
+unsigned int wxChoice::GetCount() const
 {
+    return (unsigned int)[(NSPopUpButton*)m_cocoaNSView numberOfItems];
 }
 
-int wxChoice::FindString(const wxString&) const
+wxString wxChoice::GetString(unsigned int n) const
 {
-    return 0;
+    wxAutoNSAutoreleasePool pool;
+    return wxStringWithNSString([(NSPopUpButton*)m_cocoaNSView itemTitleAtIndex:n]);
 }
 
-int wxChoice::GetSelection() const
+void wxChoice::SetString(unsigned int n, const wxString& title)
 {
-    return 0;
+    NSMenuItem *item = [(NSPopUpButton*)m_cocoaNSView itemAtIndex:n];
+    [item setTitle:wxNSStringWithWxString(title)];
 }
 
-int wxChoice::DoAppend(const wxString&)
+int wxChoice::FindString(const wxString& title, bool bCase) const
 {
-    return 0;
+    // FIXME: use wxItemContainerImmutable::FindString for bCase parameter
+    return [(NSPopUpButton*)m_cocoaNSView indexOfItemWithTitle:
+        wxNSStringWithWxString(title)];
 }
 
-int wxChoice::DoInsert(const wxString&, int)
+int wxChoice::GetSelection() const
 {
-    return 0;
+    return [(NSPopUpButton*)m_cocoaNSView indexOfSelectedItem];
 }
 
-void wxChoice::DoSetItemClientData(int, void*)
+int wxChoice::DoInsertItems(const wxArrayStringsAdapter & items,
+                            unsigned int pos,
+                            void **clientData, wxClientDataType type)
 {
-}
+    NSMenu *nsmenu = [(NSPopUpButton*)m_cocoaNSView menu];
+    NSMenuItem *item = NULL;
 
-void* wxChoice::DoGetItemClientData(int) const
-{
-    return NULL;
+    unsigned int numItems = items.GetCount();
+    for ( unsigned int i = 0; i < numItems; ++i, ++pos )
+    {
+        const wxString& str = items[i];
+        int idx = m_sortedStrings ? m_sortedStrings->Add(str) : pos;
+
+        item = [nsmenu insertItemWithTitle:wxNSStringWithWxString(str)
+            action: nil keyEquivalent:@"" atIndex:idx];
+        m_itemsClientData.Insert(NULL, idx);
+        AssignNewItemClientData(idx, clientData, i, type);
+    }
+    return [nsmenu indexOfItem:item];
 }
 
-void wxChoice::DoSetItemClientObject(int, wxClientData*)
+void wxChoice::DoSetItemClientData(unsigned int n, void *data)
 {
+    m_itemsClientData[n] = data;
 }
 
-wxClientData* wxChoice::DoGetItemClientObject(int) const
+void* wxChoice::DoGetItemClientData(unsigned int n) const
 {
-    return NULL;
+    return m_itemsClientData[n];
 }
 
-void wxChoice::SetSelection(int)
+void wxChoice::SetSelection(int n)
 {
+    wxAutoNSAutoreleasePool pool;
+    [(NSPopUpButton*)m_cocoaNSView selectItemAtIndex:n];
 }
 
+#endif // wxUSE_CHOICE