adding Kevin's fix for wxTOOL_STYLE_SEPARATOR

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

diff --git a/src/osx/cocoa/window.mm b/src/osx/cocoa/window.mm
index 30f7692e91e3f635d7be359b95253a45cf072d2f..7bf085d65b4190e22a534f651f56036045f77262 100644 (file)
--- a/src/osx/cocoa/window.mm
+++ b/src/osx/cocoa/window.mm
@@ -31,6 +31,41 @@
 
 #include <objc/objc-runtime.h>
 
 
 #include <objc/objc-runtime.h>
 

+// Get the window with the focus
+
+NSView* GetViewFromResponder( NSResponder* responder )
+{
+    NSView* view = nil;
+    if ( [responder isKindOfClass:[NSTextView class]] )
+    {
+        NSView* delegate =  [(NSTextView*)responder delegate];
+        if ( [delegate isKindOfClass:[NSTextField class] ] )
+            view = delegate;
+        else
+            view =  (NSView*) responder;
+    }
+    else
+    {
+        if ( [responder isKindOfClass:[NSView class]] )
+            view = (NSView*) responder;
+    }
+    return view;
+}
+
+NSView* GetFocusedViewInWindow( NSWindow* keyWindow )
+{
+    NSView* focusedView = nil;
+    if ( keyWindow != nil )
+        focusedView = GetViewFromResponder([keyWindow firstResponder]);
+
+    return focusedView;
+}
+
+WXWidget wxWidgetImpl::FindFocus()
+{
+    return GetFocusedViewInWindow( [[NSApplication sharedApplication] keyWindow] );
+}
+

 NSRect wxOSXGetFrameForControl( wxWindowMac* window , const wxPoint& pos , const wxSize &size , bool adjustForOrigin )
 {
     int x, y, w, h ;
 NSRect wxOSXGetFrameForControl( wxWindowMac* window , const wxPoint& pos , const wxSize &size , bool adjustForOrigin )
 {
     int x, y, w, h ;


@@ -47,13 +82,12 @@ NSRect wxOSXGetFrameForControl( wxWindowMac* window , const wxPoint& pos , const
     NSTrackingRectTag rectTag;
 }
 
     NSTrackingRectTag rectTag;
 }
 

-- (BOOL) canBecomeKeyView;
-// the tracking tag is needed to track mouse enter / exit events 
+// the tracking tag is needed to track mouse enter / exit events

 - (void) setTrackingTag: (NSTrackingRectTag)tag;
 - (NSTrackingRectTag) trackingTag;
 @end // wxNSView
 
 - (void) setTrackingTag: (NSTrackingRectTag)tag;
 - (NSTrackingRectTag) trackingTag;
 @end // wxNSView
 

-@interface NSView(PossibleMethods) 
+@interface NSView(PossibleMethods)

 - (void)setTitle:(NSString *)aString;
 - (void)setStringValue:(NSString *)aString;
 - (void)setIntValue:(int)anInt;
 - (void)setTitle:(NSString *)aString;
 - (void)setStringValue:(NSString *)aString;
 - (void)setIntValue:(int)anInt;


@@ -73,19 +107,21 @@ 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;
 - (void)setAction:(SEL)aSelector;
 - (void)setDoubleAction:(SEL)aSelector;
 - (id)contentView;
 
 - (void)setTarget:(id)anObject;
 - (void)setAction:(SEL)aSelector;
 - (void)setDoubleAction:(SEL)aSelector;

-@end 
+@end

 
 long wxOSXTranslateCocoaKey( NSEvent* event )
 {
     long retval = 0;
 
     if ([event type] != NSFlagsChanged)
 
 long wxOSXTranslateCocoaKey( NSEvent* event )
 {
     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)
         NSString* s = [event charactersIgnoringModifiers];
         // backspace char reports as delete w/modifiers for some reason
         if ([s length] == 1)


@@ -94,7 +130,7 @@ long wxOSXTranslateCocoaKey( NSEvent* event )
             {
                 // backspace key
                 case 0x7F :
             {
                 // backspace key
                 case 0x7F :

-                case 8 : 
+                case 8 :

                     retval = WXK_BACK;
                     break;
                 case NSUpArrowFunctionKey :
                     retval = WXK_BACK;
                     break;
                 case NSUpArrowFunctionKey :


@@ -141,7 +177,7 @@ long wxOSXTranslateCocoaKey( NSEvent* event )
             }
         }
     }
             }
         }
     }

-    
+

     // 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
     // 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


@@ -172,15 +208,64 @@ long wxOSXTranslateCocoaKey( NSEvent* event )
             retval = WXK_CONTROL;
             break;
         // clear key
             retval = WXK_CONTROL;
             break;
         // clear key

-        case 71: 
+        case 71:

             retval = WXK_CLEAR;
             break;
         // tab key
             retval = WXK_CLEAR;
             break;
         // tab key

-        case 48: 
+        case 48:

             retval = WXK_TAB;
             break;
 
             retval = WXK_TAB;
             break;
 

-        default :
+        case 75: // /
+            retval = WXK_NUMPAD_DIVIDE;
+            break;
+        case 67: // *
+            retval = WXK_NUMPAD_MULTIPLY;
+            break;
+        case 78: // -
+            retval = WXK_NUMPAD_SUBTRACT;
+            break;
+        case 69: // +
+            retval = WXK_NUMPAD_ADD;
+            break;
+        case 76: // Enter
+            retval = WXK_NUMPAD_ENTER;
+            break;
+        case 65: // .
+            retval = WXK_NUMPAD_DECIMAL;
+            break;
+        case 82: // 0
+            retval = WXK_NUMPAD0;
+            break;
+        case 83: // 1
+            retval = WXK_NUMPAD1;
+            break;
+        case 84: // 2
+            retval = WXK_NUMPAD2;
+            break;
+        case 85: // 3
+            retval = WXK_NUMPAD3;
+            break;
+        case 86: // 4
+            retval = WXK_NUMPAD4;
+            break;
+        case 87: // 5
+            retval = WXK_NUMPAD5;
+            break;
+        case 88: // 6
+            retval = WXK_NUMPAD6;
+            break;
+        case 89: // 7
+            retval = WXK_NUMPAD7;
+            break;
+        case 91: // 8
+            retval = WXK_NUMPAD8;
+            break;
+        case 92: // 9
+            retval = WXK_NUMPAD9;
+            break;
+        default:
+            //retval = [event keyCode];

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


@@ -195,49 +280,63 @@ void SetupKeyEvent( wxKeyEvent &wxevent , NSEvent * nsEvent, NSString* charStrin
     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_rawCode = [nsEvent keyCode];
     wxevent.m_rawFlags = modifiers;
     wxevent.m_rawCode = [nsEvent keyCode];
     wxevent.m_rawFlags = modifiers;

-    
-    wxevent.SetTimestamp( [nsEvent timestamp] * 1000.0 ) ;
-    switch (eventType)
-    {
-        case NSKeyDown :
-            wxevent.SetEventType( wxEVT_KEY_DOWN )  ;
-            break;
-        case NSKeyUp :
-            wxevent.SetEventType( wxEVT_KEY_UP )  ;
-            break;
-        case NSFlagsChanged :
-            // setup common code here
-            break;
-        default :
-            break ;
-    }
+
+    wxevent.SetTimestamp( (int)([nsEvent timestamp] * 1000) ) ;

 
     wxString chars;
     if ( eventType != NSFlagsChanged )
     {
 
     wxString chars;
     if ( eventType != NSFlagsChanged )
     {

-        NSString* nschars = [nsEvent characters];
+        NSString* nschars = (wxevent.GetEventType() != wxEVT_CHAR) ? [nsEvent charactersIgnoringModifiers] : [nsEvent characters];

         if ( charString )
         {
             // if charString is set, it did not come from key up / key down
             wxevent.SetEventType( wxEVT_CHAR );
         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();
+            chars = wxCFStringRef::AsString(charString);

         }
         else if ( nschars )
         {
         }
         else if ( nschars )
         {

-            wxCFStringRef cfchars((CFStringRef)[nschars retain]);
-            chars = cfchars.AsString();
+            chars = wxCFStringRef::AsString(nschars);

         }
     }
         }
     }

