#include "wx/osx/private.h"
#include "wx/osx/cocoa/private/textimpl.h"
-@interface NSView(EditableView)
+@interface NSView(EditableView)
- (BOOL)isEditable;
- (void)setEditable:(BOOL)flag;
@end
public :
wxMacEditHelper( NSView* textView )
{
- m_textView = textView ;
+ m_textView = textView;
+ m_formerState = YES;
if ( textView )
{
m_formerState = [textView isEditable];
NSView* m_textView;
} ;
-@interface wxNSSecureTextField : NSSecureTextField
-{
-}
-@end
-
-@implementation wxNSSecureTextField
+@implementation wxNSSecureTextField
+ (void)initialize
{
static BOOL initialized = NO;
- if (!initialized)
+ if (!initialized)
{
initialized = YES;
wxOSXCocoaClassAddWXMethods( self );
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
}
@end
-@interface wxNSTextView : NSTextView
-{
- wxNSTextScrollView* scrollView;
-}
-
-- (void)setScrollView: (wxNSTextScrollView *) sv;
-- (wxNSTextScrollView*) scrollView;
-
-@end
-
@implementation wxNSTextScrollView
+ (void)initialize
{
static BOOL initialized = NO;
- if (!initialized)
- {
+ if (!initialized)
+ {
initialized = YES;
wxOSXCocoaClassAddWXMethods( self );
}
}
-- (void)textDidChange:(NSNotification *)aNotification
+@end
+
+@implementation wxNSTextFieldEditor
+
+- (void) keyDown:(NSEvent*) event
{
- 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 );
- }
- }
+ wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( (WXWidget) [self delegate] );
+ lastKeyDownEvent = event;
+ if ( impl == NULL || !impl->DoHandleKeyEvent(event) )
+ [super keyDown:event];
+ lastKeyDownEvent = nil;
}
-- (BOOL)textView:(NSTextView *)aTextView doCommandBySelector:(SEL)commandSelector
+- (void) keyUp:(NSEvent*) event
{
- wxUnusedVar(aTextView);
- wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
- if ( impl )
- {
- wxWindow* wxpeer = (wxWindow*) impl->GetWXPeer();
- if (commandSelector == @selector(insertNewline:))
- {
- if ( wxpeer && wxpeer->GetWindowStyle() & wxTE_PROCESS_ENTER )
- {
- wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, wxpeer->GetId());
- event.SetEventObject( wxpeer );
- event.SetString( static_cast<wxTextCtrl*>(wxpeer)->GetValue() );
- wxpeer->HandleWindowEvent( event );
- }
- }
- }
-
- return NO;
+ wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( (WXWidget) [self delegate] );
+ if ( impl == NULL || !impl->DoHandleKeyEvent(event) )
+ [super keyUp:event];
}
-- (void)textDidEndEditing:(NSNotification *)aNotification
+- (void) flagsChanged:(NSEvent*) event
{
- wxUnusedVar(aNotification);
- wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
- if ( impl )
+ wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( (WXWidget) [self delegate] );
+ if ( impl == NULL || !impl->DoHandleKeyEvent(event) )
+ [super flagsChanged:event];
+}
+
+- (BOOL) performKeyEquivalent:(NSEvent*) event
+{
+ BOOL retval = [super performKeyEquivalent:event];
+ return retval;
+}
+
+- (void) insertText:(id) str
+{
+ wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( (WXWidget) [self delegate] );
+ if ( impl == NULL || lastKeyDownEvent==nil || !impl->DoHandleCharEvent(lastKeyDownEvent, str) )
{
- impl->DoNotifyFocusEvent( false, NULL );
+ [super insertText:str];
}
}
+
@end
@implementation wxNSTextView
-- (BOOL) becomeFirstResponder
++ (void)initialize
{
- BOOL val = [super becomeFirstResponder];
-
- if ( val )
+ static BOOL initialized = NO;
+ if (!initialized)
{
- wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( scrollView );
- if (impl )
- impl->DoNotifyFocusEvent( true, NULL );
-
+ initialized = YES;
+ wxOSXCocoaClassAddWXMethods( self );
}
- return val;
}
-- (void)setScrollView: (wxNSTextScrollView *) sv
-{
- scrollView = sv;
-}
-
-- (wxNSTextScrollView*) scrollView
+- (void)textDidChange:(NSNotification *)aNotification
{
- return scrollView;
+ wxUnusedVar(aNotification);
+ wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
+ if ( impl )
+ impl->controlTextDidChange();
}
@end
+ (void)initialize
{
static BOOL initialized = NO;
- if (!initialized)
+ if (!initialized)
{
initialized = YES;
wxOSXCocoaClassAddWXMethods( self );
}
}
+- (id) initWithFrame:(NSRect) frame
+{
+ self = [super initWithFrame:frame];
+ fieldEditor = nil;
+ return self;
+}
+
+- (void) dealloc
+{
+ [fieldEditor release];
+ [super dealloc];
+}
+
+- (void) setFieldEditor:(wxNSTextFieldEditor*) editor
+{
+ fieldEditor = editor;
+}
+
+- (wxNSTextFieldEditor*) fieldEditor
+{
+ return fieldEditor;
+}
+
- (void) setEnabled:(BOOL) flag
{
[super setEnabled: flag];
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();
}
typedef BOOL (*wxOSX_insertNewlineHandlerPtr)(NSView* self, SEL _cmd, NSControl *control, NSTextView* textView, SEL commandSelector);
if ( impl )
{
wxWindow* wxpeer = (wxWindow*) impl->GetWXPeer();
- if ( wxpeer && wxpeer->GetWindowStyle() & wxTE_PROCESS_ENTER )
+ if ( wxpeer && wxpeer->GetWindowStyle() & wxTE_PROCESS_ENTER )
{
wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, wxpeer->GetId());
event.SetEventObject( wxpeer );
}
}
}
-
+
return NO;
}
{
wxNSTextScrollView* sv = (wxNSTextScrollView*) w;
m_scrollView = sv;
-
+
[m_scrollView setHasVerticalScroller:YES];
[m_scrollView setHasHorizontalScroller:NO];
[m_scrollView setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable];
NSSize contentSize = [m_scrollView contentSize];
-
+
wxNSTextView* tv = [[wxNSTextView alloc] initWithFrame: NSMakeRect(0, 0,
contentSize.width, contentSize.height)];
m_textView = tv;
[tv setVerticallyResizable:YES];
[tv setHorizontallyResizable:NO];
[tv setAutoresizingMask:NSViewWidthSizable];
-
+
[m_scrollView setDocumentView: tv];
- [tv setDelegate: w];
- [tv setScrollView:sv];
+ [tv setDelegate: tv];
+
+ InstallEventHandler(tv);
}
wxNSTextViewControl::~wxNSTextViewControl()
[m_textView setDelegate: nil];
}
-wxString wxNSTextViewControl::GetStringValue() const
+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)
+ if (m_textView)
{
- wxCFStringRef cf( (CFStringRef) [[m_textView string] retain] );
- wxString result = cf.AsString(m_wxPeer->GetFont().GetEncoding());
+ wxString result = wxCFStringRef::AsString([m_textView string], m_wxPeer->GetFont().GetEncoding());
wxMacConvertNewlines13To10( &result ) ;
return result;
}
return wxEmptyString;
}
-void wxNSTextViewControl::SetStringValue( const wxString &str)
+void wxNSTextViewControl::SetStringValue( const wxString &str)
{
wxString st = str;
wxMacConvertNewlines10To13( &st );
if (m_textView)
[m_textView setString: wxCFStringRef( st , m_wxPeer->GetFont().GetEncoding() ).AsNSString()];
}
-void wxNSTextViewControl::Copy()
+
+void wxNSTextViewControl::Copy()
{
if (m_textView)
[m_textView copy:nil];
}
-void wxNSTextViewControl::Cut()
+void wxNSTextViewControl::Cut()
{
if (m_textView)
[m_textView cut:nil];
}
-void wxNSTextViewControl::Paste()
+void wxNSTextViewControl::Paste()
{
if (m_textView)
[m_textView paste:nil];
}
-bool wxNSTextViewControl::CanPaste() const
-{
+bool wxNSTextViewControl::CanPaste() const
+{
return true;
}
-void wxNSTextViewControl::SetEditable(bool editable)
+void wxNSTextViewControl::SetEditable(bool editable)
{
if (m_textView)
[m_textView setEditable: editable];
}
-void wxNSTextViewControl::GetSelection( long* from, long* to) const
+void wxNSTextViewControl::GetSelection( long* from, long* to) const
{
if (m_textView)
{
[m_textView scrollRangeToVisible:selrange];
}
-void wxNSTextViewControl::WriteText(const wxString& str)
+void wxNSTextViewControl::WriteText(const wxString& str)
{
wxString st = str;
wxMacConvertNewlines10To13( &st );
wxMacEditHelper helper(m_textView);
-
+ NSEvent* formerEvent = m_lastKeyDownEvent;
+ m_lastKeyDownEvent = nil;
[m_textView insertText:wxCFStringRef( st , m_wxPeer->GetFont().GetEncoding() ).AsNSString()];
+ m_lastKeyDownEvent = formerEvent;
+}
+
+void wxNSTextViewControl::SetFont( const wxFont & font , const wxColour& WXUNUSED(foreground) , long WXUNUSED(windowStyle), bool WXUNUSED(ignoreBlack) )
+{
+ if ([m_textView respondsToSelector:@selector(setFont:)])
+ [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 < [[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) {
+ NSRange range = NSMakeRange(start, end-start);
+ if (start == -1 && end == -1)
+ range = [m_textView selectedRange];
+
+ NSTextStorage* storage = [m_textView textStorage];
+
+ wxFont font = style.GetFont();
+ if (style.HasFont() && font.IsOk())
+ [storage addAttribute:NSFontAttributeName value:font.OSXGetNSFont() range:range];
+
+ wxColour bgcolor = style.GetBackgroundColour();
+ if (style.HasBackgroundColour() && bgcolor.IsOk())
+ [storage addAttribute:NSBackgroundColorAttributeName value:bgcolor.OSXGetNSColor() range:range];
+
+ wxColour fgcolor = style.GetTextColour();
+ if (style.HasTextColour() && fgcolor.IsOk())
+ [storage addAttribute:NSForegroundColorAttributeName value:fgcolor.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]];
+ wxSize size = wxSize(rect.size.width, rect.size.height);
+ size.x += [m_textView textContainerInset].width;
+ size.y += [m_textView textContainerInset].height;
+ return size;
+ }
+ return wxSize(0,0);
}
// wxNSTextFieldControl
-wxNSTextFieldControl::wxNSTextFieldControl( wxTextCtrl *wxPeer, WXWidget w ) : wxWidgetCocoaImpl(wxPeer, w)
+wxNSTextFieldControl::wxNSTextFieldControl( wxWindow *wxPeer, WXWidget w ) : wxWidgetCocoaImpl(wxPeer, w)
{
- m_textField = (NSTextField*) w;
- [m_textField setDelegate: w];
+ NSTextField wxOSX_10_6_AND_LATER(<NSTextFieldDelegate>) *tf = (NSTextField*) w;
+ m_textField = tf;
+ [m_textField setDelegate: tf];
m_selStart = m_selEnd = 0;
+ m_hasEditor = [w isKindOfClass:[NSTextField class]];
}
wxNSTextFieldControl::~wxNSTextFieldControl()
[m_textField setDelegate: nil];
}
-wxString wxNSTextFieldControl::GetStringValue() const
+wxString wxNSTextFieldControl::GetStringValue() const
{
- wxCFStringRef cf( (CFStringRef) [[m_textField stringValue] retain] );
- return cf.AsString(m_wxPeer->GetFont().GetEncoding());
+ return wxCFStringRef::AsString([m_textField stringValue], m_wxPeer->GetFont().GetEncoding());
}
-void wxNSTextFieldControl::SetStringValue( const wxString &str)
+void wxNSTextFieldControl::SetStringValue( const wxString &str)
{
wxMacEditHelper helper(m_textField);
[m_textField setStringValue: wxCFStringRef( str , m_wxPeer->GetFont().GetEncoding() ).AsNSString()];
}
-void wxNSTextFieldControl::Copy()
+void wxNSTextFieldControl::Copy()
{
NSText* editor = [m_textField currentEditor];
if ( editor )
}
}
-void wxNSTextFieldControl::Cut()
+void wxNSTextFieldControl::Cut()
{
NSText* editor = [m_textField currentEditor];
if ( editor )
}
}
-void wxNSTextFieldControl::Paste()
+void wxNSTextFieldControl::Paste()
{
NSText* editor = [m_textField currentEditor];
if ( editor )
}
}
-bool wxNSTextFieldControl::CanPaste() const
-{
+bool wxNSTextFieldControl::CanPaste() const
+{
return true;
}
-void wxNSTextFieldControl::SetEditable(bool editable)
+void wxNSTextFieldControl::SetEditable(bool editable)
{
[m_textField setEditable:editable];
}
-void wxNSTextFieldControl::GetSelection( long* from, long* to) const
+void wxNSTextFieldControl::GetSelection( long* from, long* to) const
{
NSText* editor = [m_textField currentEditor];
if ( editor )
}
}
-void wxNSTextFieldControl::WriteText(const wxString& str)
+void wxNSTextFieldControl::WriteText(const wxString& str)
{
+ NSEvent* formerEvent = m_lastKeyDownEvent;
+ m_lastKeyDownEvent = nil;
NSText* editor = [m_textField currentEditor];
if ( editor )
{
SetStringValue( val ) ;
SetSelection( start + str.length() , start + str.length() ) ;
}
+ m_lastKeyDownEvent = formerEvent;
}
-void wxNSTextFieldControl::controlAction(WXWidget WXUNUSED(slf),
+void wxNSTextFieldControl::controlAction(WXWidget WXUNUSED(slf),
void* WXUNUSED(_cmd), void *WXUNUSED(sender))
{
wxWindow* wxpeer = (wxWindow*) GetWXPeer();
- if ( wxpeer && (wxpeer->GetWindowStyle() & wxTE_PROCESS_ENTER) )
+ if ( wxpeer && (wxpeer->GetWindowStyle() & wxTE_PROCESS_ENTER) )
{
wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, wxpeer->GetId());
event.SetEventObject( wxpeer );
//
//
-wxWidgetImplType* wxWidgetImpl::CreateTextControl( wxTextCtrl* wxpeer,
- wxWindowMac* WXUNUSED(parent),
- wxWindowID WXUNUSED(id),
- const wxString& str,
- const wxPoint& pos,
+wxWidgetImplType* wxWidgetImpl::CreateTextControl( wxTextCtrl* wxpeer,
+ wxWindowMac* WXUNUSED(parent),
+ wxWindowID WXUNUSED(id),
+ const wxString& WXUNUSED(str),
+ const wxPoint& pos,
const wxSize& size,
- long style,
+ long style,
long WXUNUSED(extraStyle))
{
NSRect r = wxOSXGetFrameForControl( wxpeer, pos , size ) ;
wxWidgetCocoaImpl* c = NULL;
-
+
if ( style & wxTE_MULTILINE || style & wxTE_RICH || style & wxTE_RICH2 )
{
wxNSTextScrollView* v = nil;
v = [[wxNSTextScrollView alloc] initWithFrame:r];
c = new wxNSTextViewControl( wxpeer, v );
- static_cast<wxNSTextViewControl*>(c)->SetStringValue(str);
}
- else
+ else
{
NSTextField* v = nil;
if ( style & wxTE_PASSWORD )
v = [[wxNSSecureTextField alloc] initWithFrame:r];
else
v = [[wxNSTextField alloc] initWithFrame:r];
-
+
if ( style & wxNO_BORDER )
{
// FIXME: How can we remove the native control's border?
// setBordered is separate from the text ctrl's border.
}
-
+
[v setBezeled:NO];
[v setBordered:NO];
-
+
c = new wxNSTextFieldControl( wxpeer, v );
- static_cast<wxNSTextFieldControl*>(c)->SetStringValue(str);
}
-
+
return c;
}
projects / wxWidgets.git / blobdiff