add alignment flags support to wxSpinCtrl[Double] (closes #10621)

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

diff --git a/src/osx/cocoa/window.mm b/src/osx/cocoa/window.mm
index d535ec48798da71c7614d7960f8964260098f965..822bf528c75e50c1e422196cde7dfd482b348013 100644 (file)
--- a/src/osx/cocoa/window.mm
+++ b/src/osx/cocoa/window.mm
@@ -44,10 +44,13 @@ NSRect wxOSXGetFrameForControl( wxWindowMac* window , const wxPoint& pos , const
 
 @interface wxNSView : NSView
 {
 
 @interface wxNSView : NSView
 {

+    NSTrackingRectTag rectTag;

 }
 
 - (BOOL) canBecomeKeyView;
 }
 
 - (BOOL) canBecomeKeyView;

-
+// the tracking tag is needed to track mouse enter / exit events 
+- (void) setTrackingTag: (NSTrackingRectTag)tag;
+- (NSTrackingRectTag) trackingTag;

 @end // wxNSView
 
 @interface NSView(PossibleMethods) 
 @end // wxNSView
 
 @interface NSView(PossibleMethods) 


@@ -70,6 +73,8 @@ NSRect wxOSXGetFrameForControl( wxWindowMac* window , const wxPoint& pos , const
 - (void)setImage:(NSImage *)image;
 - (void)setControlSize:(NSControlSize)size;
 
 - (void)setImage:(NSImage *)image;
 - (void)setControlSize:(NSControlSize)size;
 

+- (void)setFont:(NSFont *)fontObject;
+

 - (id)contentView;
 
 - (void)setTarget:(id)anObject;
 - (id)contentView;
 
 - (void)setTarget:(id)anObject;


@@ -77,57 +82,113 @@ NSRect wxOSXGetFrameForControl( wxWindowMac* window , const wxPoint& pos , const
 - (void)setDoubleAction:(SEL)aSelector;
 @end 
 
 - (void)setDoubleAction:(SEL)aSelector;
 @end 
 

-long wxOSXTranslateCocoaKey( int unichar )
+long wxOSXTranslateCocoaKey( NSEvent* event )

 {
 {

-    long retval = unichar;
-    switch( unichar )
+    long retval = 0;
+
+    if ([event type] != NSFlagsChanged)
+    {    
+        NSString* s = [event charactersIgnoringModifiers];
+        // backspace char reports as delete w/modifiers for some reason
+        if ([s length] == 1)
+        {
+            switch ( [s characterAtIndex:0] )
+            {
+                // backspace key
+                case 0x7F :
+                case 8 : 
+                    retval = WXK_BACK;
+                    break;
+                case NSUpArrowFunctionKey :
+                    retval = WXK_UP;
+                    break;
+                case NSDownArrowFunctionKey :
+                    retval = WXK_DOWN;
+                    break;
+                case NSLeftArrowFunctionKey :
+                    retval = WXK_LEFT;
+                    break;
+                case NSRightArrowFunctionKey :
+                    retval = WXK_RIGHT;
+                    break;
+                case NSInsertFunctionKey  :
+                    retval = WXK_INSERT;
+                    break;
+                case NSDeleteFunctionKey  :
+                    retval = WXK_DELETE;
+                    break;
+                case NSHomeFunctionKey  :
+                    retval = WXK_HOME;
+                    break;
+        //        case NSBeginFunctionKey  :
+        //            retval = WXK_BEGIN;
+        //            break;
+                case NSEndFunctionKey  :
+                    retval = WXK_END;
+                    break;
+                case NSPageUpFunctionKey  :
+                    retval = WXK_PAGEUP;
+                    break;
+               case NSPageDownFunctionKey  :
+                    retval = WXK_PAGEDOWN;
+                    break;
+               case NSHelpFunctionKey  :
+                    retval = WXK_HELP;
+                    break;
+                default:
+                    int intchar = [s characterAtIndex: 0];
+                    if ( intchar >= NSF1FunctionKey && intchar <= NSF24FunctionKey )
+                        retval = WXK_F1 + (intchar - NSF1FunctionKey );
+                    break;
+            }
+        }
+    }
+    
+    // Some keys don't seem to have constants. The code mimics the approach
+    // taken by WebKit. See:
+    // http://trac.webkit.org/browser/trunk/WebCore/platform/mac/KeyEventMac.mm
+    switch( [event keyCode] )

     {
     {

-        case NSUpArrowFunctionKey :
-            retval = WXK_UP;
+        // command key
+        case 54:
+        case 55:
+            retval = WXK_COMMAND;

             break;
             break;

-        case NSDownArrowFunctionKey :
-            retval = WXK_DOWN;
+        // caps locks key
+        case 57: // Capslock
+            retval = WXK_CAPITAL;

             break;
             break;

-        case NSLeftArrowFunctionKey :
-            retval = WXK_LEFT;
+        // shift key
+        case 56: // Left Shift
+        case 60: // Right Shift
+            retval = WXK_SHIFT;

             break;
             break;

-        case NSRightArrowFunctionKey :
-            retval = WXK_RIGHT;
+        // alt key
+        case 58: // Left Alt
+        case 61: // Right Alt
+            retval = WXK_ALT;

             break;
             break;

-        case NSInsertFunctionKey  :
-            retval = WXK_INSERT;
+        // ctrl key
+        case 59: // Left Ctrl
+        case 62: // Right Ctrl
+            retval = WXK_CONTROL;

             break;
             break;

-        case NSDeleteFunctionKey  :
-            retval = WXK_DELETE;
+        // clear key
+        case 71: 
+            retval = WXK_CLEAR;

             break;
             break;

-        case NSHomeFunctionKey  :
-            retval = WXK_HOME;
-            break;
-//        case NSBeginFunctionKey  :
-//            retval = WXK_BEGIN;
-//            break;
-        case NSEndFunctionKey  :
-            retval = WXK_END;
-            break;
-        case NSPageUpFunctionKey  :
-            retval = WXK_PAGEUP;
-            break;
-       case NSPageDownFunctionKey  :
-            retval = WXK_PAGEDOWN;
-            break;
-       case NSHelpFunctionKey  :
-            retval = WXK_HELP;
+        // tab key
+        case 48: 
+            retval = WXK_TAB;

             break;
 
         default :
             break;
 
         default :

-            if ( unichar >= NSF1FunctionKey && unichar >= NSF24FunctionKey )
-                retval = WXK_F1 + (unichar - NSF1FunctionKey );

             break;
     }
     return retval;
 }
 
             break;
     }
     return retval;
 }
 

-void SetupKeyEvent( wxKeyEvent &wxevent , NSEvent * nsEvent )
+void SetupKeyEvent( wxKeyEvent &wxevent , NSEvent * nsEvent, NSString* charString = NULL )

 {
     UInt32 modifiers = [nsEvent modifierFlags] ;
     int eventType = [nsEvent type];
 {
     UInt32 modifiers = [nsEvent modifierFlags] ;
     int eventType = [nsEvent type];


@@ -160,20 +221,36 @@ void SetupKeyEvent( wxKeyEvent &wxevent , NSEvent * nsEvent )
     if ( eventType != NSFlagsChanged )
     {
         NSString* nschars = [nsEvent characters];
     if ( eventType != NSFlagsChanged )
     {
         NSString* nschars = [nsEvent characters];

-        if ( nschars )
+        if ( charString )
+        {
+            // if charString is set, it did not come from key up / key down
+            wxevent.SetEventType( wxEVT_CHAR );
+            wxCFStringRef cfchars((CFStringRef)[charString retain]);
+            chars = cfchars.AsString();
+        }
+        else if ( nschars )

         {
             wxCFStringRef cfchars((CFStringRef)[nschars retain]);
             chars = cfchars.AsString();
         }
     }
     
         {
             wxCFStringRef cfchars((CFStringRef)[nschars retain]);
             chars = cfchars.AsString();
         }
     }
     

-    int unichar = chars.Length() > 0 ? chars[0] : 0;
-    long keyval = wxOSXTranslateCocoaKey(unichar) ;
-    if ( keyval == unichar && ( wxevent.GetEventType() == wxEVT_KEY_UP || wxevent.GetEventType() == wxEVT_KEY_DOWN ) )
-        keyval = wxToupper( keyval ) ;
+    int aunichar = chars.Length() > 0 ? chars[0] : 0;
+    long keyval = 0;
+    
+    if (wxevent.GetEventType() != wxEVT_CHAR)
+        keyval = wxOSXTranslateCocoaKey(nsEvent) ;

 
 

+    if ( !keyval )
+    {
+        if ( wxevent.GetEventType() == wxEVT_KEY_UP || wxevent.GetEventType() == wxEVT_KEY_DOWN )
+            keyval = wxToupper( aunichar ) ;
+        else
+            keyval = aunichar;
+    }
+    

 #if wxUSE_UNICODE
 #if wxUSE_UNICODE

-    wxevent.m_uniChar = unichar;
+    wxevent.m_uniChar = aunichar;

 #endif
     wxevent.m_keyCode = keyval;
 }
 #endif
     wxevent.m_keyCode = keyval;
 }


@@ -190,8 +267,6 @@ void SetupMouseEvent( wxMouseEvent &wxevent , NSEvent * nsEvent )
     // these parameters are not given for all events
     UInt32 button = [nsEvent buttonNumber];
     UInt32 clickCount = 0;
     // these parameters are not given for all events
     UInt32 button = [nsEvent buttonNumber];
     UInt32 clickCount = 0;

-    if ( eventType != NSScrollWheel ) 
-        [nsEvent clickCount];

 
     wxevent.m_x = screenMouseLocation.x;
     wxevent.m_y = screenMouseLocation.y;
 
     wxevent.m_x = screenMouseLocation.x;
     wxevent.m_y = screenMouseLocation.y;


@@ -199,7 +274,6 @@ void SetupMouseEvent( wxMouseEvent &wxevent , NSEvent * nsEvent )
     wxevent.m_controlDown = modifiers & NSControlKeyMask;
     wxevent.m_altDown = modifiers & NSAlternateKeyMask;
     wxevent.m_metaDown = modifiers & NSCommandKeyMask;
     wxevent.m_controlDown = modifiers & NSControlKeyMask;
     wxevent.m_altDown = modifiers & NSAlternateKeyMask;
     wxevent.m_metaDown = modifiers & NSCommandKeyMask;

-    wxevent.m_clickCount = clickCount;

     wxevent.SetTimestamp( [nsEvent timestamp] * 1000.0 ) ;
 
     UInt32 mouseChord = 0; 
     wxevent.SetTimestamp( [nsEvent timestamp] * 1000.0 ) ;
 
     UInt32 mouseChord = 0; 


@@ -272,6 +346,7 @@ void SetupMouseEvent( wxMouseEvent &wxevent , NSEvent * nsEvent )
         case NSLeftMouseDown :
         case NSRightMouseDown :
         case NSOtherMouseDown :
         case NSLeftMouseDown :
         case NSRightMouseDown :
         case NSOtherMouseDown :

+            clickCount = [nsEvent clickCount];

             switch ( button )
             {
                 case 0 :
             switch ( button )
             {
                 case 0 :


@@ -294,6 +369,7 @@ void SetupMouseEvent( wxMouseEvent &wxevent , NSEvent * nsEvent )
         case NSLeftMouseUp :
         case NSRightMouseUp :
         case NSOtherMouseUp :
         case NSLeftMouseUp :
         case NSRightMouseUp :
         case NSOtherMouseUp :

+            clickCount = [nsEvent clickCount];

             switch ( button )
             {
                 case 0 :
             switch ( button )
             {
                 case 0 :


@@ -332,7 +408,11 @@ void SetupMouseEvent( wxMouseEvent &wxevent , NSEvent * nsEvent )
         break ;
 
         case NSMouseEntered :
         break ;
 
         case NSMouseEntered :

+            wxevent.SetEventType( wxEVT_ENTER_WINDOW ) ;
+            break;

         case NSMouseExited :
         case NSMouseExited :

+            wxevent.SetEventType( wxEVT_LEAVE_WINDOW ) ;
+            break;

         case NSLeftMouseDragged :
         case NSRightMouseDragged :
         case NSOtherMouseDragged :
         case NSLeftMouseDragged :
         case NSRightMouseDragged :
         case NSOtherMouseDragged :


@@ -342,6 +422,9 @@ void SetupMouseEvent( wxMouseEvent &wxevent , NSEvent * nsEvent )
         default :
             break ;
     }
         default :
             break ;
     }

+    
+    wxevent.m_clickCount = clickCount;
+    

 }
 
 @implementation wxNSView
 }
 
 @implementation wxNSView


@@ -361,6 +444,16 @@ void SetupMouseEvent( wxMouseEvent &wxevent , NSEvent * nsEvent )
     return YES;
 }
 
     return YES;
 }
 

+- (void) setTrackingTag: (NSTrackingRectTag)tag
+{
+    rectTag = tag;
+}
+
+- (NSTrackingRectTag) trackingTag
+{
+    return rectTag;
+}
+

 @end // wxNSView
 
 //
 @end // wxNSView
 
 //


@@ -426,6 +519,15 @@ void wxOSX_keyEvent(NSView* self, SEL _cmd, NSEvent *event)
     impl->keyEvent(event, self, _cmd);
 }
 
     impl->keyEvent(event, self, _cmd);
 }
 