-    
+

     int aunichar = chars.Length() > 0 ? chars[0] : 0;
     long keyval = 0;
     int aunichar = chars.Length() > 0 ? chars[0] : 0;
     long keyval = 0;

-    
+

     if (wxevent.GetEventType() != wxEVT_CHAR)
     if (wxevent.GetEventType() != wxEVT_CHAR)

+    {

         keyval = wxOSXTranslateCocoaKey(nsEvent) ;
         keyval = wxOSXTranslateCocoaKey(nsEvent) ;

+        switch (eventType)
+        {
+            case NSKeyDown :
+                wxevent.SetEventType( wxEVT_KEY_DOWN )  ;
+                break;
+            case NSKeyUp :
+                wxevent.SetEventType( wxEVT_KEY_UP )  ;
+                break;
+            case NSFlagsChanged :
+                switch (keyval)
+                {
+                    case WXK_CONTROL:
+                        wxevent.SetEventType( wxevent.m_controlDown ? wxEVT_KEY_DOWN : wxEVT_KEY_UP);
+                        break;
+                    case WXK_SHIFT:
+                        wxevent.SetEventType( wxevent.m_shiftDown ? wxEVT_KEY_DOWN : wxEVT_KEY_UP);
+                        break;
+                    case WXK_ALT:
+                        wxevent.SetEventType( wxevent.m_altDown ? wxEVT_KEY_DOWN : wxEVT_KEY_UP);
+                        break;
+                    case WXK_COMMAND:
+                        wxevent.SetEventType( wxevent.m_metaDown ? wxEVT_KEY_DOWN : wxEVT_KEY_UP);
+                        break;
+                }
+                break;
+            default :
+                break ;
+        }
+    }

 
     if ( !keyval )
     {
 
     if ( !keyval )
     {


@@ -246,7 +345,7 @@ void SetupKeyEvent( wxKeyEvent &wxevent , NSEvent * nsEvent, NSString* charStrin
         else
             keyval = aunichar;
     }
         else
             keyval = aunichar;
     }

-    
+

 #if wxUSE_UNICODE
     wxevent.m_uniChar = aunichar;
 #endif
 #if wxUSE_UNICODE
     wxevent.m_uniChar = aunichar;
 #endif


@@ -272,9 +371,9 @@ 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.SetTimestamp( [nsEvent timestamp] * 1000.0 ) ;
+    wxevent.SetTimestamp( (int)([nsEvent timestamp] * 1000) ) ;

 
 

-    UInt32 mouseChord = 0; 
+    UInt32 mouseChord = 0;

 
     switch (eventType)
     {
 
     switch (eventType)
     {


@@ -392,15 +491,15 @@ void SetupMouseEvent( wxMouseEvent &wxevent , NSEvent * nsEvent )
             wxevent.SetEventType( wxEVT_MOUSEWHEEL ) ;
             wxevent.m_wheelDelta = 10;
             wxevent.m_linesPerAction = 1;
             wxevent.SetEventType( wxEVT_MOUSEWHEEL ) ;
             wxevent.m_wheelDelta = 10;
             wxevent.m_linesPerAction = 1;

-            NSLog(@"deltaX %f, deltaY %f",[nsEvent deltaX], [nsEvent deltaY]);
-            if ( abs([nsEvent deltaX]) > abs([nsEvent deltaY]) )
+
+            if ( fabs([nsEvent deltaX]) > fabs([nsEvent deltaY]) )

             {
                 wxevent.m_wheelAxis = 1;
             {
                 wxevent.m_wheelAxis = 1;

-                wxevent.m_wheelRotation = [nsEvent deltaX] * 10.0;
+                wxevent.m_wheelRotation = (int)([nsEvent deltaX] * 10);

             }
             else
             {
             }
             else
             {

-                wxevent.m_wheelRotation = [nsEvent deltaY] * 10.0;
+                wxevent.m_wheelRotation = (int)([nsEvent deltaY] * 10);

             }
         }
         break ;
             }
         }
         break ;


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

-    
+

     wxevent.m_clickCount = clickCount;
     wxevent.m_clickCount = clickCount;

-    
+

 }
 
 @implementation wxNSView
 }
 
 @implementation wxNSView


@@ -430,18 +529,13 @@ void SetupMouseEvent( wxMouseEvent &wxevent , NSEvent * nsEvent )
 + (void)initialize
 {
     static BOOL initialized = NO;
 + (void)initialize
 {
     static BOOL initialized = NO;

-    if (!initialized) 
+    if (!initialized)

     {
         initialized = YES;
         wxOSXCocoaClassAddWXMethods( self );
     }
 }
 
     {
         initialized = YES;
         wxOSXCocoaClassAddWXMethods( self );
     }
 }
 

-- (BOOL) canBecomeKeyView
-{
-    return YES;
-}
-

 - (void) setTrackingTag: (NSTrackingRectTag)tag
 {
     rectTag = tag;
 - (void) setTrackingTag: (NSTrackingRectTag)tag
 {
     rectTag = tag;


@@ -468,7 +562,7 @@ NSDragOperation wxOSX_draggingEntered( id self, SEL _cmd, id <NSDraggingInfo>sen
     wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
     if (impl == NULL)
         return NSDragOperationNone;
     wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
     if (impl == NULL)
         return NSDragOperationNone;

-        
+

     return impl->draggingEntered(sender, self, _cmd);
 }
 
     return impl->draggingEntered(sender, self, _cmd);
 }
 


@@ -477,7 +571,7 @@ void wxOSX_draggingExited( id self, SEL _cmd, id <NSDraggingInfo> sender )
     wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
     if (impl == NULL)
         return ;
     wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
     if (impl == NULL)
         return ;

-        
+

     return impl->draggingExited(sender, self, _cmd);
 }
 
     return impl->draggingExited(sender, self, _cmd);
 }
 


@@ -486,7 +580,7 @@ NSDragOperation wxOSX_draggingUpdated( id self, SEL _cmd, id <NSDraggingInfo>sen
     wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
     if (impl == NULL)
         return NSDragOperationNone;
     wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
     if (impl == NULL)
         return NSDragOperationNone;

-        
+

     return impl->draggingUpdated(sender, self, _cmd);
 }
 
     return impl->draggingUpdated(sender, self, _cmd);
 }
 


@@ -495,52 +589,63 @@ BOOL wxOSX_performDragOperation( id self, SEL _cmd, id <NSDraggingInfo> sender )
     wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
     if (impl == NULL)
         return NSDragOperationNone;
     wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
     if (impl == NULL)
         return NSDragOperationNone;

-        
+

     return impl->performDragOperation(sender, self, _cmd) ? YES:NO ;
 }
 
     return impl->performDragOperation(sender, self, _cmd) ? YES:NO ;
 }
 

-void wxOSX_mouseEvent(NSView* self, SEL _cmd, NSEvent *event) 
+#endif
+
+void wxOSX_mouseEvent(NSView* self, SEL _cmd, NSEvent *event)

 {
     wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
     if (impl == NULL)
         return;
 {
     wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
     if (impl == NULL)
         return;

-        
+

     impl->mouseEvent(event, self, _cmd);
 }
 
     impl->mouseEvent(event, self, _cmd);
 }
 

-void wxOSX_keyEvent(NSView* self, SEL _cmd, NSEvent *event) 
+void wxOSX_keyEvent(NSView* self, SEL _cmd, NSEvent *event)

 {
     wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
     if (impl == NULL)
         return;
 {
     wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
     if (impl == NULL)
         return;

-        
+

     impl->keyEvent(event, self, _cmd);
 }
 
     impl->keyEvent(event, self, _cmd);
 }
 

