// 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
/////////////////////////////////////////////////////////////////////////////
#if wxUSE_COMBOBOX
#include "wx/combobox.h"
+#include "wx/evtloop.h"
#ifndef WX_PRECOMP
#include "wx/menu.h"
// 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
}
}
+- (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);
wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
- if ( impl )
+ if ( impl && impl->ShouldSendEvents() )
{
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 );
{
wxUnusedVar(notification);
wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
- if ( impl )
+ 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.
+ wxEventLoop* const loop = (wxEventLoop*) wxEventLoopBase::GetActive();
+ if ( loop )
+ loop->OSXUseLowLevelWakeup(true);
+
wxpeer->GetEventHandler()->AddPendingEvent( event );
+
+ if ( loop )
+ loop->OSXUseLowLevelWakeup(false);
}
}
}
@end
-wxNSComboBoxControl::wxNSComboBoxControl( wxWindow *wxPeer, WXWidget w ) : wxNSTextFieldControl(wxPeer, w)
+wxNSComboBoxControl::wxNSComboBoxControl( wxComboBox *wxPeer, WXWidget w )
+ : wxNSTextFieldControl(wxPeer, wxPeer, w)
{
m_comboBox = (NSComboBox*)w;
}
void wxNSComboBoxControl::SetSelectedItem(int item)
{
- [m_comboBox selectItemAtIndex: item];
+ SendEvents(false);
+
+ if ( item != wxNOT_FOUND )
+ {
+ wxASSERT_MSG( item >= 0 && item < [m_comboBox numberOfItems],
+ "Inavlid item index." );
+ [m_comboBox selectItemAtIndex: item];
+ }
+ else // remove current selection (if we have any)
+ {
+ const int sel = GetSelectedItem();
+ if ( sel != wxNOT_FOUND )
+ [m_comboBox deselectItemAtIndex:sel];
+ }
+
+ SendEvents(true);
}
int wxNSComboBoxControl::GetNumberOfItems() const
void wxNSComboBoxControl::RemoveItem(int pos)
{
+ SendEvents(false);
[m_comboBox removeItemAtIndex:pos];
+ SendEvents(true);
}
void wxNSComboBoxControl::Clear()
{
+ SendEvents(false);
[m_comboBox removeAllItems];
+ SendEvents(true);
}
wxString wxNSComboBoxControl::GetStringAtIndex(int pos) const
int wxNSComboBoxControl::FindString(const wxString& text) const
{
- return [m_comboBox indexOfItemWithObjectValue:wxCFStringRef( text , m_wxPeer->GetFont().GetEncoding() ).AsNSString()];
+ NSInteger nsresult = [m_comboBox indexOfItemWithObjectValue:wxCFStringRef( text , m_wxPeer->GetFont().GetEncoding() ).AsNSString()];
+
+ int result;
+ if (nsresult == NSNotFound)
+ result = wxNOT_FOUND;
+ else
+ result = (int) nsresult;
+ return result;
+}
+
+void wxNSComboBoxControl::Popup()
+{
+ id ax = NSAccessibilityUnignoredDescendant(m_comboBox);
+ [ax accessibilitySetValue: [NSNumber numberWithBool: YES] forAttribute: NSAccessibilityExpandedAttribute];
}
-wxWidgetImplType* wxWidgetImpl::CreateComboBox( wxWindowMac* wxpeer,
+void wxNSComboBoxControl::Dismiss()
+{
+ id ax = NSAccessibilityUnignoredDescendant(m_comboBox);
+ [ax accessibilitySetValue: [NSNumber numberWithBool: NO] forAttribute: NSAccessibilityExpandedAttribute];
+}
+
+wxWidgetImplType* wxWidgetImpl::CreateComboBox( wxComboBox* wxpeer,
wxWindowMac* WXUNUSED(parent),
wxWindowID WXUNUSED(id),
- wxMenu* menu,
+ wxMenu* WXUNUSED(menu),
const wxPoint& pos,
const wxSize& size,
- long WXUNUSED(style),
+ long style,
long WXUNUSED(extraStyle))
{
NSRect r = wxOSXGetFrameForControl( wxpeer, pos , size ) ;
wxNSComboBox* v = [[wxNSComboBox alloc] initWithFrame:r];
+ if (style & wxCB_READONLY)
+ [v setEditable:NO];
wxNSComboBoxControl* c = new wxNSComboBoxControl( wxpeer, v );
return c;
}
-#endif // wxUSE_COMBOBOX
\ No newline at end of file
+wxSize wxComboBox::DoGetBestSize() const
+{
+ int lbWidth = GetCount() > 0 ? 20 : 100; // some defaults
+ wxSize baseSize = wxWindow::DoGetBestSize();
+ int lbHeight = baseSize.y;
+ int wLine;
+
+ {
+ wxClientDC dc(const_cast<wxComboBox*>(this));
+
+ // Find the widest line
+ for(unsigned int i = 0; i < GetCount(); i++)
+ {
+ wxString str(GetString(i));
+
+ wxCoord width, height ;
+ dc.GetTextExtent( str , &width, &height);
+ wLine = width ;
+
+ lbWidth = wxMax( lbWidth, wLine ) ;
+ }
+
+ // Add room for the popup arrow
+ lbWidth += 2 * lbHeight ;
+ }
+
+ return wxSize( lbWidth, lbHeight );
+}
+
+#endif // wxUSE_COMBOBOX
projects / wxWidgets.git / blobdiff