Add support for EVT_WEB_VIEW_NEWWINDOW to the OSX WebKit backend.

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

diff --git a/src/osx/cocoa/window.mm b/src/osx/cocoa/window.mm
index 274eb120992e17021bf206e762ef2dd3fd918a7a..9bbcb2146b668145e7aa2de5bb64e793db0afe9e 100644 (file)
--- a/src/osx/cocoa/window.mm
+++ b/src/osx/cocoa/window.mm
@@ -4,7 +4,7 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     2008-06-20
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     2008-06-20

-// RCS-ID:      $Id: window.mm 48805 2007-09-19 14:52:25Z SC $
+// RCS-ID:      $Id$

 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -13,15 +13,17 @@
 
 #ifndef WX_PRECOMP
     #include "wx/dcclient.h"
 
 #ifndef WX_PRECOMP
     #include "wx/dcclient.h"

-    #include "wx/nonownedwnd.h"
+    #include "wx/frame.h"

     #include "wx/log.h"
     #include "wx/log.h"

+    #include "wx/textctrl.h"
+    #include "wx/combobox.h"

 #endif
 
 #ifdef __WXMAC__
     #include "wx/osx/private.h"
 #endif
 
 #endif
 
 #ifdef __WXMAC__
     #include "wx/osx/private.h"
 #endif
 

-#include "wx/hashmap.h"
+#include "wx/evtloop.h"

 
 #if wxUSE_CARET
     #include "wx/caret.h"
 
 #if wxUSE_CARET
     #include "wx/caret.h"


@@ -31,16 +33,11 @@
     #include "wx/dnd.h"
 #endif
 
     #include "wx/dnd.h"
 #endif
 

-#include <objc/objc-runtime.h>
-
-namespace
-{
-
-// stop animation of this window if one is in progress
-void StopAnimation(wxWindow *win);
-
-} // anonymous namespace
+#if wxUSE_TOOLTIPS
+    #include "wx/tooltip.h"
+#endif

 
 

+#include <objc/objc-runtime.h>

 
 // Get the window with the focus
 
 
 // Get the window with the focus
 