-void wxOSX_insertText(NSView* self, SEL _cmd, NSString* text) 
+void wxOSX_insertText(NSView* self, SEL _cmd, NSString* text)

 {
     wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
     if (impl == NULL)
         return;
 {
     wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
     if (impl == NULL)
         return;

-        
+

     impl->insertText(text, self, _cmd);
 }
 
     impl->insertText(text, self, _cmd);
 }
 

-BOOL wxOSX_performKeyEquivalent(NSView* self, SEL _cmd, NSEvent *event) 
+BOOL wxOSX_performKeyEquivalent(NSView* self, SEL _cmd, NSEvent *event)

 {
     wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
     if (impl == NULL)
         return NO;
 {
     wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
     if (impl == NULL)
         return NO;

-        
+

     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 );
     if (impl == NULL)
         return NO;
 BOOL wxOSX_becomeFirstResponder(NSView* self, SEL _cmd)
 {
     wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
     if (impl == NULL)
         return NO;

-        
+

     return impl->becomeFirstResponder(self, _cmd);
 }
 
     return impl->becomeFirstResponder(self, _cmd);
 }
 


@@ -549,7 +654,7 @@ BOOL wxOSX_resignFirstResponder(NSView* self, SEL _cmd)
     wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
     if (impl == NULL)
         return NO;
     wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
     if (impl == NULL)
         return NO;

-        
+

     return impl->resignFirstResponder(self, _cmd);
 }
 
     return impl->resignFirstResponder(self, _cmd);
 }
 


@@ -558,7 +663,7 @@ void wxOSX_resetCursorRects(NSView* self, SEL _cmd)
     wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
     if (impl == NULL)
         return;
     wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
     if (impl == NULL)
         return;

-        
+

     impl->resetCursorRects(self, _cmd);
 }
 
     impl->resetCursorRects(self, _cmd);
 }
 


@@ -567,7 +672,7 @@ BOOL wxOSX_isFlipped(NSView* self, SEL _cmd)
     wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
     if (impl == NULL)
         return NO;
     wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
     if (impl == NULL)
         return NO;

-        
+

     return impl->isFlipped(self, _cmd) ? YES:NO;
 }
 
     return impl->isFlipped(self, _cmd) ? YES:NO;
 }
 


@@ -576,7 +681,7 @@ void wxOSX_drawRect(NSView* self, SEL _cmd, NSRect rect)
     wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
     if (impl == NULL)
         return;
     wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
     if (impl == NULL)
         return;

-        
+

     return impl->drawRect(&rect, self, _cmd);
 }
 
     return impl->drawRect(&rect, self, _cmd);
 }
 


@@ -585,7 +690,7 @@ void wxOSX_controlAction(NSView* self, SEL _cmd, id sender)
     wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
     if (impl == NULL)
         return;
     wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
     if (impl == NULL)
         return;

-        
+

     impl->controlAction(self, _cmd, sender);
 }
 
     impl->controlAction(self, _cmd, sender);
 }
 


@@ -594,26 +699,27 @@ void wxOSX_controlDoubleAction(NSView* self, SEL _cmd, id sender)
     wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
     if (impl == NULL)
         return;
     wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
     if (impl == NULL)
         return;

-        
+

     impl->controlDoubleAction(self, _cmd, sender);
 }
 
     impl->controlDoubleAction(self, _cmd, sender);
 }
 