+void wxOSX_insertText(NSView* self, SEL _cmd, NSString* text) 
+{
+    wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
+    if (impl == NULL)
+        return;
+        
+    impl->insertText(text, self, _cmd);
+}
+

 BOOL wxOSX_performKeyEquivalent(NSView* self, SEL _cmd, NSEvent *event) 
 {
     wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
 BOOL wxOSX_performKeyEquivalent(NSView* self, SEL _cmd, NSEvent *event) 
 {
     wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );


@@ -435,6 +537,15 @@ BOOL wxOSX_performKeyEquivalent(NSView* self, SEL _cmd, NSEvent *event)
     return impl->performKeyEquivalent(event, self, _cmd);
 }
 
     return impl->performKeyEquivalent(event, self, _cmd);
 }
 

+BOOL wxOSX_acceptsFirstResponder(NSView* self, SEL _cmd)
+{
+    wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
+    if (impl == NULL)
+        return NO;
+        
+    return impl->acceptsFirstResponder(self, _cmd);
+}
+

 BOOL wxOSX_becomeFirstResponder(NSView* self, SEL _cmd)
 {
     wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
 BOOL wxOSX_becomeFirstResponder(NSView* self, SEL _cmd)
 {
     wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );


@@ -638,6 +749,7 @@ bool wxWidgetCocoaImpl::performDragOperation(void* s, WXWidget slf, void *_cmd)
 
 #endif
 
 
 #endif
 

+typedef void (*wxOSX_TextEventHandlerPtr)(NSView* self, SEL _cmd, NSString *event);

 typedef void (*wxOSX_EventHandlerPtr)(NSView* self, SEL _cmd, NSEvent *event);
 typedef BOOL (*wxOSX_PerformKeyEventHandlerPtr)(NSView* self, SEL _cmd, NSEvent *event);
 typedef BOOL (*wxOSX_FocusHandlerPtr)(NSView* self, SEL _cmd);
 typedef void (*wxOSX_EventHandlerPtr)(NSView* self, SEL _cmd, NSEvent *event);
 typedef BOOL (*wxOSX_PerformKeyEventHandlerPtr)(NSView* self, SEL _cmd, NSEvent *event);
 typedef BOOL (*wxOSX_FocusHandlerPtr)(NSView* self, SEL _cmd);


@@ -655,30 +767,48 @@ void wxWidgetCocoaImpl::mouseEvent(WX_NSEvent event, WXWidget slf, void *_cmd)
 
 void wxWidgetCocoaImpl::keyEvent(WX_NSEvent event, WXWidget slf, void *_cmd)
 {
 
 void wxWidgetCocoaImpl::keyEvent(WX_NSEvent event, WXWidget slf, void *_cmd)
 {

-    if ( !DoHandleKeyEvent(event) )
+    if ( [[slf window] firstResponder] != slf || !DoHandleKeyEvent(event) )

     {
         wxOSX_EventHandlerPtr superimpl = (wxOSX_EventHandlerPtr) [[slf superclass] instanceMethodForSelector:(SEL)_cmd];
         superimpl(slf, (SEL)_cmd, event);
     }
 }
 
     {
         wxOSX_EventHandlerPtr superimpl = (wxOSX_EventHandlerPtr) [[slf superclass] instanceMethodForSelector:(SEL)_cmd];
         superimpl(slf, (SEL)_cmd, event);
     }
 }
 

-bool wxWidgetCocoaImpl::performKeyEquivalent(WX_NSEvent event, WXWidget slf, void *_cmd)
+void wxWidgetCocoaImpl::insertText(NSString* text, WXWidget slf, void *_cmd)

 {
 {

-    if ( !DoHandleKeyEvent(event) )
+    if (m_lastKeyDownEvent && !DoHandleCharEvent(m_lastKeyDownEvent, text) )

     {
     {

-        wxOSX_PerformKeyEventHandlerPtr superimpl = (wxOSX_PerformKeyEventHandlerPtr) [[slf superclass] instanceMethodForSelector:(SEL)_cmd];
-        return superimpl(slf, (SEL)_cmd, event);
+            wxOSX_TextEventHandlerPtr superimpl = (wxOSX_TextEventHandlerPtr) [[slf superclass] instanceMethodForSelector:(SEL)_cmd];
+            superimpl(slf, (SEL)_cmd, text);

     }
     }

+    m_lastKeyDownEvent = NULL;
+}

 
 

-    return YES;
+
+bool wxWidgetCocoaImpl::performKeyEquivalent(WX_NSEvent event, WXWidget slf, void *_cmd)
+{
+    wxOSX_PerformKeyEventHandlerPtr superimpl = (wxOSX_PerformKeyEventHandlerPtr) [[slf superclass] instanceMethodForSelector:(SEL)_cmd];
+    return superimpl(slf, (SEL)_cmd, event);
+}
+
+bool wxWidgetCocoaImpl::acceptsFirstResponder(WXWidget slf, void *_cmd)
+{
+    // FIXME: We need to find a way to query AcceptsFocus here, but when we do it
+    // it calls native APIs which lead us back here and into a loop.
+    wxOSX_FocusHandlerPtr superimpl = (wxOSX_FocusHandlerPtr) [[slf superclass] instanceMethodForSelector:(SEL)_cmd];
+    return superimpl(slf, (SEL)_cmd);

 }
 
 bool wxWidgetCocoaImpl::becomeFirstResponder(WXWidget slf, void *_cmd)
 {
     wxOSX_FocusHandlerPtr superimpl = (wxOSX_FocusHandlerPtr) [[slf superclass] instanceMethodForSelector:(SEL)_cmd];
 }
 
 bool wxWidgetCocoaImpl::becomeFirstResponder(WXWidget slf, void *_cmd)
 {
     wxOSX_FocusHandlerPtr superimpl = (wxOSX_FocusHandlerPtr) [[slf superclass] instanceMethodForSelector:(SEL)_cmd];

+    // get the current focus before running becomeFirstResponder
+    NSResponder* currentResponder = [[NSApp keyWindow] firstResponder]; 
+    NSView* otherView = (currentResponder != nil && [currentResponder isKindOfClass:[NSView class]]) ? (NSView*) currentResponder : NULL; 
+    wxWidgetImpl* otherWindow = FindFromWXWidget(otherView);

     BOOL r = superimpl(slf, (SEL)_cmd);
     if ( r )
     BOOL r = superimpl(slf, (SEL)_cmd);
     if ( r )

-        DoNotifyFocusEvent( true );
+        DoNotifyFocusEvent( true, otherWindow );

     return r;
 }
 
     return r;
 }
 


@@ -686,8 +816,12 @@ bool wxWidgetCocoaImpl::resignFirstResponder(WXWidget slf, void *_cmd)
 {
     wxOSX_FocusHandlerPtr superimpl = (wxOSX_FocusHandlerPtr) [[slf superclass] instanceMethodForSelector:(SEL)_cmd];
     BOOL r = superimpl(slf, (SEL)_cmd);
 {
     wxOSX_FocusHandlerPtr superimpl = (wxOSX_FocusHandlerPtr) [[slf superclass] instanceMethodForSelector:(SEL)_cmd];
     BOOL r = superimpl(slf, (SEL)_cmd);

+    // get the current focus after running resignFirstResponder
+    NSResponder* currentResponder = [[NSApp keyWindow] firstResponder]; 
+    NSView* otherView = (currentResponder != nil && [currentResponder isKindOfClass:[NSView class]]) ? (NSView*) currentResponder : NULL; 
+    wxWidgetImpl* otherWindow = FindFromWXWidget(otherView);

     if ( r )
     if ( r )

-        DoNotifyFocusEvent( false );
+        DoNotifyFocusEvent( false, otherWindow );

     return r;
 }
 
     return r;
 }
 


@@ -831,10 +965,12 @@ void wxOSXCocoaClassAddWXMethods(Class c)
     wxOSX_CLASS_ADD_METHOD(c, @selector(keyDown:), (IMP) wxOSX_keyEvent, "v@:@" )
     wxOSX_CLASS_ADD_METHOD(c, @selector(keyUp:), (IMP) wxOSX_keyEvent, "v@:@" )
     wxOSX_CLASS_ADD_METHOD(c, @selector(flagsChanged:), (IMP) wxOSX_keyEvent, "v@:@" )
     wxOSX_CLASS_ADD_METHOD(c, @selector(keyDown:), (IMP) wxOSX_keyEvent, "v@:@" )
     wxOSX_CLASS_ADD_METHOD(c, @selector(keyUp:), (IMP) wxOSX_keyEvent, "v@:@" )
     wxOSX_CLASS_ADD_METHOD(c, @selector(flagsChanged:), (IMP) wxOSX_keyEvent, "v@:@" )

+    
+    wxOSX_CLASS_ADD_METHOD(c, @selector(insertText:), (IMP) wxOSX_insertText, "v@:@" )

 
     wxOSX_CLASS_ADD_METHOD(c, @selector(performKeyEquivalent:), (IMP) wxOSX_performKeyEquivalent, "v@:@" )
 
 
     wxOSX_CLASS_ADD_METHOD(c, @selector(performKeyEquivalent:), (IMP) wxOSX_performKeyEquivalent, "v@:@" )
 

-
+    wxOSX_CLASS_ADD_METHOD(c, @selector(acceptsFirstResponder), (IMP) wxOSX_acceptsFirstResponder, "c@:" )

     wxOSX_CLASS_ADD_METHOD(c, @selector(becomeFirstResponder), (IMP) wxOSX_becomeFirstResponder, "c@:" )
     wxOSX_CLASS_ADD_METHOD(c, @selector(resignFirstResponder), (IMP) wxOSX_resignFirstResponder, "c@:" )
     wxOSX_CLASS_ADD_METHOD(c, @selector(resetCursorRects), (IMP) wxOSX_resetCursorRects, "v@:" )
     wxOSX_CLASS_ADD_METHOD(c, @selector(becomeFirstResponder), (IMP) wxOSX_becomeFirstResponder, "c@:" )
     wxOSX_CLASS_ADD_METHOD(c, @selector(resignFirstResponder), (IMP) wxOSX_resignFirstResponder, "c@:" )
     wxOSX_CLASS_ADD_METHOD(c, @selector(resetCursorRects), (IMP) wxOSX_resetCursorRects, "v@:" )


@@ -889,6 +1025,7 @@ void wxWidgetCocoaImpl::Init()
 {
     m_osxView = NULL;
     m_isFlipped = true;
 {
     m_osxView = NULL;
     m_isFlipped = true;

+    m_lastKeyDownEvent = NULL;

 }
 
 wxWidgetCocoaImpl::~wxWidgetCocoaImpl()
 }
 
 wxWidgetCocoaImpl::~wxWidgetCocoaImpl()


@@ -943,7 +1080,7 @@ void wxWidgetCocoaImpl::Move(int x, int y, int width, int height)
     wxWindowMac* parent = GetWXPeer()->GetParent();
     // under Cocoa we might have a contentView in the wxParent to which we have to 
     // adjust the coordinates
     wxWindowMac* parent = GetWXPeer()->GetParent();
     // under Cocoa we might have a contentView in the wxParent to which we have to 
     // adjust the coordinates

-    if (parent)
+    if (parent && [m_osxView superview] != parent->GetHandle() )

     {
         int cx = 0,cy = 0,cw = 0,ch = 0;
         if ( parent->GetPeer() )
     {
         int cx = 0,cy = 0,cw = 0,ch = 0;
         if ( parent->GetPeer() )


@@ -953,8 +1090,18 @@ void wxWidgetCocoaImpl::Move(int x, int y, int width, int height)
             y -= cy;
         }
     }
             y -= cy;
         }
     }

