fixing native font info support bugs

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

diff --git a/src/osx/cocoa/textctrl.mm b/src/osx/cocoa/textctrl.mm
index a9898bf349644d93fa78c0873b17fdd2607d49fd..ca728cf9db4df97fcd8b3a84ae21b579b41ea2c1 100644 (file)
--- a/src/osx/cocoa/textctrl.mm
+++ b/src/osx/cocoa/textctrl.mm
@@ -49,7 +49,12 @@
 #include "wx/osx/private.h"
 #include "wx/osx/cocoa/private/textimpl.h"
 
 #include "wx/osx/private.h"
 #include "wx/osx/cocoa/private/textimpl.h"
 

-@implementation wxNSTextField
+@interface wxNSSecureTextField : NSSecureTextField
+{
+}
+@end
+
+@implementation wxNSSecureTextField 

 
 + (void)initialize
 {
 
 + (void)initialize
 {


@@ -61,23 +66,10 @@
     }
 }
 
     }
 }
 

-- (id)initWithFrame:(NSRect)frame
-{
-    [super initWithFrame:frame];
-    [self setDelegate: self];
-    [self setTarget: self];
-//    [self setAction: @selector(enterAction:)];
-    return self;
-}
-
-// use our common calls
-- (void) setTitle:(NSString *) title
-{
-    [self setStringValue: title];
-}
-/*

 - (void)controlTextDidChange:(NSNotification *)aNotification
 {
 - (void)controlTextDidChange:(NSNotification *)aNotification
 {

+    wxUnusedVar(aNotification);
+    wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );

     if ( impl )
     {
         wxWindow* wxpeer = (wxWindow*) impl->GetWXPeer();
     if ( impl )
     {
         wxWindow* wxpeer = (wxWindow*) impl->GetWXPeer();


@@ -92,79 +84,378 @@
 
 - (void)controlTextDidEndEditing:(NSNotification *)aNotification
 {
 
 - (void)controlTextDidEndEditing:(NSNotification *)aNotification
 {

+    wxUnusedVar(aNotification);
+    wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
+    if ( impl )
+    {
+        impl->DoNotifyFocusEvent( false, NULL );
+    }
+}
+
+@end
+
+@interface wxNSTextScrollView : NSScrollView
+{
+}
+@end
+
+@interface wxNSTextView : NSTextView
+{
+    wxNSTextScrollView* scrollView;
+}
+
+- (void)setScrollView: (wxNSTextScrollView *) sv;
+- (wxNSTextScrollView*) scrollView;
+
+@end
+
+@implementation wxNSTextScrollView
+
++ (void)initialize
+{
+    static BOOL initialized = NO;
+    if (!initialized) 
+    {    
+        initialized = YES;
+        wxOSXCocoaClassAddWXMethods( self );
+    }
+}
+
+- (void)textDidChange:(NSNotification *)aNotification
+{
+    wxUnusedVar(aNotification);
+    wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );

     if ( impl )
     {
         wxWindow* wxpeer = (wxWindow*) impl->GetWXPeer();
         if ( wxpeer ) {
     if ( impl )
     {
         wxWindow* wxpeer = (wxWindow*) impl->GetWXPeer();
         if ( wxpeer ) {

-            wxFocusEvent event(wxEVT_KILL_FOCUS, wxpeer->GetId());
+            wxCommandEvent event(wxEVT_COMMAND_TEXT_UPDATED, wxpeer->GetId());

             event.SetEventObject( wxpeer );
             event.SetEventObject( wxpeer );

-            event.SetWindow( wxpeer );
+            event.SetString( static_cast<wxTextCtrl*>(wxpeer)->GetValue() );

             wxpeer->HandleWindowEvent( event );
         }
     }
 }
 
             wxpeer->HandleWindowEvent( event );
         }
     }
 }
 

-- (void) enterAction: (id) sender
+- (BOOL)textView:(NSTextView *)aTextView doCommandBySelector:(SEL)commandSelector
+{
+    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;
+}
+
+- (void)textDidEndEditing:(NSNotification *)aNotification

 {
 {

+    wxUnusedVar(aNotification);
+    wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
+    if ( impl )
+    {
+        impl->DoNotifyFocusEvent( false, NULL );
+    }
+}
+@end
+
+@implementation wxNSTextView
+
+- (BOOL) becomeFirstResponder
+{
+    BOOL val = [super becomeFirstResponder];
+    
+    if ( val )
+    {
+        wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( scrollView );
+        if (impl )
+            impl->DoNotifyFocusEvent( true, NULL );
+
+    }
+    return val;
+}
+
+- (void)setScrollView: (wxNSTextScrollView *) sv
+{
+    scrollView = sv;
+}
+
+- (wxNSTextScrollView*) scrollView
+{
+    return scrollView;
+}
+
+@end
+
+@implementation wxNSTextField
+
++ (void)initialize
+{
+    static BOOL initialized = NO;
+    if (!initialized) 
+    {
+        initialized = YES;
+        wxOSXCocoaClassAddWXMethods( self );
+    }
+}
+
+- (void) setEnabled:(BOOL) flag
+{
+    [super setEnabled: flag];
+
+    if (![self drawsBackground]) {
+        // Static text is drawn incorrectly when disabled.
+        // For an explanation, see
+        // http://www.cocoabuilder.com/archive/message/cocoa/2006/7/21/168028
+        if (flag) {
+            [self setTextColor: [NSColor controlTextColor]];
+        } else {
+            [self setTextColor: [NSColor secondarySelectedControlColor]];
+        }
+    }
+}
+
+- (void)controlTextDidChange:(NSNotification *)aNotification
+{
+    wxUnusedVar(aNotification);
+    wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );

     if ( impl )
     {
         wxWindow* wxpeer = (wxWindow*) impl->GetWXPeer();
     if ( impl )
     {
         wxWindow* wxpeer = (wxWindow*) impl->GetWXPeer();

-        if ( wxpeer && (wxpeer->GetWindowStyle() & wxTE_PROCESS_ENTER) ) {
-            wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, wxpeer->GetId());
+        if ( wxpeer ) {
+            wxCommandEvent event(wxEVT_COMMAND_TEXT_UPDATED, wxpeer->GetId());

             event.SetEventObject( wxpeer );
             event.SetString( static_cast<wxTextCtrl*>(wxpeer)->GetValue() );
             wxpeer->HandleWindowEvent( event );
         }
     }
 }
             event.SetEventObject( wxpeer );
             event.SetString( static_cast<wxTextCtrl*>(wxpeer)->GetValue() );
             wxpeer->HandleWindowEvent( event );
         }
     }
 }

-*/
+
+typedef BOOL (*wxOSX_insertNewlineHandlerPtr)(NSView* self, SEL _cmd, NSControl *control, NSTextView* textView, SEL commandSelector);
+
+- (BOOL)control:(NSControl*)control textView:(NSTextView*)textView doCommandBySelector:(SEL)commandSelector
+{
+    wxUnusedVar(textView);
+    wxUnusedVar(control);
+    if (commandSelector == @selector(insertNewline:))
+    {
+        wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
+        if ( impl  )
+        {
+            wxWindow* wxpeer = (wxWindow*) impl->GetWXPeer();
+            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;
+}
+
+- (void)controlTextDidEndEditing:(NSNotification *)aNotification
+{
+    wxUnusedVar(aNotification);
+    wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
+    if ( impl )
+    {
+        impl->DoNotifyFocusEvent( false, NULL );
+    }
+}

 @end
 
 @end
 

+// wxNSTextViewControl
+
+wxNSTextViewControl::wxNSTextViewControl( wxTextCtrl *wxPeer, WXWidget w ) : wxWidgetCocoaImpl(wxPeer, w)
+{
+    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];
+}
+
+wxNSTextViewControl::~wxNSTextViewControl()
+{
+    if (m_textView)
+        [m_textView setDelegate: nil];
+}
+
+wxString wxNSTextViewControl::GetStringValue() const 
+{
+    if (m_textView) 
+    {
+        wxCFStringRef cf( (CFStringRef) [[m_textView string] retain] );
+        return cf.AsString(m_wxPeer->GetFont().GetEncoding());
+    }
+    return wxEmptyString;
+}
+void wxNSTextViewControl::SetStringValue( const wxString &str) 
+{
+    if (m_textView)
+        [m_textView setString: wxCFStringRef( str , m_wxPeer->GetFont().GetEncoding() ).AsNSString()];
+}
+void wxNSTextViewControl::Copy() 
+{
+    if (m_textView)
+        [m_textView copy:nil];
+
+}
+
+void wxNSTextViewControl::Cut() 
+{
+    if (m_textView)
+        [m_textView cut:nil];
+}
+
+void wxNSTextViewControl::Paste() 
+{
+    if (m_textView)
+        [m_textView paste:nil];
+}
+
+bool wxNSTextViewControl::CanPaste() const 
+{ 
+    return true;
+}
+
+void wxNSTextViewControl::SetEditable(bool editable) 
+{
+    if (m_textView)
+        [m_textView setEditable: editable];
+}
+
+void wxNSTextViewControl::GetSelection( long* from, long* to) const 
+{
+    if (m_textView)
+    {
+        NSRange range = [m_textView selectedRange];
+        *from = range.location;
+        *to = range.location + range.length;
+    }
+}
+
+void wxNSTextViewControl::SetSelection( long from , long to )
+{
+    NSRange selrange = NSMakeRange(from, to-from);
+    [m_textView setSelectedRange:selrange];
+    [m_textView scrollRangeToVisible:selrange];
+}
+
+void wxNSTextViewControl::WriteText(const wxString& str) 
+{
+    // temp hack to get logging working early
+    wxString former = GetStringValue();
+    SetStringValue( former + str );
+    SetSelection(GetStringValue().length(), GetStringValue().length());
+}
+
+// wxNSTextFieldControl
+

 wxNSTextFieldControl::wxNSTextFieldControl( wxTextCtrl *wxPeer, WXWidget w ) : wxWidgetCocoaImpl(wxPeer, w)
 {
 wxNSTextFieldControl::wxNSTextFieldControl( wxTextCtrl *wxPeer, WXWidget w ) : wxWidgetCocoaImpl(wxPeer, w)
 {

+    m_textField = (NSTextField*) w;
+    [m_textField setDelegate: w];

 }
 
 wxNSTextFieldControl::~wxNSTextFieldControl()
 {
 }
 
 wxNSTextFieldControl::~wxNSTextFieldControl()
 {

+    if (m_textField)
+        [m_textField setDelegate: nil];

 }
 
 wxString wxNSTextFieldControl::GetStringValue() const 
 {
 }
 
 wxString wxNSTextFieldControl::GetStringValue() const 
 {

-    wxCFStringRef cf( (CFStringRef) [[(wxNSTextField*) m_osxView stringValue] retain] );
+    wxCFStringRef cf( (CFStringRef) [[m_textField stringValue] retain] );

     return cf.AsString(m_wxPeer->GetFont().GetEncoding());
 }
 void wxNSTextFieldControl::SetStringValue( const wxString &str) 
 {
     return cf.AsString(m_wxPeer->GetFont().GetEncoding());
 }
 void wxNSTextFieldControl::SetStringValue( const wxString &str) 
 {

-    [(wxNSTextField*) m_osxView setStringValue: wxCFStringRef( str , m_wxPeer->GetFont().GetEncoding() ).AsNSString()];
+    [m_textField setStringValue: wxCFStringRef( str , m_wxPeer->GetFont().GetEncoding() ).AsNSString()];

 }
 void wxNSTextFieldControl::Copy() 
 {
 }
 void wxNSTextFieldControl::Copy() 
 {

+    NSText* editor = [m_textField currentEditor];
+    if ( editor )
+    {
+        [editor copy:nil];
+    }

 }
 
 void wxNSTextFieldControl::Cut() 
 {
 }
 
 void wxNSTextFieldControl::Cut() 
 {

+    NSText* editor = [m_textField currentEditor];
+    if ( editor )
+    {
+        [editor cut:nil];
+    }

 }
 
 void wxNSTextFieldControl::Paste() 
 {
 }
 
 void wxNSTextFieldControl::Paste() 
 {

+    NSText* editor = [m_textField currentEditor];
+    if ( editor )
+    {
+        [editor paste:nil];
+    }

 }
 
 bool wxNSTextFieldControl::CanPaste() const 
 { 
 }
 
 bool wxNSTextFieldControl::CanPaste() const 
 { 

-    return false;
+    return true;

 }
 
 void wxNSTextFieldControl::SetEditable(bool editable) 
 {
 }
 
 void wxNSTextFieldControl::SetEditable(bool editable) 
 {

-    [(wxNSTextField*) m_osxView setEditable: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 )
+    {
+        NSRange range = [editor selectedRange];
+        *from = range.location;
+        *to = range.location + range.length;
+    }

 }
 
 void wxNSTextFieldControl::SetSelection( long from , long to )
 {
 }
 
 void wxNSTextFieldControl::SetSelection( long from , long to )
 {

+    NSText* editor = [m_textField currentEditor];
+    if ( editor )
+    {
+        [editor setSelectedRange:NSMakeRange(from, to-from)];
+    }

 }
 
 void wxNSTextFieldControl::WriteText(const wxString& str) 
 }
 
 void wxNSTextFieldControl::WriteText(const wxString& str) 


@@ -172,31 +463,66 @@ void wxNSTextFieldControl::WriteText(const wxString& str)
     // temp hack to get logging working early
     wxString former = GetStringValue();
     SetStringValue( former + str );
     // temp hack to get logging working early
     wxString former = GetStringValue();
     SetStringValue( former + str );

+    SetSelection(GetStringValue().length(), GetStringValue().length());

 }
 
 }
 