-unsigned int wxWidgetCocoaImpl::draggingEntered(void* s, WXWidget slf, void *_cmd)
+unsigned int wxWidgetCocoaImpl::draggingEntered(void* s, WXWidget WXUNUSED(slf), void *WXUNUSED(_cmd))

 {
     id <NSDraggingInfo>sender = (id <NSDraggingInfo>) s;
     NSPasteboard *pboard = [sender draggingPasteboard];
     NSDragOperation sourceDragMask = [sender draggingSourceOperationMask];
 {
     id <NSDraggingInfo>sender = (id <NSDraggingInfo>) s;
     NSPasteboard *pboard = [sender draggingPasteboard];
     NSDragOperation sourceDragMask = [sender draggingSourceOperationMask];

-    
+

     wxWindow* wxpeer = GetWXPeer();
     if ( wxpeer == NULL )
         return NSDragOperationNone;
     wxWindow* wxpeer = GetWXPeer();
     if ( wxpeer == NULL )
         return NSDragOperationNone;

-        
+

     wxDropTarget* target = wxpeer->GetDropTarget();
     if ( target == NULL )
         return NSDragOperationNone;
 
     wxDragResult result = wxDragNone;
     wxDropTarget* target = wxpeer->GetDropTarget();
     if ( target == NULL )
         return NSDragOperationNone;
 
     wxDragResult result = wxDragNone;

-    wxPoint pt = wxFromNSPoint( m_osxView, [sender draggingLocation] );
+    NSPoint nspoint = [m_osxView convertPoint:[sender draggingLocation] fromView:nil];
+    wxPoint pt = wxFromNSPoint( m_osxView, nspoint );

 
     if ( sourceDragMask & NSDragOperationLink )
         result = wxDragLink;
 
     if ( sourceDragMask & NSDragOperationLink )
         result = wxDragLink;


@@ -622,12 +728,12 @@ unsigned int wxWidgetCocoaImpl::draggingEntered(void* s, WXWidget slf, void *_cm
     else if ( sourceDragMask & NSDragOperationMove )
         result = wxDragMove;
 
     else if ( sourceDragMask & NSDragOperationMove )
         result = wxDragMove;
 

-    PasteboardRef pboardRef;    
+    PasteboardRef pboardRef;

     PasteboardCreate((CFStringRef)[pboard name], &pboardRef);
     target->SetCurrentDragPasteboard(pboardRef);
     result = target->OnEnter(pt.x, pt.y, result);
     CFRelease(pboardRef);
     PasteboardCreate((CFStringRef)[pboard name], &pboardRef);
     target->SetCurrentDragPasteboard(pboardRef);
     result = target->OnEnter(pt.x, pt.y, result);
     CFRelease(pboardRef);

-     
+

     NSDragOperation nsresult = NSDragOperationNone;
     switch (result )
     {
     NSDragOperation nsresult = NSDragOperationNone;
     switch (result )
     {


@@ -643,42 +749,43 @@ unsigned int wxWidgetCocoaImpl::draggingEntered(void* s, WXWidget slf, void *_cm
     return nsresult;
 }
 
     return nsresult;
 }
 

-void wxWidgetCocoaImpl::draggingExited(void* s, WXWidget slf, void *_cmd)
+void wxWidgetCocoaImpl::draggingExited(void* s, WXWidget WXUNUSED(slf), void *WXUNUSED(_cmd))

 {
     id <NSDraggingInfo>sender = (id <NSDraggingInfo>) s;
     NSPasteboard *pboard = [sender draggingPasteboard];
 {
     id <NSDraggingInfo>sender = (id <NSDraggingInfo>) s;
     NSPasteboard *pboard = [sender draggingPasteboard];

-    
+

     wxWindow* wxpeer = GetWXPeer();
     if ( wxpeer == NULL )
         return;
     wxWindow* wxpeer = GetWXPeer();
     if ( wxpeer == NULL )
         return;

-        
+

     wxDropTarget* target = wxpeer->GetDropTarget();
     if ( target == NULL )
         return;
     wxDropTarget* target = wxpeer->GetDropTarget();
     if ( target == NULL )
         return;

-        
-    PasteboardRef pboardRef;    
+
+    PasteboardRef pboardRef;

     PasteboardCreate((CFStringRef)[pboard name], &pboardRef);
     target->SetCurrentDragPasteboard(pboardRef);
     target->OnLeave();
     CFRelease(pboardRef);
  }
 
     PasteboardCreate((CFStringRef)[pboard name], &pboardRef);
     target->SetCurrentDragPasteboard(pboardRef);
     target->OnLeave();
     CFRelease(pboardRef);
  }
 

-unsigned int wxWidgetCocoaImpl::draggingUpdated(void* s, WXWidget slf, void *_cmd)
+unsigned int wxWidgetCocoaImpl::draggingUpdated(void* s, WXWidget WXUNUSED(slf), void *WXUNUSED(_cmd))

 {
     id <NSDraggingInfo>sender = (id <NSDraggingInfo>) s;
     NSPasteboard *pboard = [sender draggingPasteboard];
     NSDragOperation sourceDragMask = [sender draggingSourceOperationMask];
 {
     id <NSDraggingInfo>sender = (id <NSDraggingInfo>) s;
     NSPasteboard *pboard = [sender draggingPasteboard];
     NSDragOperation sourceDragMask = [sender draggingSourceOperationMask];

-        
+

     wxWindow* wxpeer = GetWXPeer();
     if ( wxpeer == NULL )
         return NSDragOperationNone;
     wxWindow* wxpeer = GetWXPeer();
     if ( wxpeer == NULL )
         return NSDragOperationNone;

-        
+

     wxDropTarget* target = wxpeer->GetDropTarget();
     if ( target == NULL )
         return NSDragOperationNone;
 
     wxDragResult result = wxDragNone;
     wxDropTarget* target = wxpeer->GetDropTarget();
     if ( target == NULL )
         return NSDragOperationNone;
 
     wxDragResult result = wxDragNone;

-    wxPoint pt = wxFromNSPoint( m_osxView, [sender draggingLocation] );
+    NSPoint nspoint = [m_osxView convertPoint:[sender draggingLocation] fromView:nil];
+    wxPoint pt = wxFromNSPoint( m_osxView, nspoint );

 
     if ( sourceDragMask & NSDragOperationLink )
         result = wxDragLink;
 
     if ( sourceDragMask & NSDragOperationLink )
         result = wxDragLink;


@@ -687,12 +794,12 @@ unsigned int wxWidgetCocoaImpl::draggingUpdated(void* s, WXWidget slf, void *_cm
     else if ( sourceDragMask & NSDragOperationMove )
         result = wxDragMove;
 
     else if ( sourceDragMask & NSDragOperationMove )
         result = wxDragMove;
 

-    PasteboardRef pboardRef;    
+    PasteboardRef pboardRef;

     PasteboardCreate((CFStringRef)[pboard name], &pboardRef);
     target->SetCurrentDragPasteboard(pboardRef);
     result = target->OnDragOver(pt.x, pt.y, result);
     CFRelease(pboardRef);
     PasteboardCreate((CFStringRef)[pboard name], &pboardRef);
     target->SetCurrentDragPasteboard(pboardRef);
     result = target->OnDragOver(pt.x, pt.y, result);
     CFRelease(pboardRef);

-     
+

     NSDragOperation nsresult = NSDragOperationNone;
     switch (result )
     {
     NSDragOperation nsresult = NSDragOperationNone;
     switch (result )
     {


@@ -708,17 +815,18 @@ unsigned int wxWidgetCocoaImpl::draggingUpdated(void* s, WXWidget slf, void *_cm
     return nsresult;
 }
 
     return nsresult;
 }
 

-bool wxWidgetCocoaImpl::performDragOperation(void* s, WXWidget slf, void *_cmd)
+bool wxWidgetCocoaImpl::performDragOperation(void* s, WXWidget WXUNUSED(slf), void *WXUNUSED(_cmd))

 {
     id <NSDraggingInfo>sender = (id <NSDraggingInfo>) s;
 
     NSPasteboard *pboard = [sender draggingPasteboard];
     NSDragOperation sourceDragMask = [sender draggingSourceOperationMask];
 {
     id <NSDraggingInfo>sender = (id <NSDraggingInfo>) s;
 
     NSPasteboard *pboard = [sender draggingPasteboard];
     NSDragOperation sourceDragMask = [sender draggingSourceOperationMask];

-    
+

     wxWindow* wxpeer = GetWXPeer();
     wxDropTarget* target = wxpeer->GetDropTarget();
     wxDragResult result = wxDragNone;
     wxWindow* wxpeer = GetWXPeer();
     wxDropTarget* target = wxpeer->GetDropTarget();
     wxDragResult result = wxDragNone;

-    wxPoint pt = wxFromNSPoint( m_osxView, [sender draggingLocation] );
+    NSPoint nspoint = [m_osxView convertPoint:[sender draggingLocation] fromView:nil];
+    wxPoint pt = wxFromNSPoint( m_osxView, nspoint );

 
     if ( sourceDragMask & NSDragOperationLink )
         result = wxDragLink;
 
     if ( sourceDragMask & NSDragOperationLink )
         result = wxDragLink;


@@ -727,36 +835,41 @@ bool wxWidgetCocoaImpl::performDragOperation(void* s, WXWidget slf, void *_cmd)
     else if ( sourceDragMask & NSDragOperationMove )
         result = wxDragMove;
 
     else if ( sourceDragMask & NSDragOperationMove )
         result = wxDragMove;
 

-    PasteboardRef pboardRef;    
+    PasteboardRef pboardRef;

     PasteboardCreate((CFStringRef)[pboard name], &pboardRef);
     target->SetCurrentDragPasteboard(pboardRef);
     PasteboardCreate((CFStringRef)[pboard name], &pboardRef);
     target->SetCurrentDragPasteboard(pboardRef);

-    result = target->OnData(pt.x, pt.y, result);
+
+    if (target->OnDrop(pt.x, pt.y))
+        result = target->OnData(pt.x, pt.y, result);
+

     CFRelease(pboardRef);
     CFRelease(pboardRef);

-     
+

     return result != wxDragNone;
 }
 
     return result != wxDragNone;
 }
 

-#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 BOOL (*wxOSX_ResetCursorRectsHandlerPtr)(NSView* self, SEL _cmd);
 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 BOOL (*wxOSX_ResetCursorRectsHandlerPtr)(NSView* self, SEL _cmd);

-typedef BOOL (*wxOSX_DrawRectHandlerPtr)(NSView* self, SEL _cmd, NSRect rect);
+typedef void (*wxOSX_DrawRectHandlerPtr)(NSView* self, SEL _cmd, NSRect rect);

 
 void wxWidgetCocoaImpl::mouseEvent(WX_NSEvent event, WXWidget slf, void *_cmd)
 {
     if ( !DoHandleMouseEvent(event) )
     {
 
 void wxWidgetCocoaImpl::mouseEvent(WX_NSEvent event, WXWidget slf, void *_cmd)
 {
     if ( !DoHandleMouseEvent(event) )
     {

-        wxOSX_EventHandlerPtr superimpl = (wxOSX_EventHandlerPtr) [[slf superclass] instanceMethodForSelector:(SEL)_cmd];
-        superimpl(slf, (SEL)_cmd, event);
+        // for plain NSView mouse events would propagate to parents otherwise
+        if (!m_wxPeer->MacIsUserPane())
+        {
+            wxOSX_EventHandlerPtr superimpl = (wxOSX_EventHandlerPtr) [[slf superclass] instanceMethodForSelector:(SEL)_cmd];
+            superimpl(slf, (SEL)_cmd, event);
+        }

     }
 }
 
 void wxWidgetCocoaImpl::keyEvent(WX_NSEvent event, WXWidget slf, void *_cmd)
 {
     }
 }
 
 void wxWidgetCocoaImpl::keyEvent(WX_NSEvent event, WXWidget slf, void *_cmd)
 {

-    if ( [[slf window] firstResponder] != slf || !DoHandleKeyEvent(event) )
+    if ( GetFocusedViewInWindow([slf window]) != slf || m_hasEditor || !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);


@@ -765,10 +878,10 @@ void wxWidgetCocoaImpl::keyEvent(WX_NSEvent event, WXWidget slf, void *_cmd)
 
 void wxWidgetCocoaImpl::insertText(NSString* text, WXWidget slf, void *_cmd)
 {
 
 void wxWidgetCocoaImpl::insertText(NSString* text, WXWidget slf, void *_cmd)
 {

-    if (m_lastKeyDownEvent && !DoHandleCharEvent(m_lastKeyDownEvent, text) )
+    if ( m_lastKeyDownEvent==NULL || m_hasEditor || !DoHandleCharEvent(m_lastKeyDownEvent, text) )

     {
     {

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

     }
     m_lastKeyDownEvent = NULL;
 }
     }
     m_lastKeyDownEvent = NULL;
 }


@@ -780,12 +893,30 @@ bool wxWidgetCocoaImpl::performKeyEquivalent(WX_NSEvent event, WXWidget slf, voi
     return superimpl(slf, (SEL)_cmd, event);
 }
 
     return superimpl(slf, (SEL)_cmd, event);
 }
 

+bool wxWidgetCocoaImpl::acceptsFirstResponder(WXWidget slf, void *_cmd)
+{
+    if ( m_wxPeer->MacIsUserPane() )
+        return m_wxPeer->AcceptsFocus();
+    else
+    {
+        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
+    NSView* otherView = FindFocus();
+
+    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;
 }
 


@@ -793,8 +924,17 @@ 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);

-    if ( r )
-        DoNotifyFocusEvent( false );
+    // get the current focus after running resignFirstResponder
+    // note that this value isn't reliable, it might return the same view that
+    // is resigning
+    NSView* otherView = FindFocus();
+    wxWidgetImpl* otherWindow = FindFromWXWidget(otherView);
+    // NSTextViews have an editor as true responder, therefore the might get the
+    // resign notification if their editor takes over, don't trigger any event then
+    if ( r && !m_hasEditor)
+    {
+        DoNotifyFocusEvent( false, otherWindow );
+    }

     return r;
 }
 
     return r;
 }
 


@@ -816,8 +956,8 @@ void wxWidgetCocoaImpl::resetCursorRects(WXWidget slf, void *_cmd)
         }
     }
 }
         }
     }
 }

-  
-bool wxWidgetCocoaImpl::isFlipped(WXWidget slf, void *_cmd)
+
+bool wxWidgetCocoaImpl::isFlipped(WXWidget WXUNUSED(slf), void *WXUNUSED(_cmd))

 {
     return m_isFlipped;
 }
 {
     return m_isFlipped;
 }


@@ -825,11 +965,11 @@ bool wxWidgetCocoaImpl::isFlipped(WXWidget slf, void *_cmd)
 
 #define OSX_DEBUG_DRAWING 0
 
 
 #define OSX_DEBUG_DRAWING 0
 

-void wxWidgetCocoaImpl::drawRect(void* rect, WXWidget slf, void *_cmd)
+void wxWidgetCocoaImpl::drawRect(void* rect, WXWidget slf, void *WXUNUSED(_cmd))

 {
     CGContextRef context = (CGContextRef) [[NSGraphicsContext currentContext] graphicsPort];
     CGContextSaveGState( context );
 {
     CGContextRef context = (CGContextRef) [[NSGraphicsContext currentContext] graphicsPort];
     CGContextSaveGState( context );

-    
+

 #if OSX_DEBUG_DRAWING
     CGContextBeginPath( context );
     CGContextMoveToPoint(context, 0, 0);
 #if OSX_DEBUG_DRAWING
     CGContextBeginPath( context );
     CGContextMoveToPoint(context, 0, 0);


@@ -850,7 +990,7 @@ void wxWidgetCocoaImpl::drawRect(void* rect, WXWidget slf, void *_cmd)
         CGContextTranslateCTM( context, 0,  [m_osxView bounds].size.height );
         CGContextScaleCTM( context, 1, -1 );
     }
         CGContextTranslateCTM( context, 0,  [m_osxView bounds].size.height );
         CGContextScaleCTM( context, 1, -1 );
     }

-    
+

     wxRegion updateRgn;
     const NSRect *rects;
     NSInteger count;
     wxRegion updateRgn;
     const NSRect *rects;
     NSInteger count;


@@ -864,9 +1004,9 @@ void wxWidgetCocoaImpl::drawRect(void* rect, WXWidget slf, void *_cmd)
     wxWindow* wxpeer = GetWXPeer();
     wxpeer->GetUpdateRegion() = updateRgn;
     wxpeer->MacSetCGContextRef( context );
     wxWindow* wxpeer = GetWXPeer();
     wxpeer->GetUpdateRegion() = updateRgn;
     wxpeer->MacSetCGContextRef( context );

-    
+

     bool handled = wxpeer->MacDoRedraw( 0 );
     bool handled = wxpeer->MacDoRedraw( 0 );

-            
+

     CGContextRestoreGState( context );
 
     CGContextSaveGState( context );
     CGContextRestoreGState( context );
 
     CGContextSaveGState( context );


@@ -884,18 +1024,18 @@ void wxWidgetCocoaImpl::drawRect(void* rect, WXWidget slf, void *_cmd)
     CGContextRestoreGState( context );
 }
 
     CGContextRestoreGState( context );
 }
 

