// Author: Stefan Csomor
// Modified by: Ryan Norton (MLTE GetLineLength and GetLineText)
// Created: 1998-01-01
-// RCS-ID: $Id: textctrl.cpp 54820 2008-07-29 20:04:11Z SC $
// Copyright: (c) Stefan Csomor
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#include "wx/filefn.h"
#include "wx/sysopt.h"
#include "wx/thread.h"
+#include "wx/textcompleter.h"
#include "wx/osx/private.h"
#include "wx/osx/cocoa/private/textimpl.h"
@interface NSView(EditableView)
- (BOOL)isEditable;
- (void)setEditable:(BOOL)flag;
+- (BOOL)isSelectable;
+- (void)setSelectable:(BOOL)flag;
@end
+// An object of this class is created before the text is modified
+// programmatically and destroyed as soon as this is done. It does several
+// things, like ensuring that the control is editable to allow setting its text
+// at all and eating any unwanted focus loss events from textDidEndEditing:
+// which don't really correspond to focus change.
class wxMacEditHelper
{
public :
wxMacEditHelper( NSView* textView )
{
+ m_viewPreviouslyEdited = ms_viewCurrentlyEdited;
+ ms_viewCurrentlyEdited =
m_textView = textView;
- m_formerState = YES;
+ m_formerEditable = YES;
if ( textView )
{
- m_formerState = [textView isEditable];
+ m_formerEditable = [textView isEditable];
+ m_formerSelectable = [textView isSelectable];
[textView setEditable:YES];
}
}
~wxMacEditHelper()
{
if ( m_textView )
- [m_textView setEditable:m_formerState];
+ {
+ [m_textView setEditable:m_formerEditable];
+ [m_textView setSelectable:m_formerSelectable];
+ }
+
+ ms_viewCurrentlyEdited = m_viewPreviouslyEdited;
}
+ // Returns the last view we were instantiated for or NULL.
+ static NSView *GetCurrentlyEditedView() { return ms_viewCurrentlyEdited; }
+
protected :
- BOOL m_formerState ;
+ BOOL m_formerEditable ;
+ BOOL m_formerSelectable;
NSView* m_textView;
+
+ // The original value of ms_viewCurrentlyEdited when this object was
+ // created.
+ NSView* m_viewPreviouslyEdited;
+
+ static NSView* ms_viewCurrentlyEdited;
} ;
+NSView* wxMacEditHelper::ms_viewCurrentlyEdited = nil;
+
+// a minimal NSFormatter that just avoids getting too long entries
+@interface wxMaximumLengthFormatter : NSFormatter
+{
+ int maxLength;
+ wxTextEntry* field;
+}
+
+@end
+
+@implementation wxMaximumLengthFormatter
+
+- (id)init
+{
+ self = [super init];
+ maxLength = 0;
+ return self;
+}
+
+- (void) setMaxLength:(int) maxlen
+{
+ maxLength = maxlen;
+}
+
+- (NSString *)stringForObjectValue:(id)anObject
+{
+ if(![anObject isKindOfClass:[NSString class]])
+ return nil;
+ return [NSString stringWithString:anObject];
+}
+
+- (BOOL)getObjectValue:(id *)obj forString:(NSString *)string errorDescription:(NSString **)error
+{
+ *obj = [NSString stringWithString:string];
+ return YES;
+}
+
+- (BOOL)isPartialStringValid:(NSString **)partialStringPtr proposedSelectedRange:(NSRangePointer)proposedSelRangePtr
+ originalString:(NSString *)origString originalSelectedRange:(NSRange)origSelRange errorDescription:(NSString **)error
+{
+ int len = [*partialStringPtr length];
+ if ( maxLength > 0 && len > maxLength )
+ {
+ field->SendMaxLenEvent();
+ return NO;
+ }
+ return YES;
+}
+
+- (void) setTextEntry:(wxTextEntry*) tf
+{
+ field = tf;
+}
+
+@end
+
@implementation wxNSSecureTextField
+ (void)initialize
wxUnusedVar(aNotification);
wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
if ( impl )
- {
- wxWindow* wxpeer = (wxWindow*) impl->GetWXPeer();
- if ( wxpeer ) {
- wxCommandEvent event(wxEVT_COMMAND_TEXT_UPDATED, wxpeer->GetId());
- event.SetEventObject( wxpeer );
- event.SetString( static_cast<wxTextCtrl*>(wxpeer)->GetValue() );
- wxpeer->HandleWindowEvent( event );
- }
- }
+ impl->controlTextDidChange();
}
- (void)controlTextDidEndEditing:(NSNotification *)aNotification
wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
if ( impl )
{
- impl->DoNotifyFocusEvent( false, NULL );
+ NSResponder * responder = wxNonOwnedWindowCocoaImpl::GetNextFirstResponder();
+ NSView* otherView = wxOSXGetViewFromResponder(responder);
+
+ wxWidgetImpl* otherWindow = impl->FindBestFromWXWidget(otherView);
+ impl->DoNotifyFocusEvent( false, otherWindow );
+ }
+}
+
+- (BOOL)control:(NSControl*)control textView:(NSTextView*)textView doCommandBySelector:(SEL)commandSelector
+{
+ wxUnusedVar(textView);
+
+ BOOL handled = NO;
+
+ wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( control );
+ if ( impl )
+ {
+ wxWindow* wxpeer = (wxWindow*) impl->GetWXPeer();
+ if ( wxpeer )
+ {
+ if (commandSelector == @selector(insertNewline:))
+ {
+ wxTopLevelWindow *tlw = wxDynamicCast(wxGetTopLevelParent(wxpeer), wxTopLevelWindow);
+ if ( tlw && tlw->GetDefaultItem() )
+ {
+ wxButton *def = wxDynamicCast(tlw->GetDefaultItem(), wxButton);
+ if ( def && def->IsEnabled() )
+ {
+ wxCommandEvent event(wxEVT_BUTTON, def->GetId() );
+ event.SetEventObject(def);
+ def->Command(event);
+ handled = YES;
+ }
+ }
+ }
+ }
}
+
+ return handled;
}
@end
}
}
+- (void)textDidChange:(NSNotification *)aNotification
+{
+ wxUnusedVar(aNotification);
+ wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
+ if ( impl )
+ impl->controlTextDidChange();
+}
+
+- (void) setEnabled:(BOOL) flag
+{
+ // from Technical Q&A QA1461
+ if (flag) {
+ [self setTextColor: [NSColor controlTextColor]];
+
+ } else {
+ [self setTextColor: [NSColor disabledControlTextColor]];
+ }
+
+ [self setSelectable: flag];
+ [self setEditable: flag];
+}
+
+- (BOOL) isEnabled
+{
+ return [self isEditable];
+}
+
+- (void)textDidEndEditing:(NSNotification *)aNotification
+{
+ wxUnusedVar(aNotification);
+
+ if ( self == wxMacEditHelper::GetCurrentlyEditedView() )
+ {
+ // This notification is generated as the result of calling our own
+ // wxTextCtrl method (e.g. WriteText()) and doesn't correspond to any
+ // real focus loss event so skip generating it.
+ return;
+ }
+
+ wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
+ if ( impl )
+ {
+ NSResponder * responder = wxNonOwnedWindowCocoaImpl::GetNextFirstResponder();
+ NSView* otherView = wxOSXGetViewFromResponder(responder);
+
+ wxWidgetImpl* otherWindow = impl->FindBestFromWXWidget(otherView);
+ impl->DoNotifyFocusEvent( false, otherWindow );
+ }
+}
+
@end
@implementation wxNSTextField
- (void) setFieldEditor:(wxNSTextFieldEditor*) editor
{
- fieldEditor = editor;
+ if ( editor != fieldEditor )
+ {
+ [editor retain];
+ [fieldEditor release];
+ fieldEditor = editor;
+ }
}
- (wxNSTextFieldEditor*) fieldEditor
return fieldEditor;
}
-
- (void) setEnabled:(BOOL) flag
{
[super setEnabled: flag];
wxUnusedVar(aNotification);
wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
if ( impl )
+ impl->controlTextDidChange();
+}
+
+- (NSArray *)control:(NSControl *)control textView:(NSTextView *)textView completions:(NSArray *)words
+ forPartialWordRange:(NSRange)charRange indexOfSelectedItem:(NSInteger*)index
+{
+ NSMutableArray* matches = NULL;
+
+ wxTextWidgetImpl* impl = (wxNSTextFieldControl * ) wxWidgetImpl::FindFromWXWidget( self );
+ wxTextEntry * const entry = impl->GetTextEntry();
+ wxTextCompleter * const completer = entry->OSXGetCompleter();
+ if ( completer )
{
- wxWindow* wxpeer = (wxWindow*) impl->GetWXPeer();
- if ( wxpeer ) {
- wxCommandEvent event(wxEVT_COMMAND_TEXT_UPDATED, wxpeer->GetId());
- event.SetEventObject( wxpeer );
- event.SetString( static_cast<wxTextCtrl*>(wxpeer)->GetValue() );
- wxpeer->HandleWindowEvent( event );
+ const wxString prefix = entry->GetValue();
+ if ( completer->Start(prefix) )
+ {
+ const wxString
+ wordStart = wxCFStringRef::AsString(
+ [[textView string] substringWithRange:charRange]
+ );
+
+ matches = [NSMutableArray array];
+ for ( ;; )
+ {
+ const wxString s = completer->GetNext();
+ if ( s.empty() )
+ break;
+
+ // Normally the completer should return only the strings
+ // starting with the prefix, but there could be exceptions
+ // and, for compatibility with MSW which simply ignores all
+ // entries that don't match the current text control contents,
+ // we ignore them as well. Besides, our own wxTextCompleterFixed
+ // doesn't respect this rule and, moreover, we need to extract
+ // just the rest of the string anyhow.
+ wxString completion;
+ if ( s.StartsWith(prefix, &completion) )
+ {
+ // We discarded the entire prefix above but actually we
+ // should include the part of it that consists of the
+ // beginning of the current word, otherwise it would be
+ // lost when completion is accepted as OS X supposes that
+ // our matches do start with the "partial word range"
+ // passed to us.
+ const wxCFStringRef fullWord(wordStart + completion);
+ [matches addObject: fullWord.AsNSString()];
+ }
+ }
}
}
-}
-typedef BOOL (*wxOSX_insertNewlineHandlerPtr)(NSView* self, SEL _cmd, NSControl *control, NSTextView* textView, SEL commandSelector);
+ return matches;
+}
- (BOOL)control:(NSControl*)control textView:(NSTextView*)textView doCommandBySelector:(SEL)commandSelector
{
wxUnusedVar(textView);
wxUnusedVar(control);
- if (commandSelector == @selector(insertNewline:))
+
+ BOOL handled = NO;
+
+ // send back key events wx' common code knows how to handle
+
+ wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
+ if ( impl )
{
- wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
- if ( impl )
+ wxWindow* wxpeer = (wxWindow*) impl->GetWXPeer();
+ if ( wxpeer )
{
- wxWindow* wxpeer = (wxWindow*) impl->GetWXPeer();
- if ( wxpeer && wxpeer->GetWindowStyle() & wxTE_PROCESS_ENTER )
+ if (commandSelector == @selector(insertNewline:))
+ {
+ [textView insertNewlineIgnoringFieldEditor:self];
+ handled = YES;
+ }
+ else if ( commandSelector == @selector(insertTab:))
+ {
+ [textView insertTabIgnoringFieldEditor:self];
+ handled = YES;
+ }
+ else if ( commandSelector == @selector(insertBacktab:))
{
- wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, wxpeer->GetId());
- event.SetEventObject( wxpeer );
- event.SetString( static_cast<wxTextCtrl*>(wxpeer)->GetValue() );
- wxpeer->HandleWindowEvent( event );
+ [textView insertTabIgnoringFieldEditor:self];
+ handled = YES;
}
}
}
-
- return NO;
+
+ return handled;
}
- (void)controlTextDidEndEditing:(NSNotification *)aNotification
wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
if ( impl )
{
- impl->DoNotifyFocusEvent( false, NULL );
+ wxNSTextFieldControl* timpl = dynamic_cast<wxNSTextFieldControl*>(impl);
+ if ( fieldEditor )
+ {
+ NSRange range = [fieldEditor selectedRange];
+ timpl->SetInternalSelection(range.location, range.location + range.length);
+ }
+
+ NSResponder * responder = wxNonOwnedWindowCocoaImpl::GetNextFirstResponder();
+ NSView* otherView = wxOSXGetViewFromResponder(responder);
+
+ wxWidgetImpl* otherWindow = impl->FindBestFromWXWidget(otherView);
+ impl->DoNotifyFocusEvent( false, otherWindow );
}
}
@end
// wxNSTextViewControl
-wxNSTextViewControl::wxNSTextViewControl( wxTextCtrl *wxPeer, WXWidget w ) : wxWidgetCocoaImpl(wxPeer, w)
+wxNSTextViewControl::wxNSTextViewControl( wxTextCtrl *wxPeer, WXWidget w )
+ : wxWidgetCocoaImpl(wxPeer, w),
+ wxTextWidgetImpl(wxPeer)
{
wxNSTextScrollView* sv = (wxNSTextScrollView*) w;
m_scrollView = sv;
[m_scrollView setHasVerticalScroller:YES];
[m_scrollView setHasHorizontalScroller:NO];
- [m_scrollView setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable];
+ // TODO Remove if no regression, this was causing automatic resizes of multi-line textfields when the tlw changed
+ // [m_scrollView setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable];
NSSize contentSize = [m_scrollView contentSize];
wxNSTextView* tv = [[wxNSTextView alloc] initWithFrame: NSMakeRect(0, 0,
[m_scrollView setDocumentView: tv];
- [tv setDelegate: w];
+ [tv setDelegate: tv];
InstallEventHandler(tv);
}
[m_textView setDelegate: nil];
}
+bool wxNSTextViewControl::CanFocus() const
+{
+ // since this doesn't work (return false), we hardcode
+ // if (m_textView)
+ // return [m_textView canBecomeKeyView];
+ return true;
+}
+
wxString wxNSTextViewControl::GetStringValue() const
{
if (m_textView)
[m_textView setFont: font.OSXGetNSFont()];
}
+bool wxNSTextViewControl::GetStyle(long position, wxTextAttr& style)
+{
+ if (m_textView && position >=0)
+ {
+ NSFont* font = NULL;
+ NSColor* bgcolor = NULL;
+ NSColor* fgcolor = NULL;
+ // NOTE: It appears that other platforms accept GetStyle with the position == length
+ // but that NSTextStorage does not accept length as a valid position.
+ // Therefore we return the default control style in that case.
+ if (position < (long) [[m_textView string] length])
+ {
+ NSTextStorage* storage = [m_textView textStorage];
+ font = [[storage attribute:NSFontAttributeName atIndex:position effectiveRange:NULL] autorelease];
+ bgcolor = [[storage attribute:NSBackgroundColorAttributeName atIndex:position effectiveRange:NULL] autorelease];
+ fgcolor = [[storage attribute:NSForegroundColorAttributeName atIndex:position effectiveRange:NULL] autorelease];
+ }
+ else
+ {
+ NSDictionary* attrs = [m_textView typingAttributes];
+ font = [[attrs objectForKey:NSFontAttributeName] autorelease];
+ bgcolor = [[attrs objectForKey:NSBackgroundColorAttributeName] autorelease];
+ fgcolor = [[attrs objectForKey:NSForegroundColorAttributeName] autorelease];
+ }
+
+ if (font)
+ style.SetFont(wxFont(font));
+
+ if (bgcolor)
+ style.SetBackgroundColour(wxColour(bgcolor));
+
+ if (fgcolor)
+ style.SetTextColour(wxColour(fgcolor));
+ return true;
+ }
+
+ return false;
+}
+
+void wxNSTextViewControl::SetStyle(long start,
+ long end,
+ const wxTextAttr& style)
+{
+ if ( !m_textView )
+ return;
+
+ if ( start == -1 && end == -1 )
+ {
+ NSMutableDictionary* const
+ attrs = [NSMutableDictionary dictionaryWithCapacity:3];
+ if ( style.HasFont() )
+ [attrs setValue:style.GetFont().OSXGetNSFont() forKey:NSFontAttributeName];
+ if ( style.HasBackgroundColour() )
+ [attrs setValue:style.GetBackgroundColour().OSXGetNSColor() forKey:NSBackgroundColorAttributeName];
+ if ( style.HasTextColour() )
+ [attrs setValue:style.GetTextColour().OSXGetNSColor() forKey:NSForegroundColorAttributeName];
+
+ [m_textView setTypingAttributes:attrs];
+ }
+ else // Set the attributes just for this range.
+ {
+ NSRange range = NSMakeRange(start, end-start);
+
+ NSTextStorage* storage = [m_textView textStorage];
+ if ( style.HasFont() )
+ [storage addAttribute:NSFontAttributeName value:style.GetFont().OSXGetNSFont() range:range];
+
+ if ( style.HasBackgroundColour() )
+ [storage addAttribute:NSBackgroundColorAttributeName value:style.GetBackgroundColour().OSXGetNSColor() range:range];
+
+ if ( style.HasTextColour() )
+ [storage addAttribute:NSForegroundColorAttributeName value:style.GetTextColour().OSXGetNSColor() range:range];
+ }
+}
+
+void wxNSTextViewControl::CheckSpelling(bool check)
+{
+ if (m_textView)
+ [m_textView setContinuousSpellCheckingEnabled: check];
+}
+
+wxSize wxNSTextViewControl::GetBestSize() const
+{
+ if (m_textView && [m_textView layoutManager])
+ {
+ NSRect rect = [[m_textView layoutManager] usedRectForTextContainer: [m_textView textContainer]];
+ return wxSize((int)(rect.size.width + [m_textView textContainerInset].width),
+ (int)(rect.size.height + [m_textView textContainerInset].height));
+ }
+ return wxSize(0,0);
+}
// wxNSTextFieldControl
-wxNSTextFieldControl::wxNSTextFieldControl( wxTextCtrl *wxPeer, WXWidget w ) : wxWidgetCocoaImpl(wxPeer, w)
+wxNSTextFieldControl::wxNSTextFieldControl( wxTextCtrl *text, WXWidget w )
+ : wxWidgetCocoaImpl(text, w),
+ wxTextWidgetImpl(text)
{
- m_textField = (NSTextField*) w;
- [m_textField setDelegate: w];
+ Init(w);
+}
+
+wxNSTextFieldControl::wxNSTextFieldControl(wxWindow *wxPeer,
+ wxTextEntry *entry,
+ WXWidget w)
+ : wxWidgetCocoaImpl(wxPeer, w),
+ wxTextWidgetImpl(entry)
+{
+ Init(w);
+}
+
+void wxNSTextFieldControl::Init(WXWidget w)
+{
+ NSTextField wxOSX_10_6_AND_LATER(<NSTextFieldDelegate>) *tf = (NSTextField wxOSX_10_6_AND_LATER(<NSTextFieldDelegate>)*) w;
+ m_textField = tf;
+ [m_textField setDelegate: tf];
m_selStart = m_selEnd = 0;
m_hasEditor = [w isKindOfClass:[NSTextField class]];
}
[m_textField setStringValue: wxCFStringRef( str , m_wxPeer->GetFont().GetEncoding() ).AsNSString()];
}
+void wxNSTextFieldControl::SetMaxLength(unsigned long len)
+{
+ wxMaximumLengthFormatter* formatter = [[[wxMaximumLengthFormatter alloc] init] autorelease];
+ [formatter setMaxLength:len];
+ [formatter setTextEntry:GetTextEntry()];
+ [m_textField setFormatter:formatter];
+}
+
void wxNSTextFieldControl::Copy()
{
NSText* editor = [m_textField currentEditor];
{
[editor setSelectedRange:NSMakeRange(from, to-from)];
}
- else
- {
- m_selStart = from;
- m_selEnd = to;
- }
+
+ // the editor might still be in existence, but we might be already passed our 'focus lost' storage
+ // of the selection, so make sure we copy this
+ m_selStart = from;
+ m_selEnd = to;
}
void wxNSTextFieldControl::WriteText(const wxString& str)
if ( editor )
{
wxMacEditHelper helper(m_textField);
+ BOOL hasUndo = [editor respondsToSelector:@selector(setAllowsUndo:)];
+ if ( hasUndo )
+ [(NSTextView*)editor setAllowsUndo:NO];
[editor insertText:wxCFStringRef( str , m_wxPeer->GetFont().GetEncoding() ).AsNSString()];
+ if ( hasUndo )
+ [(NSTextView*)editor setAllowsUndo:YES];
}
else
{
wxWindow* wxpeer = (wxWindow*) GetWXPeer();
if ( wxpeer && (wxpeer->GetWindowStyle() & wxTE_PROCESS_ENTER) )
{
- wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, wxpeer->GetId());
+ wxCommandEvent event(wxEVT_TEXT_ENTER, wxpeer->GetId());
event.SetEventObject( wxpeer );
- event.SetString( static_cast<wxTextCtrl*>(wxpeer)->GetValue() );
+ event.SetString( GetTextEntry()->GetValue() );
wxpeer->HandleWindowEvent( event );
}
}
+void wxNSTextFieldControl::SetInternalSelection( long from , long to )
+{
+ m_selStart = from;
+ m_selEnd = to;
+}
+
+// as becoming first responder on a window - triggers a resign on the same control, we have to avoid
+// the resign notification writing back native selection values before we can set our own
+
+static WXWidget s_widgetBecomingFirstResponder = nil;
+
+bool wxNSTextFieldControl::becomeFirstResponder(WXWidget slf, void *_cmd)
+{
+ s_widgetBecomingFirstResponder = slf;
+ bool retval = wxWidgetCocoaImpl::becomeFirstResponder(slf, _cmd);
+ s_widgetBecomingFirstResponder = nil;
+ if ( retval )
+ {
+ NSText* editor = [m_textField currentEditor];
+ if ( editor )
+ {
+ long textLength = [[m_textField stringValue] length];
+ m_selStart = wxMin(textLength,wxMax(m_selStart,0)) ;
+ m_selEnd = wxMax(0,wxMin(textLength,m_selEnd)) ;
+
+ [editor setSelectedRange:NSMakeRange(m_selStart, m_selEnd-m_selStart)];
+ }
+ }
+ return retval;
+}
+
+bool wxNSTextFieldControl::resignFirstResponder(WXWidget slf, void *_cmd)
+{
+ if ( slf != s_widgetBecomingFirstResponder )
+ {
+ NSText* editor = [m_textField currentEditor];
+ if ( editor )
+ {
+ NSRange range = [editor selectedRange];
+ m_selStart = range.location;
+ m_selEnd = range.location + range.length;
+ }
+ }
+ return wxWidgetCocoaImpl::resignFirstResponder(slf, _cmd);
+}
+
+bool wxNSTextFieldControl::SetHint(const wxString& hint)
+{
+ wxCFStringRef hintstring(hint);
+ [[m_textField cell] setPlaceholderString:hintstring.AsNSString()];
+ return true;
+}
+
//
//
//
NSRect r = wxOSXGetFrameForControl( wxpeer, pos , size ) ;
wxWidgetCocoaImpl* c = NULL;
- if ( style & wxTE_MULTILINE || style & wxTE_RICH || style & wxTE_RICH2 )
+ if ( style & wxTE_MULTILINE )
{
wxNSTextScrollView* v = nil;
v = [[wxNSTextScrollView alloc] initWithFrame:r];
c = new wxNSTextViewControl( wxpeer, v );
+ c->SetNeedsFocusRect( true );
}
else
{
else
v = [[wxNSTextField alloc] initWithFrame:r];
- if ( style & wxNO_BORDER )
+ if ( style & wxTE_RIGHT)
{
- // FIXME: How can we remove the native control's border?
- // setBordered is separate from the text ctrl's border.
+ [v setAlignment:NSRightTextAlignment];
+ }
+ else if ( style & wxTE_CENTRE)
+ {
+ [v setAlignment:NSCenterTextAlignment];
+ }
+
+ NSTextFieldCell* cell = [v cell];
+ [cell setScrollable:YES];
+ // TODO: Remove if we definitely are sure, it's not needed
+ // as setting scrolling to yes, should turn off any wrapping
+ // [cell setLineBreakMode:NSLineBreakByClipping];
+
+ c = new wxNSTextFieldControl( wxpeer, wxpeer, v );
+
+ if ( (style & wxNO_BORDER) || (style & wxSIMPLE_BORDER) )
+ {
+ // under 10.7 the textcontrol can draw its own focus
+ // even if no border is shown, on previous systems
+ // we have to emulate this
+ [v setBezeled:NO];
+ [v setBordered:NO];
+ if ( UMAGetSystemVersion() < 0x1070 )
+ c->SetNeedsFocusRect( true );
+ }
+ else
+ {
+ // use native border
+ c->SetNeedsFrame(false);
}
-
- [v setBezeled:NO];
- [v setBordered:NO];
-
- c = new wxNSTextFieldControl( wxpeer, v );
}
return c;
projects / wxWidgets.git / blobdiff