Correct format specifiers used to show wxIPV4address.

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

diff --git a/src/osx/cocoa/textctrl.mm b/src/osx/cocoa/textctrl.mm
index 3a0f1c19790c44b67ddbcb3bf3fbd666d644b8d5..accef767a8415e5beabff4925a701c7ddc323143 100644 (file)
--- a/src/osx/cocoa/textctrl.mm
+++ b/src/osx/cocoa/textctrl.mm
@@ -96,15 +96,7 @@ protected :
     wxUnusedVar(aNotification);
     wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
     if ( impl )
     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
 }
 
 - (void)controlTextDidEndEditing:(NSNotification *)aNotification


@@ -192,6 +184,14 @@ protected :
     }
 }
 
     }
 }
 

+- (void)textDidChange:(NSNotification *)aNotification
+{
+    wxUnusedVar(aNotification);
+    wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
+    if ( impl )
+        impl->controlTextDidChange();
+}
+

 @end
 
 @implementation wxNSTextField
 @end
 
 @implementation wxNSTextField


@@ -229,7 +229,6 @@ protected :
     return fieldEditor;
 }
 
     return fieldEditor;
 }
 

-

 - (void) setEnabled:(BOOL) flag
 {
     [super setEnabled: flag];
 - (void) setEnabled:(BOOL) flag
 {
     [super setEnabled: flag];


@@ -251,15 +250,7 @@ protected :
     wxUnusedVar(aNotification);
     wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
     if ( impl )
     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);
 }
 
 typedef BOOL (*wxOSX_insertNewlineHandlerPtr)(NSView* self, SEL _cmd, NSControl *control, NSTextView* textView, SEL commandSelector);


@@ -319,7 +310,7 @@ wxNSTextViewControl::wxNSTextViewControl( wxTextCtrl *wxPeer, WXWidget w ) : wxW
 
     [m_scrollView setDocumentView: tv];
 
 
     [m_scrollView setDocumentView: tv];
 

-    [tv setDelegate: w];
+    [tv setDelegate: tv];

 
     InstallEventHandler(tv);
 }
 
     InstallEventHandler(tv);
 }


@@ -330,6 +321,14 @@ wxNSTextViewControl::~wxNSTextViewControl()
         [m_textView setDelegate: nil];
 }
 
         [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)
 wxString wxNSTextViewControl::GetStringValue() const
 {
     if (m_textView)


@@ -431,16 +430,37 @@ void wxNSTextViewControl::SetFont( const wxFont & font , const wxColour& WXUNUSE
 
 bool wxNSTextViewControl::GetStyle(long position, wxTextAttr& style)
 {
 
 bool wxNSTextViewControl::GetStyle(long position, wxTextAttr& style)
 {

-    if (m_textView && position >=0 && position < [[m_textView string] length]) {
-        NSTextStorage* storage = [m_textView textStorage];
-        NSFont* font = [storage attribute:NSFontAttributeName atIndex:position effectiveRange:NULL];
+    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 (font)
             style.SetFont(wxFont(font));

-        NSColor* bgcolor = [storage attribute:NSBackgroundColorAttributeName atIndex:position effectiveRange:NULL];
+        

         if (bgcolor)
             style.SetBackgroundColour(wxColour(bgcolor));
         if (bgcolor)
             style.SetBackgroundColour(wxColour(bgcolor));

-        NSColor* fgcolor = [storage attribute:NSForegroundColorAttributeName atIndex:position effectiveRange:NULL];
-        style.SetTextColour(wxColour(fgcolor));
+            
+        if (fgcolor)
+            style.SetTextColour(wxColour(fgcolor));

         return true;
     }
 
         return true;
     }
 


@@ -453,28 +473,51 @@ void wxNSTextViewControl::SetStyle(long start,
 {
     if (m_textView) {
         NSRange range = NSMakeRange(start, end-start);
 {
     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();
         NSTextStorage* storage = [m_textView textStorage];
         
         wxFont font = style.GetFont();

-        if (font.IsOk())
-            [storage addAttribute:NSFontAttributeName value:style.GetFont().OSXGetNSFont() range:range];
+        if (style.HasFont() && font.IsOk())
+            [storage addAttribute:NSFontAttributeName value:font.OSXGetNSFont() range:range];

         
         wxColour bgcolor = style.GetBackgroundColour();
         
         wxColour bgcolor = style.GetBackgroundColour();

-        if (bgcolor.IsOk())
+        if (style.HasBackgroundColour() && bgcolor.IsOk())

             [storage addAttribute:NSBackgroundColorAttributeName value:bgcolor.OSXGetNSColor() range:range];
         
         wxColour fgcolor = style.GetTextColour();
             [storage addAttribute:NSBackgroundColorAttributeName value:bgcolor.OSXGetNSColor() range:range];
         
         wxColour fgcolor = style.GetTextColour();

-        if (fgcolor.IsOk())
+        if (style.HasTextColour() && fgcolor.IsOk())

             [storage addAttribute:NSForegroundColorAttributeName value:fgcolor.OSXGetNSColor() range:range];
     }
 }
 
             [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::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]];
 }
     m_selStart = m_selEnd = 0;
     m_hasEditor = [w isKindOfClass:[NSTextField class]];
 }