-void wxWidgetCocoaImpl::controlAction( WXWidget slf, void *_cmd, void *sender)
+void wxWidgetCocoaImpl::controlAction( WXWidget WXUNUSED(slf), void *WXUNUSED(_cmd), void *WXUNUSED(sender))

 {
     wxWindow* wxpeer = (wxWindow*) GetWXPeer();
     if ( wxpeer )
         wxpeer->OSXHandleClicked(0);
 }
 
 {
     wxWindow* wxpeer = (wxWindow*) GetWXPeer();
     if ( wxpeer )
         wxpeer->OSXHandleClicked(0);
 }
 

-void wxWidgetCocoaImpl::controlDoubleAction( WXWidget slf, void *_cmd, void *sender)
+void wxWidgetCocoaImpl::controlDoubleAction( WXWidget WXUNUSED(slf), void *WXUNUSED(_cmd), void *WXUNUSED(sender))

 {
 }
 
 {
 }
 

-// 
+//

 
 #if OBJC_API_VERSION >= 2
 
 
 #if OBJC_API_VERSION >= 2
 


@@ -934,15 +1074,16 @@ void wxOSXCocoaClassAddWXMethods(Class c)
     wxOSX_CLASS_ADD_METHOD(c, @selector(scrollWheel:), (IMP) wxOSX_mouseEvent, "v@:@" )
     wxOSX_CLASS_ADD_METHOD(c, @selector(mouseEntered:), (IMP) wxOSX_mouseEvent, "v@:@" )
     wxOSX_CLASS_ADD_METHOD(c, @selector(mouseExited:), (IMP) wxOSX_mouseEvent, "v@:@" )
     wxOSX_CLASS_ADD_METHOD(c, @selector(scrollWheel:), (IMP) wxOSX_mouseEvent, "v@:@" )
     wxOSX_CLASS_ADD_METHOD(c, @selector(mouseEntered:), (IMP) wxOSX_mouseEvent, "v@:@" )
     wxOSX_CLASS_ADD_METHOD(c, @selector(mouseExited:), (IMP) wxOSX_mouseEvent, "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(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(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, "c@:@" )

 
 

+    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@:" )


@@ -958,8 +1099,8 @@ void wxOSXCocoaClassAddWXMethods(Class c)
     wxOSX_CLASS_ADD_METHOD(c, @selector(draggingUpdated:), (IMP) wxOSX_draggingUpdated, "I@:@" )
     wxOSX_CLASS_ADD_METHOD(c, @selector(draggingExited:), (IMP) wxOSX_draggingExited, "v@:@" )
     wxOSX_CLASS_ADD_METHOD(c, @selector(performDragOperation:), (IMP) wxOSX_performDragOperation, "c@:@" )
     wxOSX_CLASS_ADD_METHOD(c, @selector(draggingUpdated:), (IMP) wxOSX_draggingUpdated, "I@:@" )
     wxOSX_CLASS_ADD_METHOD(c, @selector(draggingExited:), (IMP) wxOSX_draggingExited, "v@:@" )
     wxOSX_CLASS_ADD_METHOD(c, @selector(performDragOperation:), (IMP) wxOSX_performDragOperation, "c@:@" )

-#endif     
-        
+#endif
+

 #if OBJC_API_VERSION < 2
     } ;
     static int method_count = WXSIZEOF( wxmethods );
 #if OBJC_API_VERSION < 2
     } ;
     static int method_count = WXSIZEOF( wxmethods );


