Don't assume that KeySym is always defined as long in wxGTK.

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

diff --git a/src/osx/cocoa/textctrl.mm b/src/osx/cocoa/textctrl.mm
index 4d4398e2d29d464cf10404307675223b51e9bef7..14f3a176e148796ef03b920d8f18cbe35c5c41e6 100644 (file)
--- a/src/osx/cocoa/textctrl.mm
+++ b/src/osx/cocoa/textctrl.mm
@@ -111,6 +111,7 @@ NSView* wxMacEditHelper::ms_viewCurrentlyEdited = nil;
 @interface wxMaximumLengthFormatter : NSFormatter
 {
     int maxLength;
+    wxTextEntry* field;
 }
 
 @end
@@ -148,12 +149,17 @@ NSView* wxMacEditHelper::ms_viewCurrentlyEdited = nil;
     int len = [*partialStringPtr length];
     if ( maxLength > 0 && len > maxLength )
     {
-        // TODO wxEVT_TEXT_MAXLEN
+        field->SendMaxLenEvent();
         return NO;
     }
     return YES;
 }
 
+- (void) setTextEntry:(wxTextEntry*) tf
+{
+    field = tf;
+}
+
 @end
 
 @implementation wxNSSecureTextField
@@ -183,9 +189,9 @@ NSView* wxMacEditHelper::ms_viewCurrentlyEdited = nil;
     if ( impl )
     {
         NSResponder * responder = wxNonOwnedWindowCocoaImpl::GetNextFirstResponder();
-        NSView* otherView = [responder isKindOfClass:[NSView class]] ? (NSView*)responder : nil;
+        NSView* otherView = wxOSXGetViewFromResponder(responder);
         
-        wxWidgetImpl* otherWindow = impl->FindFromWXWidget(otherView);
+        wxWidgetImpl* otherWindow = impl->FindBestFromWXWidget(otherView);
         impl->DoNotifyFocusEvent( false, otherWindow );
     }
 }
@@ -341,9 +347,9 @@ NSView* wxMacEditHelper::ms_viewCurrentlyEdited = nil;
     if ( impl )
     {
         NSResponder * responder = wxNonOwnedWindowCocoaImpl::GetNextFirstResponder();
-        NSView* otherView = [responder isKindOfClass:[NSView class]] ? (NSView*)responder : nil;
+        NSView* otherView = wxOSXGetViewFromResponder(responder);
         
-        wxWidgetImpl* otherWindow = impl->FindFromWXWidget(otherView);
+        wxWidgetImpl* otherWindow = impl->FindBestFromWXWidget(otherView);
         impl->DoNotifyFocusEvent( false, otherWindow );
     }
 }
@@ -515,9 +521,9 @@ NSView* wxMacEditHelper::ms_viewCurrentlyEdited = nil;
         }
 
         NSResponder * responder = wxNonOwnedWindowCocoaImpl::GetNextFirstResponder();
-        NSView* otherView = [responder isKindOfClass:[NSView class]] ? (NSView*)responder : nil;
+        NSView* otherView = wxOSXGetViewFromResponder(responder);
         
-        wxWidgetImpl* otherWindow = impl->FindFromWXWidget(otherView);
+        wxWidgetImpl* otherWindow = impl->FindBestFromWXWidget(otherView);
         impl->DoNotifyFocusEvent( false, otherWindow );
     }
 }
@@ -805,6 +811,7 @@ void wxNSTextFieldControl::SetMaxLength(unsigned long len)
 {
     wxMaximumLengthFormatter* formatter = [[[wxMaximumLengthFormatter alloc] init] autorelease];
     [formatter setMaxLength:len];
+    [formatter setTextEntry:GetTextEntry()];
     [m_textField setFormatter:formatter];
 }