Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

guarding open combo box against AppDefined NSEvents issued by wxEventLoop::WakeUp, fixes #15115

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74186 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2013-06-12 20:44:40 +00:00
parent 13167e72d6
commit 06e56e62b9
1 changed files with 27 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/osx/cocoa/combobox.mm
View File

@@ -108,14 +108,9 @@
// For some reason, wxComboBox::GetValue will not return the newly selected item // For some reason, wxComboBox::GetValue will not return the newly selected item
// while we're inside this callback, so use AddPendingEvent to make sure // while we're inside this callback, so use AddPendingEvent to make sure
// GetValue() returns the right value. // GetValue() returns the right value.
wxEventLoop* const loop = (wxEventLoop*) wxEventLoopBase::GetActive();
if ( loop )
loop->OSXUseLowLevelWakeup(true);
wxpeer->GetEventHandler()->AddPendingEvent( event ); wxpeer->GetEventHandler()->AddPendingEvent( event );
if ( loop )
loop->OSXUseLowLevelWakeup(false);
} }
} }
} }
@@ -131,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(true);
}
}
int wxNSComboBoxControl::GetSelectedItem() const int wxNSComboBoxControl::GetSelectedItem() const
{ {
return [m_comboBox indexOfSelectedItem]; return [m_comboBox indexOfSelectedItem];
@@ -214,8 +233,9 @@ void wxNSComboBoxControl::SetEditable(bool editable)
{ {
// TODO: unfortunately this does not work, setEditable just means the same as CB_READONLY // 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 // I don't see a way to access the text field directly
NSComboBoxCell* c = [m_comboBox cell];
[c setEditable:editable]; // Behavior NONE <- SELECTECTABLE
[m_comboBox setEditable:editable];
} }
wxWidgetImplType* wxWidgetImpl::CreateComboBox( wxComboBox* wxpeer, wxWidgetImplType* wxWidgetImpl::CreateComboBox( wxComboBox* wxpeer,