@@ -986,9 +1127,18 @@ wxWidgetCocoaImpl::wxWidgetCocoaImpl( wxWindowMac* peer , WXWidget w, bool isRoo
 {
     Init();
     m_osxView = w;
 {
     Init();
     m_osxView = w;

+
+    // check if the user wants to create the control initially hidden
+    if ( !peer->IsShown() )
+        SetVisibility(false);
+
+    // gc aware handling
+    if ( m_osxView )
+        CFRetain(m_osxView);
+    [m_osxView release];

 }
 
 }
 

-wxWidgetCocoaImpl::wxWidgetCocoaImpl() 
+wxWidgetCocoaImpl::wxWidgetCocoaImpl()

 {
     Init();
 }
 {
     Init();
 }


@@ -998,6 +1148,7 @@ void wxWidgetCocoaImpl::Init()
     m_osxView = NULL;
     m_isFlipped = true;
     m_lastKeyDownEvent = NULL;
     m_osxView = NULL;
     m_isFlipped = true;
     m_lastKeyDownEvent = NULL;

+    m_hasEditor = false;

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


@@ -1010,10 +1161,12 @@ wxWidgetCocoaImpl::~wxWidgetCocoaImpl()
         if ( sv != nil )
             [m_osxView removeFromSuperview];
     }
         if ( sv != nil )
             [m_osxView removeFromSuperview];
     }

-    [m_osxView release];
+    // gc aware handling
+    if ( m_osxView )
+        CFRelease(m_osxView);

 }
 }

-    
-bool wxWidgetCocoaImpl::IsVisible() const 
+
+bool wxWidgetCocoaImpl::IsVisible() const

 {
     return [m_osxView isHiddenOrHasHiddenAncestor] == NO;
 }
 {
     return [m_osxView isHiddenOrHasHiddenAncestor] == NO;
 }


@@ -1025,13 +1178,15 @@ void wxWidgetCocoaImpl::SetVisibility( bool visible )
 
 void wxWidgetCocoaImpl::Raise()
 {
 
 void wxWidgetCocoaImpl::Raise()
 {

+    // Not implemented

 }
 }

-    
+

 void wxWidgetCocoaImpl::Lower()
 {
 void wxWidgetCocoaImpl::Lower()
 {

+    // Not implemented

 }
 
 }
 

-void wxWidgetCocoaImpl::ScrollRect( const wxRect *rect, int dx, int dy )
+void wxWidgetCocoaImpl::ScrollRect( const wxRect *WXUNUSED(rect), int WXUNUSED(dx), int WXUNUSED(dy) )

 {
 #if 1
     SetNeedsDisplay() ;
 {
 #if 1
     SetNeedsDisplay() ;


@@ -1050,9 +1205,9 @@ void wxWidgetCocoaImpl::ScrollRect( const wxRect *rect, int dx, int dy )
 void wxWidgetCocoaImpl::Move(int x, int y, int width, int height)
 {
     wxWindowMac* parent = GetWXPeer()->GetParent();
 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 
+    // under Cocoa we might have a contentView in the wxParent to which we have to

     // adjust the coordinates
     // 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() )


@@ -1062,14 +1217,16 @@ 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]];
     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]];
     }
 }
         [(wxNSView*)m_osxView setTrackingTag: [m_osxView addTrackingRect: [m_osxView bounds] owner: m_osxView userData: nil assumeInside: NO]];
     }
 }


@@ -1084,8 +1241,8 @@ void wxWidgetCocoaImpl::GetPosition( int &x, int &y ) const
 void wxWidgetCocoaImpl::GetSize( int &width, int &height ) const
 {
     NSRect rect = [m_osxView frame];
 void wxWidgetCocoaImpl::GetSize( int &width, int &height ) const
 {
     NSRect rect = [m_osxView frame];

-    width = rect.size.width;
-    height = rect.size.height;
+    width = (int)rect.size.width;
+    height = (int)rect.size.height;

 }
 
 void wxWidgetCocoaImpl::GetContentArea( int&left, int &top, int &width, int &height ) const
 }
 
 void wxWidgetCocoaImpl::GetContentArea( int&left, int &top, int &width, int &height ) const


