diff --git a/docs/changes.txt b/docs/changes.txt index 0b2a1f79e9..615f1927d4 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -165,6 +165,7 @@ wxOSX: - Implement wxDataViewCtrl::SetRowHeight(). - Add OSXEnableAutomaticQuoteSubstitution(), OSXEnableAutomaticDashSubstitution() and OSXDisableAllSmartSubstitutions() to control wxTextCtrl smart behavior. +- Don't allow interacting with disabled wxSlider (Andreas Falkenhahn). Unix: diff --git a/src/osx/cocoa/window.mm b/src/osx/cocoa/window.mm index 87429a2d14..267f3942bd 100644 --- a/src/osx/cocoa/window.mm +++ b/src/osx/cocoa/window.mm @@ -985,7 +985,9 @@ void wxOSX_mouseEvent(NSView* self, SEL _cmd, NSEvent *event) if (impl == NULL) return; - impl->mouseEvent(event, self, _cmd); + // We shouldn't let disabled windows get mouse events. + if (impl->GetWXPeer()->IsEnabled()) + impl->mouseEvent(event, self, _cmd); } void wxOSX_cursorUpdate(NSView* self, SEL _cmd, NSEvent *event)