Override CanFocus because the wxWindow level test will check if the NSTextView's...

[wxWidgets.git] / src / osx / cocoa / textctrl.mm

diff --git a/src/osx/cocoa/textctrl.mm b/src/osx/cocoa/textctrl.mm
index 1f100891160bed4a3adf87a6f145c4332a4facf1..d5af7b488c0dfd65334efd4a90de3b5458cde664 100644 (file)
--- a/src/osx/cocoa/textctrl.mm
+++ b/src/osx/cocoa/textctrl.mm
@@ -229,7 +229,6 @@ protected :
     return fieldEditor;
 }
 
-
 - (void) setEnabled:(BOOL) flag
 {
     [super setEnabled: flag];
@@ -322,6 +321,15 @@ wxNSTextViewControl::~wxNSTextViewControl()
         [m_textView setDelegate: nil];
 }
 
+bool wxNSTextViewControl::CanFocus() const
+{
+    // we need to override so that we don't return the CanFocus value of
+    // the text view's overriding scroll view.
+    if (m_textView)
+        return [m_textView canBecomeKeyView];
+    return false;
+}
+
 wxString wxNSTextViewControl::GetStringValue() const
 {
     if (m_textView)