@@ -1093,18 +1250,18 @@ void wxWidgetCocoaImpl::GetContentArea( int&left, int &top, int &width, int &hei
     if ( [m_osxView respondsToSelector:@selector(contentView) ] )
     {
         NSView* cv = [m_osxView contentView];
     if ( [m_osxView respondsToSelector:@selector(contentView) ] )
     {
         NSView* cv = [m_osxView contentView];

-     
+

         NSRect bounds = [m_osxView bounds];
         NSRect rect = [cv frame];
         NSRect bounds = [m_osxView bounds];
         NSRect rect = [cv frame];

-        
-        int y = rect.origin.y;
-        int x = rect.origin.x;
+
+        int y = (int)rect.origin.y;
+        int x = (int)rect.origin.x;

         if ( ![ m_osxView isFlipped ] )
         if ( ![ m_osxView isFlipped ] )

-            y = bounds.size.height - (rect.origin.y + rect.size.height);
+            y = (int)(bounds.size.height - (rect.origin.y + rect.size.height));

         left = x;
         top = y;
         left = x;
         top = y;

-        width = rect.size.width;
-        height = rect.size.height;
+        width = (int)rect.size.width;
+        height = (int)rect.size.height;

     }
     else
     {
     }
     else
     {


@@ -1133,15 +1290,16 @@ bool wxWidgetCocoaImpl::CanFocus() const
 
 bool wxWidgetCocoaImpl::HasFocus() const
 {
 
 bool wxWidgetCocoaImpl::HasFocus() const
 {

-    return ( [[m_osxView window] firstResponder] == m_osxView );
+    return ( FindFocus() == m_osxView );

 }
 
 }
 

-bool wxWidgetCocoaImpl::SetFocus() 
+bool wxWidgetCocoaImpl::SetFocus()

 {
     if ( [m_osxView canBecomeKeyView] == NO )
         return false;
 {
     if ( [m_osxView canBecomeKeyView] == NO )
         return false;

-        
+

     [[m_osxView window] makeFirstResponder: m_osxView] ;
     [[m_osxView window] makeFirstResponder: m_osxView] ;

+    [[m_osxView window] makeKeyAndOrderFront:nil] ;

     return true;
 }
 
     return true;
 }
 


@@ -1167,30 +1325,30 @@ void wxWidgetCocoaImpl::SetLabel( const wxString& title, wxFontEncoding encoding
 {
     if ( [m_osxView respondsToSelector:@selector(setTitle:) ] )
     {
 {
     if ( [m_osxView respondsToSelector:@selector(setTitle:) ] )
     {

-        wxCFStringRef cf( title , m_wxPeer->GetFont().GetEncoding() );
+        wxCFStringRef cf( title , encoding );

         [m_osxView setTitle:cf.AsNSString()];
     }
     else if ( [m_osxView respondsToSelector:@selector(setStringValue:) ] )
     {
         [m_osxView setTitle:cf.AsNSString()];
     }
     else if ( [m_osxView respondsToSelector:@selector(setStringValue:) ] )
     {

-        wxCFStringRef cf( title , m_wxPeer->GetFont().GetEncoding() );
+        wxCFStringRef cf( title , encoding );

         [m_osxView setStringValue:cf.AsNSString()];
     }
 }
         [m_osxView setStringValue:cf.AsNSString()];
     }
 }

-    
+

 
 void  wxWidgetImpl::Convert( wxPoint *pt , wxWidgetImpl *from , wxWidgetImpl *to )
 {
     NSPoint p = wxToNSPoint( from->GetWXWidget(), *pt );
 
 void  wxWidgetImpl::Convert( wxPoint *pt , wxWidgetImpl *from , wxWidgetImpl *to )
 {
     NSPoint p = wxToNSPoint( from->GetWXWidget(), *pt );

-    p = [from->GetWXWidget() convertPoint:p toView:to->GetWXWidget() ]; 
+    p = [from->GetWXWidget() convertPoint:p toView:to->GetWXWidget() ];

     *pt = wxFromNSPoint( to->GetWXWidget(), p );
 }
 
     *pt = wxFromNSPoint( to->GetWXWidget(), p );
 }
 

-wxInt32 wxWidgetCocoaImpl::GetValue() const 
+wxInt32 wxWidgetCocoaImpl::GetValue() const

 {
     return [(NSControl*)m_osxView intValue];
 }
 
 {
     return [(NSControl*)m_osxView intValue];
 }
 

-void wxWidgetCocoaImpl::SetValue( wxInt32 v ) 
+void wxWidgetCocoaImpl::SetValue( wxInt32 v )

 {
     if (  [m_osxView respondsToSelector:@selector(setIntValue:)] )
     {
 {
     if (  [m_osxView respondsToSelector:@selector(setIntValue:)] )
     {


@@ -1206,7 +1364,7 @@ void wxWidgetCocoaImpl::SetValue( wxInt32 v )
     }
 }
 
     }
 }
 

-void wxWidgetCocoaImpl::SetMinimum( wxInt32 v ) 
+void wxWidgetCocoaImpl::SetMinimum( wxInt32 v )

 {
     if (  [m_osxView respondsToSelector:@selector(setMinValue:)] )
     {
 {
     if (  [m_osxView respondsToSelector:@selector(setMinValue:)] )
     {


@@ -1214,7 +1372,7 @@ void wxWidgetCocoaImpl::SetMinimum( wxInt32 v )
     }
 }
 
     }
 }
 

-void wxWidgetCocoaImpl::SetMaximum( wxInt32 v ) 
+void wxWidgetCocoaImpl::SetMaximum( wxInt32 v )

 {
     if (  [m_osxView respondsToSelector:@selector(setMaxValue:)] )
     {
 {
     if (  [m_osxView respondsToSelector:@selector(setMaxValue:)] )
     {


@@ -1222,24 +1380,37 @@ void wxWidgetCocoaImpl::SetMaximum( wxInt32 v )
     }
 }
 
     }
 }
 

-wxInt32 wxWidgetCocoaImpl::GetMinimum() const 
+wxInt32 wxWidgetCocoaImpl::GetMinimum() const

 {
     if (  [m_osxView respondsToSelector:@selector(getMinValue:)] )
     {
 {
     if (  [m_osxView respondsToSelector:@selector(getMinValue:)] )
     {

-        return [m_osxView minValue];
+        return (int)[m_osxView minValue];

     }
     return 0;
 }
 
     }
     return 0;
 }
 

-wxInt32 wxWidgetCocoaImpl::GetMaximum() const 
+wxInt32 wxWidgetCocoaImpl::GetMaximum() const

 {
     if (  [m_osxView respondsToSelector:@selector(getMaxValue:)] )
     {
 {
     if (  [m_osxView respondsToSelector:@selector(getMaxValue:)] )
     {

-        return [m_osxView maxValue];
+        return (int)[m_osxView maxValue];

     }
     return 0;
 }
 
     }
     return 0;
 }
 

+wxBitmap wxWidgetCocoaImpl::GetBitmap() const
+{
+    wxBitmap bmp;
+
+    // TODO: how to create a wxBitmap from NSImage?
+#if 0
+    if ( [m_osxView respondsToSelector:@selector(image:)] )
+        bmp = [m_osxView image];
+#endif
+
+    return bmp;
+}
+

 void wxWidgetCocoaImpl::SetBitmap( const wxBitmap& bitmap )
 {
     if (  [m_osxView respondsToSelector:@selector(setImage:)] )
 void wxWidgetCocoaImpl::SetBitmap( const wxBitmap& bitmap )
 {
     if (  [m_osxView respondsToSelector:@selector(setImage:)] )


@@ -1248,7 +1419,39 @@ void wxWidgetCocoaImpl::SetBitmap( const wxBitmap& bitmap )
     }
 }
 
     }
 }
 

-void wxWidgetCocoaImpl::SetupTabs( const wxNotebook& notebook)
+void wxWidgetCocoaImpl::SetBitmapPosition( wxDirection dir )
+{
+    if ( [m_osxView respondsToSelector:@selector(setImagePosition:)] )
+    {
+        NSCellImagePosition pos;
+        switch ( dir )
+        {
+            case wxLEFT:
+                pos = NSImageLeft;
+                break;
+
+            case wxRIGHT:
+                pos = NSImageRight;
+                break;
+
+            case wxTOP:
+                pos = NSImageAbove;
+                break;
+
+            case wxBOTTOM:
+                pos = NSImageBelow;
+                break;
+
+            default:
+                wxFAIL_MSG( "invalid image position" );
+                pos = NSNoImage;
+        }
+
+        [m_osxView setImagePosition:pos];
+    }
+}
+
+void wxWidgetCocoaImpl::SetupTabs( const wxNotebook& WXUNUSED(notebook))

 {
     // implementation in subclass
 }
 {
     // implementation in subclass
 }


@@ -1256,15 +1459,15 @@ 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];
         [m_osxView sizeToFit];
         NSRect best = [m_osxView frame];
         [m_osxView setFrame:former];
     if (  [m_osxView respondsToSelector:@selector(sizeToFit)] )
     {
         NSRect former = [m_osxView frame];
         [m_osxView sizeToFit];
         NSRect best = [m_osxView frame];
         [m_osxView setFrame:former];

-        r->width = best.size.width;
-        r->height = best.size.height;
+        r->width = (int)best.size.width;
+        r->height = (int)best.size.height;

     }
 }
 
     }
 }
 


@@ -1285,14 +1488,14 @@ void wxWidgetCocoaImpl::PulseGauge()
 {
 }
 
 {
 }
 

-void wxWidgetCocoaImpl::SetScrollThumb( wxInt32 val, wxInt32 view )
+void wxWidgetCocoaImpl::SetScrollThumb( wxInt32 WXUNUSED(val), wxInt32 WXUNUSED(view) )

 {
 }
 
 {
 }
 