+    [[m_osxView superview] setNeedsDisplayInRect:[m_osxView frame]];

     NSRect r = wxToNSRect( [m_osxView superview], wxRect(x,y,width, height) );
     [m_osxView setFrame:r];
     NSRect r = wxToNSRect( [m_osxView superview], wxRect(x,y,width, height) );
     [m_osxView setFrame:r];

+    [[m_osxView superview] setNeedsDisplayInRect:r]; 
+    
+    if ([m_osxView respondsToSelector:@selector(trackingTag)] )
+    {
+        if ( [(wxNSView*)m_osxView trackingTag] )
+            [m_osxView removeTrackingRect: [(wxNSView*)m_osxView trackingTag]];
+        
+        [(wxNSView*)m_osxView setTrackingTag: [m_osxView addTrackingRect: [m_osxView bounds] owner: m_osxView userData: nil assumeInside: NO]];
+    }

 }
 
 void wxWidgetCocoaImpl::GetPosition( int &x, int &y ) const
 }
 
 void wxWidgetCocoaImpl::GetPosition( int &x, int &y ) const


@@ -1139,7 +1286,7 @@ void wxWidgetCocoaImpl::SetupTabs( const wxNotebook& notebook)
 void wxWidgetCocoaImpl::GetBestRect( wxRect *r ) const
 {
     r->x = r->y = r->width = r->height = 0;
 void wxWidgetCocoaImpl::GetBestRect( wxRect *r ) const
 {
     r->x = r->y = r->width = r->height = 0;

-//    if (  [m_osxView isKindOfClass:[NSControl class]] )
+

     if (  [m_osxView respondsToSelector:@selector(sizeToFit)] )
     {
         NSRect former = [m_osxView frame];
     if (  [m_osxView respondsToSelector:@selector(sizeToFit)] )
     {
         NSRect former = [m_osxView frame];


@@ -1202,9 +1349,10 @@ void wxWidgetCocoaImpl::SetControlSize( wxWindowVariant variant )
         [m_osxView setControlSize:size];
 }
 
         [m_osxView setControlSize:size];
 }
 

-void wxWidgetCocoaImpl::SetFont(wxFont const&, wxColour const&, long, bool)
+void wxWidgetCocoaImpl::SetFont(wxFont const& font, wxColour const&, long, bool)

 {
 {

-    // TODO
+    if ([m_osxView respondsToSelector:@selector(setFont:)])
+        [m_osxView setFont: font.GetNSFont()];

 }
 
 void wxWidgetCocoaImpl::InstallEventHandler( WXWidget control )
 }
 
 void wxWidgetCocoaImpl::InstallEventHandler( WXWidget control )


@@ -1223,12 +1371,30 @@ void wxWidgetCocoaImpl::InstallEventHandler( WXWidget control )
     }
 }
 
     }
 }
 