@@ -49,7 +46,7 @@ NSView* GetViewFromResponder( NSResponder* responder )
     NSView* view = nil;
     if ( [responder isKindOfClass:[NSTextView class]] )
     {
     NSView* view = nil;
     if ( [responder isKindOfClass:[NSTextView class]] )
     {

-        NSView* delegate =  [(NSTextView*)responder delegate];
+        NSView* delegate = (NSView*) [(NSTextView*)responder delegate];

         if ( [delegate isKindOfClass:[NSTextField class] ] )
             view = delegate;
         else
         if ( [delegate isKindOfClass:[NSTextField class] ] )
             view = delegate;
         else


@@ -74,7 +71,7 @@ NSView* GetFocusedViewInWindow( NSWindow* keyWindow )
 
 WXWidget wxWidgetImpl::FindFocus()
 {
 
 WXWidget wxWidgetImpl::FindFocus()
 {

-    return GetFocusedViewInWindow( [[NSApplication sharedApplication] keyWindow] );
+    return GetFocusedViewInWindow( [NSApp keyWindow] );

 }
 
 NSRect wxOSXGetFrameForControl( wxWindowMac* window , const wxPoint& pos , const wxSize &size , bool adjustForOrigin )
 }
 
 NSRect wxOSXGetFrameForControl( wxWindowMac* window , const wxPoint& pos , const wxSize &size , bool adjustForOrigin )


@@ -91,11 +88,20 @@ NSRect wxOSXGetFrameForControl( wxWindowMac* window , const wxPoint& pos , const
 @interface wxNSView : NSView
 {
     NSTrackingRectTag rectTag;
 @interface wxNSView : NSView
 {
     NSTrackingRectTag rectTag;

+#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5
+    NSTrackingArea* _trackingArea;
+#endif

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

+#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5
+// under 10.5 we can also track mouse moved events on non-focused windows if
+// we use the new NSTrackingArea APIs. 
+- (void) updateTrackingArea;
+- (NSTrackingArea*) trackingArea;
+#endif

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


@@ -126,6 +132,8 @@ NSRect wxOSXGetFrameForControl( wxWindowMac* window , const wxPoint& pos , const
 - (void)setAction:(SEL)aSelector;
 - (void)setDoubleAction:(SEL)aSelector;
 - (void)setBackgroundColor:(NSColor*)aColor;
 - (void)setAction:(SEL)aSelector;
 - (void)setDoubleAction:(SEL)aSelector;
 - (void)setBackgroundColor:(NSColor*)aColor;

+- (void)setOpaque:(BOOL)opaque;
+- (void)setTextColor:(NSColor *)color;

 - (void)setImagePosition:(NSCellImagePosition)aPosition;
 @end
 
 - (void)setImagePosition:(NSCellImagePosition)aPosition;
 @end
 


@@ -302,7 +310,7 @@ void wxWidgetCocoaImpl::SetupKeyEvent(wxKeyEvent &wxevent , NSEvent * nsEvent, N
     wxString chars;
     if ( eventType != NSFlagsChanged )
     {
     wxString chars;
     if ( eventType != NSFlagsChanged )
     {

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

         if ( charString )
         {
             // if charString is set, it did not come from key up / key down
         if ( charString )
         {
             // if charString is set, it did not come from key up / key down


@@ -375,18 +383,40 @@ void wxWidgetCocoaImpl::SetupKeyEvent(wxKeyEvent &wxevent , NSEvent * nsEvent, N
 UInt32 g_lastButton = 0 ;
 bool g_lastButtonWasFakeRight = false ;
 
 UInt32 g_lastButton = 0 ;
 bool g_lastButtonWasFakeRight = false ;
 

+// better scroll wheel support 
+// see http://lists.apple.com/archives/cocoa-dev/2007/Feb/msg00050.html
+
+@interface NSEvent (DeviceDelta)
+- (CGFloat)deviceDeltaX;
+- (CGFloat)deviceDeltaY;
+@end
+

 void wxWidgetCocoaImpl::SetupMouseEvent( wxMouseEvent &wxevent , NSEvent * nsEvent )
 {
     int eventType = [nsEvent type];
     UInt32 modifiers = [nsEvent modifierFlags] ;
 void wxWidgetCocoaImpl::SetupMouseEvent( wxMouseEvent &wxevent , NSEvent * nsEvent )
 {
     int eventType = [nsEvent type];
     UInt32 modifiers = [nsEvent modifierFlags] ;

-    wxPoint screenMouseLocation = wxFromNSPoint( NULL, [nsEvent locationInWindow]);
+
+    NSPoint locationInWindow = [nsEvent locationInWindow];
+    
+    // adjust coordinates for the window of the target view
+    if ( [nsEvent window] != [m_osxView window] )
+    {
+        if ( [nsEvent window] != nil )
+            locationInWindow = [[nsEvent window] convertBaseToScreen:locationInWindow];
+
+        if ( [m_osxView window] != nil )
+            locationInWindow = [[m_osxView window] convertScreenToBase:locationInWindow];
+    }
+
+    NSPoint locationInView = [m_osxView convertPoint:locationInWindow fromView:nil];
+    wxPoint locationInViewWX = wxFromNSPoint( m_osxView, locationInView );

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

-    wxevent.m_x = screenMouseLocation.x;
-    wxevent.m_y = screenMouseLocation.y;
+    wxevent.m_x = locationInViewWX.x;
+    wxevent.m_y = locationInViewWX.y;

     wxevent.m_shiftDown = modifiers & NSShiftKeyMask;
     wxevent.m_controlDown = modifiers & NSControlKeyMask;
     wxevent.m_altDown = modifiers & NSAlternateKeyMask;
     wxevent.m_shiftDown = modifiers & NSShiftKeyMask;
     wxevent.m_controlDown = modifiers & NSControlKeyMask;
     wxevent.m_altDown = modifiers & NSAlternateKeyMask;


@@ -508,19 +538,43 @@ void wxWidgetCocoaImpl::SetupMouseEvent( wxMouseEvent &wxevent , NSEvent * nsEve
 
      case NSScrollWheel :
         {
 
      case NSScrollWheel :
         {

+            float deltaX = 0.0;
+            float deltaY = 0.0;
+

             wxevent.SetEventType( wxEVT_MOUSEWHEEL ) ;
             wxevent.SetEventType( wxEVT_MOUSEWHEEL ) ;

+
+            // see http://developer.apple.com/qa/qa2005/qa1453.html
+            // for more details on why we have to look for the exact type
+            
+            const EventRef cEvent = (EventRef) [nsEvent eventRef];
+            bool isMouseScrollEvent = false;
+            if ( cEvent )
+                isMouseScrollEvent = ::GetEventKind(cEvent) == kEventMouseScroll;
+                
+            if ( isMouseScrollEvent )
+            {
+                deltaX = [nsEvent deviceDeltaX];
+                deltaY = [nsEvent deviceDeltaY];
+            }
+            else
+            {
+                deltaX = ([nsEvent deltaX] * 10);
+                deltaY = ([nsEvent deltaY] * 10);
+            }
+            

             wxevent.m_wheelDelta = 10;
             wxevent.m_linesPerAction = 1;
             wxevent.m_wheelDelta = 10;
             wxevent.m_linesPerAction = 1;

-
-            if ( fabs([nsEvent deltaX]) > fabs([nsEvent deltaY]) )
+                
+            if ( fabs(deltaX) > fabs(deltaY) )

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

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

             }
             else
             {
             }
             else
             {

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

             }
             }

+

         }
         break ;
 
         }
         break ;
 


@@ -571,6 +625,28 @@ void wxWidgetCocoaImpl::SetupMouseEvent( wxMouseEvent &wxevent , NSEvent * nsEve
     return rectTag;
 }
 
     return rectTag;
 }
 

+#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5
+- (void) updateTrackingArea
+{
+    if (_trackingArea)
+    {
+        [self removeTrackingArea: _trackingArea];
+        [_trackingArea release];
+    }
+    
+    NSTrackingAreaOptions options = NSTrackingMouseEnteredAndExited|NSTrackingMouseMoved|NSTrackingActiveAlways;
+        
+    NSTrackingArea* area = [[NSTrackingArea alloc] initWithRect: [self bounds] options: options owner: self userInfo: nil];
+    [self addTrackingArea: area];
+
+    _trackingArea = area;
+}
+
+- (NSTrackingArea*) trackingArea
+{
+    return _trackingArea;
+}
+#endif

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


@@ -629,6 +705,13 @@ void wxOSX_mouseEvent(NSView* self, SEL _cmd, NSEvent *event)
     impl->mouseEvent(event, self, _cmd);
 }
 
     impl->mouseEvent(event, self, _cmd);
 }
 

+BOOL wxOSX_acceptsFirstMouse(NSView* WXUNUSED(self), SEL WXUNUSED(_cmd), NSEvent *WXUNUSED(event))
+{
+    // This is needed to support click through, otherwise the first click on a window
+    // will not do anything unless it is the active window already.
+    return YES;
+}
+

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


@@ -701,12 +784,34 @@ BOOL wxOSX_isFlipped(NSView* self, SEL _cmd)
     return impl->isFlipped(self, _cmd) ? YES:NO;
 }
 
     return impl->isFlipped(self, _cmd) ? YES:NO;
 }
 

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

 void wxOSX_drawRect(NSView* self, SEL _cmd, NSRect rect)
 {
     wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
     if (impl == NULL)
         return;
 
 void wxOSX_drawRect(NSView* self, SEL _cmd, NSRect rect)
 {
     wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
     if (impl == NULL)
         return;
 

+#ifdef wxUSE_THREADS
+    // OS X starts a NSUIHeartBeatThread for animating the default button in a
+    // dialog. This causes a drawRect of the active dialog from outside the
+    // main UI thread. This causes an occasional crash since the wx drawing
+    // objects (like wxPen) are not thread safe.
+    //
+    // Notice that NSUIHeartBeatThread seems to be undocumented and doing
+    // [NSWindow setAllowsConcurrentViewDrawing:NO] does not affect it.
+    if ( !wxThread::IsMain() )
+    {
+      // just call the superclass handler, we don't need any custom wx drawing
+      // here and it seems to work fine:
+      wxOSX_DrawRectHandlerPtr
+          superimpl = (wxOSX_DrawRectHandlerPtr)
+                        [[self superclass] instanceMethodForSelector:_cmd];
+      superimpl(self, _cmd, rect);
+      return;
+    }
+#endif // wxUSE_THREADS
+

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


@@ -818,7 +923,7 @@ unsigned int wxWidgetCocoaImpl::draggingUpdated(void* s, WXWidget WXUNUSED(slf),
         result = wxDragCopy;
     else if ( sourceDragMask & NSDragOperationMove )
         result = wxDragMove;
         result = wxDragCopy;
     else if ( sourceDragMask & NSDragOperationMove )
         result = wxDragMove;

-
+    

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


@@ -877,14 +982,13 @@ 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_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_DrawRectHandlerPtr)(NSView* self, SEL _cmd, NSRect rect);

 
 void wxWidgetCocoaImpl::mouseEvent(WX_NSEvent event, WXWidget slf, void *_cmd)
 {
     if ( !DoHandleMouseEvent(event) )
     {
         // for plain NSView mouse events would propagate to parents otherwise
 
 void wxWidgetCocoaImpl::mouseEvent(WX_NSEvent event, WXWidget slf, void *_cmd)
 {
     if ( !DoHandleMouseEvent(event) )
     {
         // for plain NSView mouse events would propagate to parents otherwise

-        if (!m_wxPeer->MacIsUserPane())
+        if (!IsUserPane())

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


@@ -895,7 +999,15 @@ void wxWidgetCocoaImpl::mouseEvent(WX_NSEvent event, WXWidget slf, void *_cmd)
 void wxWidgetCocoaImpl::keyEvent(WX_NSEvent event, WXWidget slf, void *_cmd)
 {
     if ( [event type] == NSKeyDown )
 void wxWidgetCocoaImpl::keyEvent(WX_NSEvent event, WXWidget slf, void *_cmd)
 {
     if ( [event type] == NSKeyDown )

+    {
+        // there are key equivalents that are not command-combos and therefore not handled by cocoa automatically, 
+        // therefore we call the menubar directly here, exit if the menu is handling the shortcut
+        if ( [[[NSApplication sharedApplication] mainMenu] performKeyEquivalent:event] )
+            return;
+    

         m_lastKeyDownEvent = event;
         m_lastKeyDownEvent = event;

+    }
+    

     if ( GetFocusedViewInWindow([slf window]) != slf || m_hasEditor || !DoHandleKeyEvent(event) )
     {
         wxOSX_EventHandlerPtr superimpl = (wxOSX_EventHandlerPtr) [[slf superclass] instanceMethodForSelector:(SEL)_cmd];
     if ( GetFocusedViewInWindow([slf window]) != slf || m_hasEditor || !DoHandleKeyEvent(event) )
     {
         wxOSX_EventHandlerPtr superimpl = (wxOSX_EventHandlerPtr) [[slf superclass] instanceMethodForSelector:(SEL)_cmd];


@@ -916,13 +1028,41 @@ void wxWidgetCocoaImpl::insertText(NSString* text, WXWidget slf, void *_cmd)
 
 bool wxWidgetCocoaImpl::performKeyEquivalent(WX_NSEvent event, WXWidget slf, void *_cmd)
 {
 
 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 handled = false;
+    
+    wxKeyEvent wxevent(wxEVT_KEY_DOWN);
+    SetupKeyEvent( wxevent, event );
+   
+    // because performKeyEquivalent is going up the entire view hierarchy, we don't have to
+    // walk up the ancestors ourselves but let cocoa do it
+    
+    int command = m_wxPeer->GetAcceleratorTable()->GetCommand( wxevent );
+    if (command != -1)
+    {
+        wxEvtHandler * const handler = m_wxPeer->GetEventHandler();
+        
+        wxCommandEvent command_event( wxEVT_COMMAND_MENU_SELECTED, command );
+        handled = handler->ProcessEvent( command_event );
+        
+        if ( !handled )
+        {
+            // accelerators can also be used with buttons, try them too
+            command_event.SetEventType(wxEVT_COMMAND_BUTTON_CLICKED);
+            handled = handler->ProcessEvent( command_event );
+        }
+    }
+    
+    if ( !handled )
+    {
+        wxOSX_PerformKeyEventHandlerPtr superimpl = (wxOSX_PerformKeyEventHandlerPtr) [[slf superclass] instanceMethodForSelector:(SEL)_cmd];
+        return superimpl(slf, (SEL)_cmd, event);
+    }
+    return YES;

 }
 
 bool wxWidgetCocoaImpl::acceptsFirstResponder(WXWidget slf, void *_cmd)
 {
 }
 
 bool wxWidgetCocoaImpl::acceptsFirstResponder(WXWidget slf, void *_cmd)
 {

-    if ( m_wxPeer->MacIsUserPane() )
+    if ( IsUserPane() )

         return m_wxPeer->AcceptsFocus();
     else
     {
         return m_wxPeer->AcceptsFocus();
     else
     {


@@ -956,6 +1096,15 @@ bool wxWidgetCocoaImpl::resignFirstResponder(WXWidget slf, void *_cmd)
     // is resigning
     NSView* otherView = FindFocus();
     wxWidgetImpl* otherWindow = FindFromWXWidget(otherView);
     // is resigning
     NSView* otherView = FindFocus();
     wxWidgetImpl* otherWindow = FindFromWXWidget(otherView);

+
+    // It doesn't make sense to notify about the loss of focus if we're not
+    // really losing it and the window which has just gained focus is the same
+    // one as this window itself. Of course, this should never happen in the
+    // first place but somehow it does in wxGrid code and without this check we
+    // enter into an infinite recursion, see #12267.
+    if ( otherWindow == this )
+        return r;
+

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


@@ -994,13 +1143,46 @@ bool wxWidgetCocoaImpl::isFlipped(WXWidget WXUNUSED(slf), void *WXUNUSED(_cmd))
 
 void wxWidgetCocoaImpl::drawRect(void* rect, WXWidget slf, void *WXUNUSED(_cmd))
 {
 
 void wxWidgetCocoaImpl::drawRect(void* rect, WXWidget slf, void *WXUNUSED(_cmd))
 {

+    // preparing the update region
+    
+    wxRegion updateRgn;
+    const NSRect *rects;
+    NSInteger count;
+
+    [slf getRectsBeingDrawn:&rects count:&count];
+    for ( int i = 0 ; i < count ; ++i )
+    {
+        updateRgn.Union(wxFromNSRect(slf, rects[i]));
+    }
+
+    wxWindow* wxpeer = GetWXPeer();
+
+    if ( wxpeer->MacGetLeftBorderSize() != 0 || wxpeer->MacGetTopBorderSize() != 0 )
+    {
+        // as this update region is in native window locals we must adapt it to wx window local
+        updateRgn.Offset( wxpeer->MacGetLeftBorderSize() , wxpeer->MacGetTopBorderSize() );
+    }
+    
+    if ( wxpeer->MacGetTopLevelWindow()->GetWindowStyle() & wxFRAME_SHAPED )
+    {
+        int xoffset = 0, yoffset = 0;
+        wxRegion rgn = wxpeer->MacGetTopLevelWindow()->GetShape();
+        wxpeer->MacRootWindowToWindow( &xoffset, &yoffset );
+        rgn.Offset( xoffset, yoffset );
+        updateRgn.Intersect(rgn);
+    }
+    
+    wxpeer->GetUpdateRegion() = updateRgn;
+
+    // setting up the drawing context
+    

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

-    NSRect bounds = [self bounds];
+    NSRect bounds = [slf bounds];

     CGContextAddLineToPoint(context, 10, 0);
     CGContextMoveToPoint(context, 0, 0);
     CGContextAddLineToPoint(context, 0, 10);
     CGContextAddLineToPoint(context, 10, 0);
     CGContextMoveToPoint(context, 0, 0);
     CGContextAddLineToPoint(context, 0, 10);


@@ -1011,29 +1193,16 @@ void wxWidgetCocoaImpl::drawRect(void* rect, WXWidget slf, void *WXUNUSED(_cmd))
     CGContextClosePath( context );
     CGContextStrokePath(context);
 #endif
     CGContextClosePath( context );
     CGContextStrokePath(context);
 #endif

-
+    

     if ( !m_isFlipped )
     {
         CGContextTranslateCTM( context, 0,  [m_osxView bounds].size.height );
         CGContextScaleCTM( context, 1, -1 );
     }
     if ( !m_isFlipped )
     {
         CGContextTranslateCTM( context, 0,  [m_osxView bounds].size.height );
         CGContextScaleCTM( context, 1, -1 );
     }

-
-    wxRegion updateRgn;
-    const NSRect *rects;
-    NSInteger count;
-
-    [slf getRectsBeingDrawn:&rects count:&count];
-    for ( int i = 0 ; i < count ; ++i )
-    {
-        updateRgn.Union(wxFromNSRect(slf, rects[i]) );
-    }
-
-    wxWindow* wxpeer = GetWXPeer();
-    wxpeer->GetUpdateRegion() = updateRgn;
+    

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

-

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


@@ -1046,6 +1215,12 @@ void wxWidgetCocoaImpl::drawRect(void* rect, WXWidget slf, void *WXUNUSED(_cmd))
         CGContextRestoreGState( context );
         CGContextSaveGState( context );
     }
         CGContextRestoreGState( context );
         CGContextSaveGState( context );
     }

+    // as we called restore above, we have to flip again if necessary
+    if ( !m_isFlipped )
+    {
+        CGContextTranslateCTM( context, 0,  [m_osxView bounds].size.height );
+        CGContextScaleCTM( context, 1, -1 );
+    }

     wxpeer->MacPaintChildrenBorders();
     wxpeer->MacSetCGContextRef( NULL );
     CGContextRestoreGState( context );
     wxpeer->MacPaintChildrenBorders();
     wxpeer->MacSetCGContextRef( NULL );
     CGContextRestoreGState( context );


@@ -1062,6 +1237,25 @@ void wxWidgetCocoaImpl::controlDoubleAction( WXWidget WXUNUSED(slf), void *WXUNU
 {
 }
 
 {
 }
 

+void wxWidgetCocoaImpl::controlTextDidChange()
+{
+    wxWindow* wxpeer = (wxWindow*)GetWXPeer();
+    if ( wxpeer ) 
+    {
+        // since native rtti doesn't have to be enabled and wx' rtti is not aware of the mixin wxTextEntry, workaround is needed
+        wxTextCtrl *tc = wxDynamicCast( wxpeer , wxTextCtrl );
+        wxComboBox *cb = wxDynamicCast( wxpeer , wxComboBox );
+        if ( tc )
+            tc->SendTextUpdatedEventIfAllowed();
+        else if ( cb )
+            cb->SendTextUpdatedEventIfAllowed();
+        else 
+        {
+            wxFAIL_MSG("Unexpected class for controlTextDidChange event");
+        }
+    }
+}
+

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


@@ -1072,7 +1266,7 @@ void wxWidgetCocoaImpl::controlDoubleAction( WXWidget WXUNUSED(slf), void *WXUNU
 #else
 
 #define wxOSX_CLASS_ADD_METHOD( c, s, i, t ) \
 #else
 
 #define wxOSX_CLASS_ADD_METHOD( c, s, i, t ) \

-    { s, t, i },
+    { s, (char*) t, i },

 
 #endif
 
 
 #endif
 


@@ -1097,6 +1291,8 @@ void wxOSXCocoaClassAddWXMethods(Class c)
     wxOSX_CLASS_ADD_METHOD(c, @selector(mouseDragged:), (IMP) wxOSX_mouseEvent, "v@:@" )
     wxOSX_CLASS_ADD_METHOD(c, @selector(rightMouseDragged:), (IMP) wxOSX_mouseEvent, "v@:@" )
     wxOSX_CLASS_ADD_METHOD(c, @selector(otherMouseDragged:), (IMP) wxOSX_mouseEvent, "v@:@" )
     wxOSX_CLASS_ADD_METHOD(c, @selector(mouseDragged:), (IMP) wxOSX_mouseEvent, "v@:@" )
     wxOSX_CLASS_ADD_METHOD(c, @selector(rightMouseDragged:), (IMP) wxOSX_mouseEvent, "v@:@" )
     wxOSX_CLASS_ADD_METHOD(c, @selector(otherMouseDragged:), (IMP) wxOSX_mouseEvent, "v@:@" )

+    
+    wxOSX_CLASS_ADD_METHOD(c, @selector(acceptsFirstMouse:), (IMP) wxOSX_acceptsFirstMouse, "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(scrollWheel:), (IMP) wxOSX_mouseEvent, "v@:@" )
     wxOSX_CLASS_ADD_METHOD(c, @selector(mouseEntered:), (IMP) wxOSX_mouseEvent, "v@:@" )


@@ -1149,8 +1345,8 @@ void wxOSXCocoaClassAddWXMethods(Class c)
 
 IMPLEMENT_DYNAMIC_CLASS( wxWidgetCocoaImpl , wxWidgetImpl )
 
 
 IMPLEMENT_DYNAMIC_CLASS( wxWidgetCocoaImpl , wxWidgetImpl )
 

-wxWidgetCocoaImpl::wxWidgetCocoaImpl( wxWindowMac* peer , WXWidget w, bool isRootControl ) :
-    wxWidgetImpl( peer, isRootControl )
+wxWidgetCocoaImpl::wxWidgetCocoaImpl( wxWindowMac* peer , WXWidget w, bool isRootControl, bool isUserPane ) :
+    wxWidgetImpl( peer, isRootControl, isUserPane )

 {
     Init();
     m_osxView = w;
 {
     Init();
     m_osxView = w;


@@ -1180,8 +1376,6 @@ void wxWidgetCocoaImpl::Init()
 
 wxWidgetCocoaImpl::~wxWidgetCocoaImpl()
 {
 
 wxWidgetCocoaImpl::~wxWidgetCocoaImpl()
 {

-    StopAnimation(m_wxPeer);
-

     RemoveAssociations( this );
 
     if ( !IsRootControl() )
     RemoveAssociations( this );
 
     if ( !IsRootControl() )


@@ -1209,72 +1403,40 @@ void wxWidgetCocoaImpl::SetVisibility( bool visible )
 // window animation stuff
 // ----------------------------------------------------------------------------
 
 // window animation stuff
 // ----------------------------------------------------------------------------
 

-namespace
-{
-
-WX_DECLARE_VOIDPTR_HASH_MAP(NSViewAnimation *, wxNSViewAnimations);
-
-// all currently active animations
-//
-// this is MT-safe because windows can only be animated from the main
-// thread anyhow
-wxNSViewAnimations gs_activeAnimations;
-
-void StopAnimation(wxWindow *win)
+// define a delegate used to refresh the window during animation
+@interface wxNSAnimationDelegate : NSObject wxOSX_10_6_AND_LATER(<NSAnimationDelegate>)

 {
 {

-    wxNSViewAnimations::iterator it = gs_activeAnimations.find(win);
-    if ( it != gs_activeAnimations.end() )
-    {
-        [it->second stopAnimation];
-    }
-}
-
-} // anonymous namespace
-
-// define a delegate used to detect the end of the window animation
-@interface wxNSAnimationDelegate : NSObject
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6
-                                   <NSAnimationDelegate>
-#endif
-{
-    // can't use wxRect here as it has a user-defined ctor and so can't be used
-    // as an Objective-C field
-    struct
-    {
-        int x, y, w, h;
-    } m_origRect;

     wxWindow *m_win;
     wxWindow *m_win;

-    bool m_show;
+    bool m_isDone;

 }
 
 }
 

-- (id)initWithWindow:(wxWindow *)win show:(bool)show;
+- (id)init:(wxWindow *)win;
+
+- (bool)isDone;

 
 // NSAnimationDelegate methods
 
 // NSAnimationDelegate methods

+- (void)animationDidEnd:(NSAnimation*)animation;

 - (void)animation:(NSAnimation*)animation
         didReachProgressMark:(NSAnimationProgress)progress;
 - (void)animation:(NSAnimation*)animation
         didReachProgressMark:(NSAnimationProgress)progress;

-- (void)animationDidStop:(NSAnimation *)animation;
-- (void)animationDidEnd:(NSAnimation *)animation;
-
-// private helpers
-- (void)finishAnimation:(NSAnimation *)animation;

 @end
 
 @implementation wxNSAnimationDelegate
 
 @end
 
 @implementation wxNSAnimationDelegate
 

-- (id)initWithWindow:(wxWindow *)win show:(bool)show
+- (id)init:(wxWindow *)win

 {
     [super init];
 
     m_win = win;
 {
     [super init];
 
     m_win = win;

-    m_show = show;
-    if ( !show )
-    {
-        m_win->GetPosition(&m_origRect.x, &m_origRect.y);
-        m_win->GetSize(&m_origRect.w, &m_origRect.h);
-    }
+    m_isDone = false;
+

     return self;
 }
 
     return self;
 }
 

+- (bool)isDone
+{
+    return m_isDone;
+}
+

 - (void)animation:(NSAnimation*)animation
         didReachProgressMark:(NSAnimationProgress)progress
 {
 - (void)animation:(NSAnimation*)animation
         didReachProgressMark:(NSAnimationProgress)progress
 {


@@ -1284,49 +1446,10 @@ void StopAnimation(wxWindow *win)
     m_win->SendSizeEvent();
 }
 
     m_win->SendSizeEvent();
 }
 

-- (void)animationDidStop:(NSAnimation *)animation
-{
-    [self finishAnimation:animation];
-}
-
-- (void)animationDidEnd:(NSAnimation *)animation
+- (void)animationDidEnd:(NSAnimation*)animation

 {
 {

-    [self finishAnimation:animation];
-}
-
-- (void)finishAnimation:(NSAnimation *)animation
-{
-    if ( m_show )
-    {
-        // the window expects to be sent a size event when it is shown normally
-        // and so it should also get one when it is shown with effect
-        m_win->SendSizeEvent();
-    }
-    else // window was being hidden
-    {
-        // NSViewAnimation is smart enough to hide the NSView itself but we
-        // also need to ensure that it's considered to be hidden at wx level
-        m_win->Hide();
-
-        // and we also need to restore its original size which was changed by
-        // the animation
-        m_win->SetSize(m_origRect.x, m_origRect.y, m_origRect.w, m_origRect.h);
-    }
-
-    wxNSViewAnimations::iterator it = gs_activeAnimations.find(m_win);
-    wxASSERT_MSG( it != gs_activeAnimations.end() && it->second == animation,
-                  "corrupted active animations list?" );
-
-    gs_activeAnimations.erase(it);
-
-    // we don't dare to release it immediately as we're called from its code
-    // but schedule the animation itself for deletion soon
-    [animation autorelease];
-
-    // ensure that this delegate is definitely not needed any more before
-    // destroying it
-    [animation setDelegate:nil];
-    [self release];
+    wxUnusedVar(animation);
+    m_isDone = true;

 }
 
 @end
 }
 
 @end


@@ -1338,13 +1461,6 @@ wxWidgetCocoaImpl::ShowViewOrWindowWithEffect(wxWindow *win,
                                               wxShowEffect effect,
                                               unsigned timeout)
 {
                                               wxShowEffect effect,
                                               unsigned timeout)
 {

-    // first of all, check if this window is not being already animated and
-    // cancel the previous animation if it is as performing more than one
-    // animation on the same window at the same time results in some really
-    // unexpected effects
-    StopAnimation(win);
-
-

     // create the dictionary describing the animation to perform on this view
     NSObject * const
         viewOrWin = static_cast<NSObject *>(win->OSXGetViewOrWindow());
     // create the dictionary describing the animation to perform on this view
     NSObject * const
         viewOrWin = static_cast<NSObject *>(win->OSXGetViewOrWindow());


@@ -1353,10 +1469,11 @@ wxWidgetCocoaImpl::ShowViewOrWindowWithEffect(wxWindow *win,
     [dict setObject:viewOrWin forKey:NSViewAnimationTargetKey];
 
     // determine the start and end rectangles assuming we're hiding the window
     [dict setObject:viewOrWin forKey:NSViewAnimationTargetKey];
 
     // determine the start and end rectangles assuming we're hiding the window

+    const wxRect rectOrig = win->GetRect();

     wxRect rectStart,
            rectEnd;
     rectStart =
     wxRect rectStart,
            rectEnd;
     rectStart =

-    rectEnd = win->GetRect();
+    rectEnd = rectOrig;

 
     if ( show )
     {
 
     if ( show )
     {


@@ -1431,7 +1548,7 @@ wxWidgetCocoaImpl::ShowViewOrWindowWithEffect(wxWindow *win,
         // animation to be visible at all (but don't restore it at its full
         // rectangle as it shouldn't appear immediately)
         win->SetSize(rectStart);
         // animation to be visible at all (but don't restore it at its full
         // rectangle as it shouldn't appear immediately)
         win->SetSize(rectStart);

-        win->Show(true);
+        win->Show();

     }
 
     NSView * const parentView = [viewOrWin isKindOfClass:[NSView class]]
     }
 
     NSView * const parentView = [viewOrWin isKindOfClass:[NSView class]]


@@ -1446,13 +1563,9 @@ wxWidgetCocoaImpl::ShowViewOrWindowWithEffect(wxWindow *win,
           forKey:NSViewAnimationEndFrameKey];
 
     // create an animation using the values in the above dictionary
           forKey:NSViewAnimationEndFrameKey];
 
     // create an animation using the values in the above dictionary

-    //
-    // notice that it will be released when it is removed from
-    // gs_activeAnimations

     NSViewAnimation * const
         anim = [[NSViewAnimation alloc]
                 initWithViewAnimations:[NSArray arrayWithObject:dict]];
     NSViewAnimation * const
         anim = [[NSViewAnimation alloc]
                 initWithViewAnimations:[NSArray arrayWithObject:dict]];

-    gs_activeAnimations[win] = anim;

 
     if ( !timeout )
     {
 
     if ( !timeout )
     {


@@ -1472,9 +1585,47 @@ wxWidgetCocoaImpl::ShowViewOrWindowWithEffect(wxWindow *win,
     for ( float f = 1./NUM_LAYOUTS; f < 1.; f += 1./NUM_LAYOUTS )
         [anim addProgressMark:f];
 
     for ( float f = 1./NUM_LAYOUTS; f < 1.; f += 1./NUM_LAYOUTS )
         [anim addProgressMark:f];
 

-    [anim setDelegate:[[wxNSAnimationDelegate alloc] initWithWindow:win show:show]];
+    wxNSAnimationDelegate * const
+        animDelegate = [[wxNSAnimationDelegate alloc] init:win];
+    [anim setDelegate:animDelegate];

     [anim startAnimation];
 
     [anim startAnimation];
 

+    // Cocoa is capable of doing animation asynchronously or even from separate
+    // thread but wx API doesn't provide any way to be notified about the
+    // animation end and without this we really must ensure that the window has
+    // the expected (i.e. the same as if a simple Show() had been used) size
+    // when we return, so block here until the animation finishes
+    //
+    // notice that because the default animation mode is NSAnimationBlocking,
+    // no user input events ought to be processed from here
+    {
+        wxEventLoopGuarantor ensureEventLoopExistence;
+        wxEventLoopBase * const loop = wxEventLoopBase::GetActive();
+        while ( ![animDelegate isDone] )
+            loop->Dispatch();
+    }
+
+    if ( !show )
+    {
+        // NSViewAnimation is smart enough to hide the NSView being animated at
+        // the end but we also must ensure that it's hidden for wx too
+        win->Hide();
+
+        // and we must also restore its size because it isn't expected to
+        // change just because the window was hidden
+        win->SetSize(rectOrig);
+    }
+    else
+    {
+        // refresh it once again after the end to ensure that everything is in
+        // place
+        win->SendSizeEvent();
+    }
+
+    [anim setDelegate:nil];
+    [animDelegate release];
+    [anim release];
+

     return true;
 }
 
     return true;
 }
 


@@ -1531,13 +1682,19 @@ void wxWidgetCocoaImpl::Move(int x, int y, int width, int height)
     [m_osxView setFrame:r];
     [[m_osxView superview] setNeedsDisplayInRect:r];
 
     [m_osxView setFrame:r];
     [[m_osxView superview] setNeedsDisplayInRect:r];
 

+    wxNSView* wxview = (wxNSView*)m_osxView;
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5
+    if ([wxview respondsToSelector:@selector(updateTrackingArea)] )
+        [wxview updateTrackingArea]; 
+#else

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

-        if ( [(wxNSView*)m_osxView trackingTag] )
-            [m_osxView removeTrackingRect: [(wxNSView*)m_osxView trackingTag]];
+        if ( [wxview trackingTag] )
+            [wxview removeTrackingRect: [wxview trackingTag]];

 
 

-        [(wxNSView*)m_osxView setTrackingTag: [m_osxView addTrackingRect: [m_osxView bounds] owner: m_osxView userData: nil assumeInside: NO]];
+        [wxview setTrackingTag: [wxview addTrackingRect: [m_osxView bounds] owner: wxview userData: nil assumeInside: NO]];

     }
     }

+#endif

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


@@ -1545,6 +1702,20 @@ void wxWidgetCocoaImpl::GetPosition( int &x, int &y ) const
     wxRect r = wxFromNSRect( [m_osxView superview], [m_osxView frame] );
     x = r.GetLeft();
     y = r.GetTop();
     wxRect r = wxFromNSRect( [m_osxView superview], [m_osxView frame] );
     x = r.GetLeft();
     y = r.GetTop();

+    
+    // under Cocoa we might have a contentView in the wxParent to which we have to
+    // adjust the coordinates
+    wxWindowMac* parent = GetWXPeer()->GetParent();
+    if (parent && [m_osxView superview] != parent->GetHandle() )
+    {
+        int cx = 0,cy = 0,cw = 0,ch = 0;
+        if ( parent->GetPeer() )
+        {
+            parent->GetPeer()->GetContentArea(cx, cy, cw, ch);
+            x += cx;
+            y += cy;
+        }
+    }

 }
 
 void wxWidgetCocoaImpl::GetSize( int &width, int &height ) const
 }
 
 void wxWidgetCocoaImpl::GetSize( int &width, int &height ) const


@@ -1604,11 +1775,11 @@ bool wxWidgetCocoaImpl::HasFocus() const
 
 bool wxWidgetCocoaImpl::SetFocus()
 {
 
 bool wxWidgetCocoaImpl::SetFocus()
 {

-    if ( [m_osxView canBecomeKeyView] == NO )
+    if ( !CanFocus() )

         return false;
 
         return false;
 

-    [[m_osxView window] makeFirstResponder: m_osxView] ;

     [[m_osxView window] makeKeyAndOrderFront:nil] ;
     [[m_osxView window] makeKeyAndOrderFront:nil] ;

+    [[m_osxView window] makeFirstResponder: m_osxView] ;

     return true;
 }
 
     return true;
 }
 


@@ -1640,6 +1811,18 @@ void wxWidgetCocoaImpl::SetBackgroundColour( const wxColour &col )
     }
 }
 
     }
 }
 

+bool wxWidgetCocoaImpl::SetBackgroundStyle( wxBackgroundStyle style )
+{
+    BOOL opaque = ( style == wxBG_STYLE_PAINT );
+    
+    if ( [m_osxView respondsToSelector:@selector(setOpaque:) ] )
+    {
+        [m_osxView setOpaque: opaque];
+    }
+    
+    return true ;
+}
+

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


@@ -1701,7 +1884,7 @@ void wxWidgetCocoaImpl::SetMaximum( wxInt32 v )
 
 wxInt32 wxWidgetCocoaImpl::GetMinimum() const
 {
 
 wxInt32 wxWidgetCocoaImpl::GetMinimum() const
 {

-    if (  [m_osxView respondsToSelector:@selector(getMinValue:)] )
+    if (  [m_osxView respondsToSelector:@selector(minValue)] )

     {
         return (int)[m_osxView minValue];
     }
     {
         return (int)[m_osxView minValue];
     }


@@ -1710,7 +1893,7 @@ wxInt32 wxWidgetCocoaImpl::GetMinimum() const
 
 wxInt32 wxWidgetCocoaImpl::GetMaximum() const
 {
 
 wxInt32 wxWidgetCocoaImpl::GetMaximum() const
 {

-    if (  [m_osxView respondsToSelector:@selector(getMaxValue:)] )
+    if (  [m_osxView respondsToSelector:@selector(maxValue)] )

     {
         return (int)[m_osxView maxValue];
     }
     {
         return (int)[m_osxView maxValue];
     }


@@ -1735,6 +1918,7 @@ void wxWidgetCocoaImpl::SetBitmap( const wxBitmap& bitmap )
     if (  [m_osxView respondsToSelector:@selector(setImage:)] )
     {
         [m_osxView setImage:bitmap.GetNSImage()];
     if (  [m_osxView respondsToSelector:@selector(setImage:)] )
     {
         [m_osxView setImage:bitmap.GetNSImage()];

+        [m_osxView setNeedsDisplay:YES];

     }
 }
 
     }
 }
 


@@ -1792,15 +1976,23 @@ void wxWidgetCocoaImpl::GetBestRect( wxRect *r ) const
 
 bool wxWidgetCocoaImpl::IsEnabled() const
 {
 
 bool wxWidgetCocoaImpl::IsEnabled() const
 {

-    if ( [m_osxView respondsToSelector:@selector(isEnabled) ] )
-        return [m_osxView isEnabled];
+    NSView* targetView = m_osxView;
+    if ( [m_osxView isKindOfClass:[NSScrollView class] ] )
+        targetView = [(NSScrollView*) m_osxView documentView];
+
+    if ( [targetView respondsToSelector:@selector(isEnabled) ] )
+        return [targetView isEnabled];

     return true;
 }
 
 void wxWidgetCocoaImpl::Enable( bool enable )
 {
     return true;
 }
 
 void wxWidgetCocoaImpl::Enable( bool enable )
 {

-    if ( [m_osxView respondsToSelector:@selector(setEnabled:) ] )
-        [m_osxView setEnabled:enable];
+    NSView* targetView = m_osxView;
+    if ( [m_osxView isKindOfClass:[NSScrollView class] ] )
+        targetView = [(NSScrollView*) m_osxView documentView];
+
+    if ( [targetView respondsToSelector:@selector(setEnabled:) ] )
+        [targetView setEnabled:enable];

 }
 
 void wxWidgetCocoaImpl::PulseGauge()
 }
 
 void wxWidgetCocoaImpl::PulseGauge()


@@ -1847,10 +2039,27 @@ void wxWidgetCocoaImpl::SetControlSize( wxWindowVariant variant )
     }
 }
 
     }
 }
 

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

 {
     if ([m_osxView respondsToSelector:@selector(setFont:)])
         [m_osxView setFont: font.OSXGetNSFont()];
 {
     if ([m_osxView respondsToSelector:@selector(setFont:)])
         [m_osxView setFont: font.OSXGetNSFont()];

+    if ([m_osxView respondsToSelector:@selector(setTextColor:)])
+        [m_osxView setTextColor:[NSColor colorWithCalibratedRed:(CGFloat) (col.Red() / 255.0)
+                                                                 green:(CGFloat) (col.Green() / 255.0)
+                                                                  blue:(CGFloat) (col.Blue() / 255.0)
+                                                                 alpha:(CGFloat) (col.Alpha() / 255.0)]];
+}
+
+void wxWidgetCocoaImpl::SetToolTip(wxToolTip* tooltip)
+{
+    if (tooltip)
+    {
+        wxCFStringRef cf( tooltip->GetTip() , m_wxPeer->GetFont().GetEncoding() );
+        [m_osxView setToolTip: cf.AsNSString()];
+    }
+    else 
+        [m_osxView setToolTip: nil];
+

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


@@ -1886,15 +2095,28 @@ bool wxWidgetCocoaImpl::DoHandleKeyEvent(NSEvent *event)
     // this will fire higher level events, like insertText, to help
     // us handle EVT_CHAR, etc.
 
     // this will fire higher level events, like insertText, to help
     // us handle EVT_CHAR, etc.
 

-    if ( m_wxPeer->MacIsUserPane() && [event type] == NSKeyDown)
+    if ( IsUserPane() && [event type] == NSKeyDown)

     {
         if ( !result )
         {
     {
         if ( !result )
         {

-            if ( [m_osxView isKindOfClass:[NSScrollView class] ] )
-                [[(NSScrollView*)m_osxView documentView] interpretKeyEvents:[NSArray arrayWithObject:event]];
+            if ( wxevent.GetKeyCode() < WXK_SPACE || wxevent.GetKeyCode() == WXK_DELETE || wxevent.GetKeyCode() >= WXK_START )
+            {
+                // eventually we could setup a doCommandBySelector catcher and retransform this into the wx key chars
+                wxKeyEvent wxevent2(wxevent) ;
+                wxevent2.SetEventType(wxEVT_CHAR);
+                result = GetWXPeer()->OSXHandleKeyEvent(wxevent2);
+            }

             else
             else

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

         }
     }
 
         }
     }
 


@@ -1903,13 +2125,8 @@ bool wxWidgetCocoaImpl::DoHandleKeyEvent(NSEvent *event)
 
 bool wxWidgetCocoaImpl::DoHandleMouseEvent(NSEvent *event)
 {
 
 bool wxWidgetCocoaImpl::DoHandleMouseEvent(NSEvent *event)
 {

-    NSPoint clickLocation;
-    clickLocation = [m_osxView convertPoint:[event locationInWindow] fromView:nil];
-    wxPoint pt = wxFromNSPoint( m_osxView, clickLocation );

     wxMouseEvent wxevent(wxEVT_LEFT_DOWN);
     SetupMouseEvent(wxevent , event) ;
     wxMouseEvent wxevent(wxEVT_LEFT_DOWN);
     SetupMouseEvent(wxevent , event) ;

-    wxevent.m_x = pt.x;
-    wxevent.m_y = pt.y;

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


@@ -1958,13 +2175,16 @@ void wxWidgetCocoaImpl::DoNotifyFocusEvent(bool receivedFocus, wxWidgetImpl* oth
 
 void wxWidgetCocoaImpl::SetCursor(const wxCursor& cursor)
 {
 
 void wxWidgetCocoaImpl::SetCursor(const wxCursor& cursor)
 {

-    NSPoint location = [NSEvent mouseLocation];
-    location = [[m_osxView window] convertScreenToBase:location];
-    NSPoint locationInView = [m_osxView convertPoint:location fromView:nil];
-
-    if( NSMouseInRect(locationInView, [m_osxView bounds], YES) )
+    if ( !wxIsBusy() )

     {
     {

-        [(NSCursor*)cursor.GetHCURSOR() set];
+        NSPoint location = [NSEvent mouseLocation];
+        location = [[m_osxView window] convertScreenToBase:location];
+        NSPoint locationInView = [m_osxView convertPoint:location fromView:nil];
+
+        if( NSMouseInRect(locationInView, [m_osxView bounds], YES) )
+        {
+            [(NSCursor*)cursor.GetHCURSOR() set];
+        }

     }
     [[m_osxView window] invalidateCursorRectsForView:m_osxView];
 }
     }
     [[m_osxView window] invalidateCursorRectsForView:m_osxView];
 }


@@ -1999,16 +2219,31 @@ wxWidgetImpl* wxWidgetImpl::CreateUserPane( wxWindowMac* wxpeer, wxWindowMac* WX
     [v registerForDraggedTypes:[NSArray arrayWithObjects:
         NSStringPboardType, NSFilenamesPboardType, NSTIFFPboardType, NSPICTPboardType, NSPDFPboardType, nil]];
 
     [v registerForDraggedTypes:[NSArray arrayWithObjects:
         NSStringPboardType, NSFilenamesPboardType, NSTIFFPboardType, NSPICTPboardType, NSPDFPboardType, nil]];
 

-    wxWidgetCocoaImpl* c = new wxWidgetCocoaImpl( wxpeer, v );
+    wxWidgetCocoaImpl* c = new wxWidgetCocoaImpl( wxpeer, v, false, true );

     return c;
 }
 
 wxWidgetImpl* wxWidgetImpl::CreateContentView( wxNonOwnedWindow* now )
 {
     NSWindow* tlw = now->GetWXWindow();
     return c;
 }
 
 wxWidgetImpl* wxWidgetImpl::CreateContentView( wxNonOwnedWindow* now )
 {
     NSWindow* tlw = now->GetWXWindow();

-    wxNSView* v = [[wxNSView alloc] initWithFrame:[[tlw contentView] frame]];
-    wxWidgetCocoaImpl* c = new wxWidgetCocoaImpl( now, v, true );
-    c->InstallEventHandler();
-    [tlw setContentView:v];
+    
+    wxWidgetCocoaImpl* c = NULL;
+    if ( now->IsNativeWindowWrapper() )
+    {
+        NSView* cv = [tlw contentView];
+        c = new wxWidgetCocoaImpl( now, cv, true );
+        // increase ref count, because the impl destructor will decrement it again
+        CFRetain(cv);
+        if ( !now->IsShown() )
+            [cv setHidden:NO];
+        
+    }
+    else
+    {
+        wxNSView* v = [[wxNSView alloc] initWithFrame:[[tlw contentView] frame]];
+        c = new wxWidgetCocoaImpl( now, v, true );
+        c->InstallEventHandler();
+        [tlw setContentView:v];
+    }

     return c;
 }
     return c;
 }