adapt defines for ctrl/command key

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

diff --git a/src/osx/cocoa/textctrl.mm b/src/osx/cocoa/textctrl.mm
index f8e4f22bf26c827f277fff4099ce4f323bbb35e9..f22f8de86e4d2a3a768439c536c9ded3f2209df8 100644 (file)
--- a/src/osx/cocoa/textctrl.mm
+++ b/src/osx/cocoa/textctrl.mm
@@ -57,11 +57,18 @@
 - (void)setSelectable:(BOOL)flag;
 @end
 
 - (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 )
     {
 class wxMacEditHelper
 {
 public :
     wxMacEditHelper( NSView* textView )
     {

+        m_viewPreviouslyEdited = ms_viewCurrentlyEdited;
+        ms_viewCurrentlyEdited =

         m_textView = textView;
         m_formerEditable = YES;
         if ( textView )
         m_textView = textView;
         m_formerEditable = YES;
         if ( textView )


@@ -79,14 +86,27 @@ public :
             [m_textView setEditable:m_formerEditable];
             [m_textView setSelectable:m_formerSelectable];
         }
             [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_formerEditable ;
     BOOL m_formerSelectable;
     NSView* m_textView;
 protected :
     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;
+

 @implementation wxNSSecureTextField
 
 + (void)initialize
 @implementation wxNSSecureTextField
 
 + (void)initialize


@@ -222,6 +242,15 @@ protected :
 - (void)textDidEndEditing:(NSNotification *)aNotification
 {
     wxUnusedVar(aNotification);
 - (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 )
     {
     wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
     if ( impl )
     {


@@ -258,7 +287,12 @@ protected :
 
 - (void) setFieldEditor:(wxNSTextFieldEditor*) editor
 {
 
 - (void) setFieldEditor:(wxNSTextFieldEditor*) editor
 {

-    fieldEditor = editor;
+    if ( editor != fieldEditor )
+    {
+        [editor retain];
+        [fieldEditor release];
+        fieldEditor = editor;
+    }

 }
 
 - (wxNSTextFieldEditor*) fieldEditor
 }
 
 - (wxNSTextFieldEditor*) fieldEditor


@@ -630,7 +664,7 @@ wxNSTextFieldControl::wxNSTextFieldControl(wxWindow *wxPeer,
 
 void wxNSTextFieldControl::Init(WXWidget w)
 {
 
 void wxNSTextFieldControl::Init(WXWidget w)
 {

-    NSTextField wxOSX_10_6_AND_LATER(<NSTextFieldDelegate>) *tf = (NSTextField*) 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_textField = tf;
     [m_textField setDelegate: tf];
     m_selStart = m_selEnd = 0;