+bool wxWidgetCocoaImpl::DoHandleCharEvent(NSEvent *event, NSString *text)
+{
+    wxKeyEvent wxevent(wxEVT_KEY_DOWN);
+    SetupKeyEvent( wxevent, event, text );
+    wxevent.SetEventObject(GetWXPeer());  
+
+    return GetWXPeer()->OSXHandleKeyEvent(wxevent);
+}
+

 bool wxWidgetCocoaImpl::DoHandleKeyEvent(NSEvent *event)
 {
     wxKeyEvent wxevent(wxEVT_KEY_DOWN);
     SetupKeyEvent( wxevent, event );
 bool wxWidgetCocoaImpl::DoHandleKeyEvent(NSEvent *event)
 {
     wxKeyEvent wxevent(wxEVT_KEY_DOWN);
     SetupKeyEvent( wxevent, event );

+    wxevent.SetEventObject(GetWXPeer());    
+    bool result = GetWXPeer()->OSXHandleKeyEvent(wxevent);

 
 

-    return GetWXPeer()->OSXHandleKeyEvent(wxevent);
+    // this will fire higher level events, like insertText, to help
+    // us handle EVT_CHAR, etc.
+    if ([event type] == NSKeyDown)
+    {
+        m_lastKeyDownEvent = event;
+        [m_osxView interpretKeyEvents:[NSArray arrayWithObject:event]];
+    }
+    return result;

 }
 
 bool wxWidgetCocoaImpl::DoHandleMouseEvent(NSEvent *event)
 }
 
 bool wxWidgetCocoaImpl::DoHandleMouseEvent(NSEvent *event)