+void wxNSTextFieldControl::controlAction(WXWidget WXUNUSED(slf), 
+    void* WXUNUSED(_cmd), void *WXUNUSED(sender))
+{
+    wxWindow* wxpeer = (wxWindow*) GetWXPeer();
+    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 );
+    }
+}
+
+//
+//
+//
+

 wxWidgetImplType* wxWidgetImpl::CreateTextControl( wxTextCtrl* wxpeer, 
 wxWidgetImplType* wxWidgetImpl::CreateTextControl( wxTextCtrl* wxpeer, 

-                                    wxWindowMac* parent, 
-                                    wxWindowID id, 
+                                    wxWindowMac* WXUNUSED(parent), 
+                                    wxWindowID WXUNUSED(id), 

                                     const wxString& str,
                                     const wxPoint& pos, 
                                     const wxSize& size,
                                     long style, 
                                     const wxString& str,
                                     const wxPoint& pos, 
                                     const wxSize& size,
                                     long style, 

-                                    long extraStyle)
+                                    long WXUNUSED(extraStyle))

 {
     NSRect r = wxOSXGetFrameForControl( wxpeer, pos , size ) ;
 {
     NSRect r = wxOSXGetFrameForControl( wxpeer, pos , size ) ;

-    wxNSTextField* v = [[wxNSTextField alloc] initWithFrame:r];
+    wxWidgetCocoaImpl* c = NULL;

     
     

-    if ( style & wxNO_BORDER )
+    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 

     {
     {

+        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];
         [v setBezeled:NO];
         [v setBordered:NO];

+        
+        c = new wxNSTextFieldControl( wxpeer, v );
+        static_cast<wxNSTextFieldControl*>(c)->SetStringValue(str);

     }
     }

-
-    //[v setBezeled:NO];
-    //[v setEditable:NO];
-    //[v setDrawsBackground:NO];

     
     

-    wxWidgetCocoaImpl* c = new wxNSTextFieldControl( wxpeer, v );

     return c;
 }
 
     return c;
 }