X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/79323592eba8d44320ecd1cde789315255668a23..b0ae60498d2a1cab6cff09d425d235a0847135e8:/src/osx/cocoa/combobox.mm

diff --git a/src/osx/cocoa/combobox.mm b/src/osx/cocoa/combobox.mm
index 4aec03feb3..88306f25d6 100644
--- a/src/osx/cocoa/combobox.mm
+++ b/src/osx/cocoa/combobox.mm
@@ -4,7 +4,7 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: combobox.mm 54129 2008-06-11 19:30:52Z SC $
+// RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -14,6 +14,7 @@
 #if wxUSE_COMBOBOX
 
 #include "wx/combobox.h"
+#include "wx/evtloop.h"
 
 #ifndef WX_PRECOMP
     #include "wx/menu.h"
@@ -24,12 +25,17 @@
 
 // work in progress
 
-@interface wxNSComboBox : NSComboBox
+@interface wxNSTableDataSource : NSObject wxOSX_10_6_AND_LATER(<NSComboBoxDataSource>)
 {
+    wxNSComboBoxControl* impl;
 }
 
+- (NSInteger)numberOfItemsInComboBox:(NSComboBox *)aComboBox;
+- (id)comboBox:(NSComboBox *)aComboBox objectValueForItemAtIndex:(NSInteger)index;
+
 @end
 
+
 @implementation wxNSComboBox
 
 + (void)initialize
@@ -42,6 +48,33 @@
     }
 }
 
+- (void) dealloc
+{
+    [fieldEditor release];
+    [super dealloc];
+}
+
+// Over-riding NSComboBox onKeyDown method doesn't work for key events.
+// Ensure that we can use our own wxNSTextFieldEditor to catch key events.
+// See windowWillReturnFieldEditor in nonownedwnd.mm.
+// Key events will be caught and handled via wxNSTextFieldEditor onkey...
+// methods in textctrl.mm.
+
+- (void) setFieldEditor:(wxNSTextFieldEditor*) editor
+{
+    if ( editor != fieldEditor )
+    {
+        [editor retain];
+        [fieldEditor release];
+        fieldEditor = editor;
+    }
+}
+
+- (wxNSTextFieldEditor*) fieldEditor
+{
+    return fieldEditor;
+}
+
 - (void)controlTextDidChange:(NSNotification *)aNotification
 {
     wxUnusedVar(aNotification);
@@ -50,7 +83,7 @@
     {
         wxWindow* wxpeer = (wxWindow*) impl->GetWXPeer();
         if ( wxpeer ) {
-            wxCommandEvent event(wxEVT_COMMAND_TEXT_UPDATED, wxpeer->GetId());
+            wxCommandEvent event(wxEVT_TEXT, wxpeer->GetId());
             event.SetEventObject( wxpeer );
             event.SetString( static_cast<wxComboBox*>(wxpeer)->GetValue() );
             wxpeer->HandleWindowEvent( event );
@@ -64,15 +97,20 @@
     wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
     if ( impl && impl->ShouldSendEvents())
     {
-        wxWindow* wxpeer = (wxWindow*) impl->GetWXPeer();
+        wxComboBox* wxpeer = static_cast<wxComboBox*>(impl->GetWXPeer());
         if ( wxpeer ) {
-            wxCommandEvent event(wxEVT_COMMAND_COMBOBOX_SELECTED, wxpeer->GetId());
+            const int sel = wxpeer->GetSelection();
+
+            wxCommandEvent event(wxEVT_COMBOBOX, wxpeer->GetId());
             event.SetEventObject( wxpeer );
-            event.SetInt( static_cast<wxComboBox*>(wxpeer)->GetSelection() );
+            event.SetInt( sel );
+            event.SetString( wxpeer->GetString(sel) );
             // For some reason, wxComboBox::GetValue will not return the newly selected item 
             // while we're inside this callback, so use AddPendingEvent to make sure
             // GetValue() returns the right value.
+
             wxpeer->GetEventHandler()->AddPendingEvent( event );
+
         }
     }
 }
@@ -88,6 +126,30 @@ wxNSComboBoxControl::~wxNSComboBoxControl()
 {
 }
 
+void wxNSComboBoxControl::mouseEvent(WX_NSEvent event, WXWidget slf, void *_cmd)
+{
+    // NSComboBox has its own event loop, which reacts very badly to our synthetic
+    // events used to signal when a wxEvent is posted, so during that time we switch
+    // the wxEventLoop::WakeUp implementation to a lower-level version
+    
+    bool reset = false;
+    wxEventLoop* const loop = (wxEventLoop*) wxEventLoopBase::GetActive();
+
+    if ( loop != NULL && [event type] == NSLeftMouseDown )
+    {
+        reset = true;
+        loop->OSXUseLowLevelWakeup(true);
+    }
+    
+    wxOSX_EventHandlerPtr superimpl = (wxOSX_EventHandlerPtr) [[slf superclass] instanceMethodForSelector:(SEL)_cmd];
+    superimpl(slf, (SEL)_cmd, event);
+ 
+    if ( reset )
+    {
+        loop->OSXUseLowLevelWakeup(false);
+    }
+}
+
 int wxNSComboBoxControl::GetSelectedItem() const
 {
     return [m_comboBox indexOfSelectedItem];
@@ -134,6 +196,7 @@ void wxNSComboBoxControl::Clear()
 {
     SendEvents(false);
     [m_comboBox removeAllItems];
+    [m_comboBox setStringValue:@""];
     SendEvents(true);
 }
 
@@ -154,10 +217,31 @@ int wxNSComboBoxControl::FindString(const wxString& text) const
     return result;
 }
 
+void wxNSComboBoxControl::Popup()
+{
+    id ax = NSAccessibilityUnignoredDescendant(m_comboBox);
+    [ax accessibilitySetValue: [NSNumber numberWithBool: YES] forAttribute: NSAccessibilityExpandedAttribute];
+}
+
+void wxNSComboBoxControl::Dismiss()
+{
+    id ax = NSAccessibilityUnignoredDescendant(m_comboBox);
+    [ax accessibilitySetValue: [NSNumber numberWithBool: NO] forAttribute: NSAccessibilityExpandedAttribute];
+}
+
+void wxNSComboBoxControl::SetEditable(bool editable)
+{
+    // TODO: unfortunately this does not work, setEditable just means the same as CB_READONLY
+    // I don't see a way to access the text field directly
+    
+    // Behavior NONE <- SELECTECTABLE
+    [m_comboBox setEditable:editable];
+}
+
 wxWidgetImplType* wxWidgetImpl::CreateComboBox( wxComboBox* wxpeer, 
                                     wxWindowMac* WXUNUSED(parent), 
                                     wxWindowID WXUNUSED(id), 
-                                    wxMenu* menu,
+                                    wxMenu* WXUNUSED(menu),
                                     const wxPoint& pos, 
                                     const wxSize& size,
                                     long style,