@@ -1238,13 +1404,14 @@ bool wxWidgetCocoaImpl::DoHandleMouseEvent(NSEvent *event)
     wxPoint pt = wxFromNSPoint( m_osxView, clickLocation );
     wxMouseEvent wxevent(wxEVT_LEFT_DOWN);
     SetupMouseEvent( wxevent , event ) ;
     wxPoint pt = wxFromNSPoint( m_osxView, clickLocation );
     wxMouseEvent wxevent(wxEVT_LEFT_DOWN);
     SetupMouseEvent( wxevent , event ) ;

+    wxevent.SetEventObject(GetWXPeer());

     wxevent.m_x = pt.x;
     wxevent.m_y = pt.y;
 
     return GetWXPeer()->HandleWindowEvent(wxevent);
 }
 
     wxevent.m_x = pt.x;
     wxevent.m_y = pt.y;
 
     return GetWXPeer()->HandleWindowEvent(wxevent);
 }
 

-void wxWidgetCocoaImpl::DoNotifyFocusEvent(bool receivedFocus)
+void wxWidgetCocoaImpl::DoNotifyFocusEvent(bool receivedFocus, wxWidgetImpl* otherWindow)

 {
     wxWindow* thisWindow = GetWXPeer();
     if ( thisWindow->MacGetTopLevelWindow() && NeedsFocusRect() )
 {
     wxWindow* thisWindow = GetWXPeer();
     if ( thisWindow->MacGetTopLevelWindow() && NeedsFocusRect() )


@@ -1265,8 +1432,8 @@ void wxWidgetCocoaImpl::DoNotifyFocusEvent(bool receivedFocus)
 
         wxFocusEvent event(wxEVT_SET_FOCUS, thisWindow->GetId());
         event.SetEventObject(thisWindow);
 
         wxFocusEvent event(wxEVT_SET_FOCUS, thisWindow->GetId());
         event.SetEventObject(thisWindow);

-        // TODO how to find out the targetFocusWindow ?
-        // event.SetWindow(targetFocusWindow);
+        if (otherWindow)
+            event.SetWindow(otherWindow->GetWXPeer());

         thisWindow->HandleWindowEvent(event) ;
     }
     else // !receivedFocuss
         thisWindow->HandleWindowEvent(event) ;
     }
     else // !receivedFocuss


