From 053f5a55dabce0e32adbeaf992d9eadc749b1396 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Wed, 12 Jun 2013 22:04:38 +0000 Subject: [PATCH] supporting max len event git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74191 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/osx/textentry.h | 2 ++ src/osx/cocoa/textctrl.mm | 9 ++++++++- src/osx/textentry_osx.cpp | 17 +++++++++++++++++ 3 files changed, 27 insertions(+), 1 deletion(-) diff --git a/include/wx/osx/textentry.h b/include/wx/osx/textentry.h index b51e97bbd5..16225e0e89 100644 --- a/include/wx/osx/textentry.h +++ b/include/wx/osx/textentry.h @@ -80,6 +80,8 @@ public: virtual void SetSelection(long from, long to); virtual void SetEditable(bool editable); + virtual bool SendMaxLenEvent(); + // Implementation // -------------- diff --git a/src/osx/cocoa/textctrl.mm b/src/osx/cocoa/textctrl.mm index 760257f4f4..14f3a176e1 100644 --- 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 @@ -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]; } diff --git a/src/osx/textentry_osx.cpp b/src/osx/textentry_osx.cpp index 8fe74193ea..c5f53512b2 100644 --- a/src/osx/textentry_osx.cpp +++ b/src/osx/textentry_osx.cpp @@ -224,6 +224,23 @@ bool wxTextEntry::IsEditable() const return m_editable ; } +bool wxTextEntry::SendMaxLenEvent() +{ + wxWindow *win = GetEditableWindow(); + wxCHECK_MSG( win, false, "can't send an event without a window" ); + + wxCommandEvent event(wxEVT_TEXT_MAXLEN, win->GetId()); + + // do not do this as it could be very inefficient if the text control + // contains a lot of text and we're not using ref-counted wxString + // implementation -- instead, event.GetString() will query the control for + // its current text if needed + //event.SetString(win->GetValue()); + + event.SetEventObject(win); + return win->HandleWindowEvent(event); +} + // ---------------------------------------------------------------------------- // Undo/redo // ---------------------------------------------------------------------------- -- 2.45.2