-void wxWidgetCocoaImpl::SetControlSize( wxWindowVariant variant ) 
+void wxWidgetCocoaImpl::SetControlSize( wxWindowVariant variant )

 {
     NSControlSize size = NSRegularControlSize;
 {
     NSControlSize size = NSRegularControlSize;

-    
+

     switch ( variant )
     {
         case wxWINDOW_VARIANT_NORMAL :
     switch ( variant )
     {
         case wxWINDOW_VARIANT_NORMAL :


@@ -1312,16 +1515,23 @@ void wxWidgetCocoaImpl::SetControlSize( wxWindowVariant variant )
             break ;
 
         default:
             break ;
 
         default:

-            wxFAIL_MSG(_T("unexpected window variant"));
+            wxFAIL_MSG(wxT("unexpected window variant"));

             break ;
     }
     if ( [m_osxView respondsToSelector:@selector(setControlSize:)] )
         [m_osxView setControlSize:size];
             break ;
     }
     if ( [m_osxView respondsToSelector:@selector(setControlSize:)] )
         [m_osxView setControlSize:size];

+    else if ([m_osxView respondsToSelector:@selector(cell)])
+    {
+        id cell = [(id)m_osxView cell];
+        if ([cell respondsToSelector:@selector(setControlSize:)])
+            [cell 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.OSXGetNSFont()];

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


@@ -1336,15 +1546,15 @@ void wxWidgetCocoaImpl::InstallEventHandler( WXWidget control )
         {
             [c setDoubleAction: @selector(controlDoubleAction:)];
         }
         {
             [c setDoubleAction: @selector(controlDoubleAction:)];
         }

-        
+

     }
 }
 
 bool wxWidgetCocoaImpl::DoHandleCharEvent(NSEvent *event, NSString *text)
 {
     }
 }
 
 bool wxWidgetCocoaImpl::DoHandleCharEvent(NSEvent *event, NSString *text)
 {

-    wxKeyEvent wxevent(wxEVT_KEY_DOWN);
+    wxKeyEvent wxevent(wxEVT_CHAR);

     SetupKeyEvent( wxevent, event, text );
     SetupKeyEvent( wxevent, event, text );

-    wxevent.SetEventObject(GetWXPeer());  
+    wxevent.SetEventObject(GetWXPeer());

 
     return GetWXPeer()->OSXHandleKeyEvent(wxevent);
 }
 
     return GetWXPeer()->OSXHandleKeyEvent(wxevent);
 }


@@ -1353,23 +1563,30 @@ bool wxWidgetCocoaImpl::DoHandleKeyEvent(NSEvent *event)
 {
     wxKeyEvent wxevent(wxEVT_KEY_DOWN);
     SetupKeyEvent( wxevent, event );
 {
     wxKeyEvent wxevent(wxEVT_KEY_DOWN);
     SetupKeyEvent( wxevent, event );

-    wxevent.SetEventObject(GetWXPeer());    
+    wxevent.SetEventObject(GetWXPeer());

     bool result = GetWXPeer()->OSXHandleKeyEvent(wxevent);
 
     // this will fire higher level events, like insertText, to help
     // us handle EVT_CHAR, etc.
     bool result = GetWXPeer()->OSXHandleKeyEvent(wxevent);
 
     // this will fire higher level events, like insertText, to help
     // us handle EVT_CHAR, etc.

-    if ([event type] == NSKeyDown)
+    if ( !m_hasEditor && [event type] == NSKeyDown)

     {
         m_lastKeyDownEvent = event;
     {
         m_lastKeyDownEvent = event;

-        [m_osxView interpretKeyEvents:[NSArray arrayWithObject:event]];
+        if ( !result )
+        {
+            if ( [m_osxView isKindOfClass:[NSScrollView class] ] )
+                [[(NSScrollView*)m_osxView documentView] interpretKeyEvents:[NSArray arrayWithObject:event]];
+            else
+                [m_osxView interpretKeyEvents:[NSArray arrayWithObject:event]];
+            result = true;
+        }

     }
     return result;
 }
 
 bool wxWidgetCocoaImpl::DoHandleMouseEvent(NSEvent *event)
 {
     }
     return result;
 }
 
 bool wxWidgetCocoaImpl::DoHandleMouseEvent(NSEvent *event)
 {

-    NSPoint clickLocation; 
-    clickLocation = [m_osxView convertPoint:[event locationInWindow] fromView:nil]; 
+    NSPoint clickLocation;
+    clickLocation = [m_osxView convertPoint:[event locationInWindow] fromView:nil];

     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 ) ;


@@ -1380,7 +1597,7 @@ bool wxWidgetCocoaImpl::DoHandleMouseEvent(NSEvent *event)
     return GetWXPeer()->HandleWindowEvent(wxevent);
 }
 
     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() )


@@ -1390,7 +1607,7 @@ void wxWidgetCocoaImpl::DoNotifyFocusEvent(bool receivedFocus)
 
     if ( receivedFocus )
     {
 
     if ( receivedFocus )
     {

-        wxLogTrace(_T("Focus"), _T("focus set(%p)"), static_cast<void*>(thisWindow));
+        wxLogTrace(wxT("Focus"), wxT("focus set(%p)"), static_cast<void*>(thisWindow));

         wxChildFocusEvent eventFocus((wxWindow*)thisWindow);
         thisWindow->HandleWindowEvent(eventFocus);
 
         wxChildFocusEvent eventFocus((wxWindow*)thisWindow);
         thisWindow->HandleWindowEvent(eventFocus);
 


@@ -1401,8 +1618,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


@@ -1412,12 +1629,12 @@ void wxWidgetCocoaImpl::DoNotifyFocusEvent(bool receivedFocus)
             thisWindow->GetCaret()->OnKillFocus();
 #endif
 
             thisWindow->GetCaret()->OnKillFocus();
 #endif
 

-        wxLogTrace(_T("Focus"), _T("focus lost(%p)"), static_cast<void*>(thisWindow));
-                    
+        wxLogTrace(wxT("Focus"), wxT("focus lost(%p)"), static_cast<void*>(thisWindow));
+

         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) ;
     }
 }


@@ -1454,8 +1671,9 @@ void wxWidgetCocoaImpl::SetFlipped(bool flipped)
 // Factory methods
 //
 
 // Factory methods
 //
 

-wxWidgetImpl* wxWidgetImpl::CreateUserPane( wxWindowMac* wxpeer, wxWindowMac* parent, wxWindowID id, const wxPoint& pos, const wxSize& size,
-                            long style, long extraStyle)
+wxWidgetImpl* wxWidgetImpl::CreateUserPane( wxWindowMac* wxpeer, wxWindowMac* WXUNUSED(parent),
+    wxWindowID WXUNUSED(id), const wxPoint& pos, const wxSize& size,
+    long WXUNUSED(style), long WXUNUSED(extraStyle))

 {
     NSRect r = wxOSXGetFrameForControl( wxpeer, pos , size ) ;
     wxNSView* v = [[wxNSView alloc] initWithFrame:r];
 {
     NSRect r = wxOSXGetFrameForControl( wxpeer, pos , size ) ;
     wxNSView* v = [[wxNSView alloc] initWithFrame:r];


@@ -1463,12 +1681,12 @@ wxWidgetImpl* wxWidgetImpl::CreateUserPane( wxWindowMac* wxpeer, wxWindowMac* pa
     // temporary hook for dnd
     [v registerForDraggedTypes:[NSArray arrayWithObjects:
         NSStringPboardType, NSFilenamesPboardType, NSTIFFPboardType, NSPICTPboardType, NSPDFPboardType, nil]];
     // temporary hook for dnd
     [v registerForDraggedTypes:[NSArray arrayWithObjects:
         NSStringPboardType, NSFilenamesPboardType, NSTIFFPboardType, NSPICTPboardType, NSPDFPboardType, nil]];

-        
+

     wxWidgetCocoaImpl* c = new wxWidgetCocoaImpl( wxpeer, v );
     return c;
 }
 
     wxWidgetCocoaImpl* c = new wxWidgetCocoaImpl( wxpeer, v );
     return c;
 }
 

-wxWidgetImpl* wxWidgetImpl::CreateContentView( wxNonOwnedWindow* now ) 
+wxWidgetImpl* wxWidgetImpl::CreateContentView( wxNonOwnedWindow* now )

 {
     NSWindow* tlw = now->GetWXWindow();
     wxNSView* v = [[wxNSView alloc] initWithFrame:[[tlw contentView] frame]];
 {
     NSWindow* tlw = now->GetWXWindow();
     wxNSView* v = [[wxNSView alloc] initWithFrame:[[tlw contentView] frame]];