@@ -1280,8 +1447,8 @@ void wxWidgetCocoaImpl::DoNotifyFocusEvent(bool receivedFocus)
                     
         wxFocusEvent event( wxEVT_KILL_FOCUS, thisWindow->GetId());
         event.SetEventObject(thisWindow);
                     
         wxFocusEvent event( wxEVT_KILL_FOCUS, thisWindow->GetId());
         event.SetEventObject(thisWindow);

-        // TODO how to find out the targetFocusWindow ?
-        // event.SetWindow(targetFocusWindow);
+        if (otherWindow)
+            event.SetWindow(otherWindow->GetWXPeer());

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


@@ -1337,6 +1504,7 @@ wxWidgetImpl* wxWidgetImpl::CreateContentView( wxNonOwnedWindow* now )
     NSWindow* tlw = now->GetWXWindow();
     wxNSView* v = [[wxNSView alloc] initWithFrame:[[tlw contentView] frame]];
     wxWidgetCocoaImpl* c = new wxWidgetCocoaImpl( now, v, true );
     NSWindow* tlw = now->GetWXWindow();
     wxNSView* v = [[wxNSView alloc] initWithFrame:[[tlw contentView] frame]];
     wxWidgetCocoaImpl* c = new wxWidgetCocoaImpl( now, v, true );

+    c->InstallEventHandler();

     [tlw setContentView:v];
     return c;
 }
     [tlw setContentView:v];
     return c;
 }