From 6ade9e89179c48611a4ae4c11e3373ed02ba66bf Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Tue, 8 Feb 2011 14:11:56 +0000 Subject: [PATCH] forward enable functionality to inner view in scrollview (eg for multiline textviews) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66863 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/osx/cocoa/window.mm | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/osx/cocoa/window.mm b/src/osx/cocoa/window.mm index f19794f8fe..be8767bb72 100644 --- a/src/osx/cocoa/window.mm +++ b/src/osx/cocoa/window.mm @@ -1920,15 +1920,23 @@ void wxWidgetCocoaImpl::GetBestRect( wxRect *r ) const bool wxWidgetCocoaImpl::IsEnabled() const { - if ( [m_osxView respondsToSelector:@selector(isEnabled) ] ) - return [m_osxView isEnabled]; + NSView* targetView = m_osxView; + if ( [m_osxView isKindOfClass:[NSScrollView class] ] ) + targetView = [(NSScrollView*) m_osxView documentView]; + + if ( [targetView respondsToSelector:@selector(isEnabled) ] ) + return [targetView isEnabled]; return true; } void wxWidgetCocoaImpl::Enable( bool enable ) { - if ( [m_osxView respondsToSelector:@selector(setEnabled:) ] ) - [m_osxView setEnabled:enable]; + NSView* targetView = m_osxView; + if ( [m_osxView isKindOfClass:[NSScrollView class] ] ) + targetView = [(NSScrollView*) m_osxView documentView]; + + if ( [targetView respondsToSelector:@selector(setEnabled:) ] ) + [targetView setEnabled:enable]; } void wxWidgetCocoaImpl::PulseGauge() -- 2.45.2