]> git.saurik.com Git - wxWidgets.git/commitdiff
forward enable functionality to inner view in scrollview (eg for multiline textviews)
authorStefan Csomor <csomor@advancedconcepts.ch>
Tue, 8 Feb 2011 14:11:56 +0000 (14:11 +0000)
committerStefan Csomor <csomor@advancedconcepts.ch>
Tue, 8 Feb 2011 14:11:56 +0000 (14:11 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66863 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/osx/cocoa/window.mm

index f19794f8fef310da7ba60963a86f071c8b8bffb4..be8767bb72638a752ba876d18f8e41677d40c49e 100644 (file)
@@ -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()