fix wxGTK1 compilation after wxTextEntry DoGetValue() change

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

diff --git a/src/osx/cocoa/window.mm b/src/osx/cocoa/window.mm
index cc9a21066a621143d78e0f20cebe011ae4d09f27..9b2cfd9b55e5d7afb01a066bd0706a5a47db7ff1 100644 (file)
--- a/src/osx/cocoa/window.mm
+++ b/src/osx/cocoa/window.mm
@@ -12,13 +12,25 @@
 #include "wx/wxprec.h"
 
 #ifndef WX_PRECOMP
 #include "wx/wxprec.h"
 
 #ifndef WX_PRECOMP

-#include "wx/nonownedwnd.h"
+    #include "wx/dcclient.h"
+    #include "wx/nonownedwnd.h"
+    #include "wx/log.h"

 #endif
 
 #ifdef __WXMAC__
 #endif
 
 #ifdef __WXMAC__

-#include "wx/osx/private.h"
+    #include "wx/osx/private.h"

 #endif
 
 #endif
 

+#if wxUSE_CARET
+    #include "wx/caret.h"
+#endif
+
+#if wxUSE_DRAG_AND_DROP
+    #include "wx/dnd.h"
+#endif
+
+#include <objc/objc-runtime.h>
+

 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 ;


@@ -32,84 +44,149 @@ NSRect wxOSXGetFrameForControl( wxWindowMac* window , const wxPoint& pos , const
 
 @interface wxNSView : NSView
 {
 
 @interface wxNSView : NSView
 {

-    wxWidgetImpl* impl;
+    NSTrackingRectTag rectTag;

 }
 
 }
 

-- (void)drawRect: (NSRect) rect;
+- (BOOL) canBecomeKeyView;
+// the tracking tag is needed to track mouse enter / exit events 
+- (void) setTrackingTag: (NSTrackingRectTag)tag;
+- (NSTrackingRectTag) trackingTag;
+@end // wxNSView
+
+@interface NSView(PossibleMethods) 
+- (void)setTitle:(NSString *)aString;
+- (void)setStringValue:(NSString *)aString;
+- (void)setIntValue:(int)anInt;
+- (void)setFloatValue:(float)aFloat;
+- (void)setDoubleValue:(double)aDouble;

 
 

--(void)mouseDown:(NSEvent *)event ;
--(void)rightMouseDown:(NSEvent *)event ;
--(void)otherMouseDown:(NSEvent *)event ;
--(void)mouseUp:(NSEvent *)event ;
--(void)rightMouseUp:(NSEvent *)event ;
--(void)otherMouseUp:(NSEvent *)event ;
--(void)handleMouseEvent:(NSEvent *)event;
+- (double)minValue;
+- (double)maxValue;
+- (void)setMinValue:(double)aDouble;
+- (void)setMaxValue:(double)aDouble;

 
 

-- (void)keyDown:(NSEvent *)event;
-- (void)keyUp:(NSEvent *)event;
-- (void)flagsChanged:(NSEvent *)event;
-- (void)handleKeyEvent:(NSEvent *)event;
+- (void)sizeToFit;

 
 

-- (void)setImplementation: (wxWidgetImpl *) theImplementation;
-- (wxWidgetImpl*) implementation;
-- (BOOL) isFlipped;
-- (BOOL) becomeFirstResponder;
-- (BOOL) resignFirstResponder;
-- (BOOL) canBecomeKeyView;
+- (BOOL)isEnabled;
+- (void)setEnabled:(BOOL)flag;

 
 

-@end // wxNSView
+- (void)setImage:(NSImage *)image;
+- (void)setControlSize:(NSControlSize)size;
+
+- (id)contentView;
+
+- (void)setTarget:(id)anObject;
+- (void)setAction:(SEL)aSelector;
+- (void)setDoubleAction:(SEL)aSelector;
+@end 

 
 

-long wxOSXTranslateCocoaKey(unsigned short code, int unichar )
+long wxOSXTranslateCocoaKey( NSEvent* event )

 {
 {

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

     {
     {

-        case NSUpArrowFunctionKey :
-            retval = WXK_UP;
-            break;
-        case NSDownArrowFunctionKey :
-            retval = WXK_DOWN;
-            break;
-        case NSLeftArrowFunctionKey :
-            retval = WXK_LEFT;
-            break;
-        case NSRightArrowFunctionKey :
-            retval = WXK_RIGHT;
+        // command key
+        case 54:
+        case 55:
+            retval = WXK_COMMAND;

             break;
             break;

-        case NSInsertFunctionKey  :
-            retval = WXK_INSERT;
+        // caps locks key
+        case 57: // Capslock
+            retval = WXK_CAPITAL;

             break;
             break;

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

             break;
             break;

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

             break;
             break;

-//        case NSBeginFunctionKey  :
-//            retval = WXK_BEGIN;
-//            break;
-        case NSEndFunctionKey  :
-            retval = WXK_END;
+        // ctrl key
+        case 59: // Left Ctrl
+        case 62: // Right Ctrl
+            retval = WXK_CONTROL;

             break;
             break;

-        case NSPageUpFunctionKey  :
-            retval = WXK_PAGEUP;
+        // clear key
+        case 71: 
+            retval = WXK_CLEAR;

             break;
             break;

-       case NSPageDownFunctionKey  :
-            retval = WXK_PAGEDOWN;
-            break;
-       case NSHelpFunctionKey  :
-            retval = WXK_HELP;
+        // tab key
+        case 48: 
+            retval = WXK_TAB;

             break;
 
         default :
             break;
 
         default :

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

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

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

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


@@ -118,25 +195,8 @@ void SetupKeyEvent( wxKeyEvent &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;

-
-    wxString chars;
-    if ( eventType != NSFlagsChanged )
-    {
-        NSString* nschars = [nsEvent characters];
-        if ( nschars )
-        {
-            wxCFStringRef cfchars((CFStringRef)[nschars retain]);
-            chars = cfchars.AsString();
-        }
-    }

     
     

-    int unichar = chars.Length() > 0 ? chars[0] : 0;
-    
-#if wxUSE_UNICODE
-    wxevent.m_uniChar = unichar;
-#endif
-    wxevent.m_keyCode = wxOSXTranslateCocoaKey( [nsEvent keyCode], unichar ) ;
-//    wxevent.m_rawCode = keymessage;
+    wxevent.m_rawCode = [nsEvent keyCode];

     wxevent.m_rawFlags = modifiers;
     
     wxevent.SetTimestamp( [nsEvent timestamp] * 1000.0 ) ;
     wxevent.m_rawFlags = modifiers;
     
     wxevent.SetTimestamp( [nsEvent timestamp] * 1000.0 ) ;


@@ -154,17 +214,59 @@ void SetupKeyEvent( wxKeyEvent &wxevent , NSEvent * nsEvent )
         default :
             break ;
     }
         default :
             break ;
     }

+
+    wxString chars;
+    if ( eventType != NSFlagsChanged )
+    {
+        NSString* nschars = [nsEvent characters];
+        if ( charString )
+        {
+            // if charString is set, it did not come from key up / key down
+            wxevent.SetEventType( wxEVT_CHAR );
+            wxCFStringRef cfchars((CFStringRef)[charString retain]);
+            chars = cfchars.AsString();
+        }
+        else if ( nschars )
+        {
+            wxCFStringRef cfchars((CFStringRef)[nschars retain]);
+            chars = cfchars.AsString();
+        }
+    }
+    
+    int aunichar = chars.Length() > 0 ? chars[0] : 0;
+    long keyval = 0;
+    
+    if (wxevent.GetEventType() != wxEVT_CHAR)
+        keyval = wxOSXTranslateCocoaKey(nsEvent) ;
+
+    if ( !keyval )
+    {
+        if ( wxevent.GetEventType() == wxEVT_KEY_UP || wxevent.GetEventType() == wxEVT_KEY_DOWN )
+            keyval = wxToupper( aunichar ) ;
+        else
+            keyval = aunichar;
+    }
+    
+#if wxUSE_UNICODE
+    wxevent.m_uniChar = aunichar;
+#endif
+    wxevent.m_keyCode = keyval;

 }
 
 }
 

+UInt32 g_lastButton = 0 ;
+bool g_lastButtonWasFakeRight = false ;
+

 void SetupMouseEvent( wxMouseEvent &wxevent , NSEvent * nsEvent )
 {
 void SetupMouseEvent( wxMouseEvent &wxevent , NSEvent * nsEvent )
 {

+    int eventType = [nsEvent type];

     UInt32 modifiers = [nsEvent modifierFlags] ;
     wxPoint screenMouseLocation = wxFromNSPoint( NULL, [nsEvent locationInWindow]);
 
     // these parameters are not given for all events
     UInt32 button = [nsEvent buttonNumber];
     UInt32 modifiers = [nsEvent modifierFlags] ;
     wxPoint screenMouseLocation = wxFromNSPoint( NULL, [nsEvent locationInWindow]);
 
     // these parameters are not given for all events
     UInt32 button = [nsEvent buttonNumber];

-    UInt32 clickCount = [nsEvent clickCount];
-    UInt32 mouseChord = 0; // TODO does this exist for cocoa
+    UInt32 clickCount = 0;
+    if ( [nsEvent respondsToSelector:@selector(clickCount:)] ) 
+        [nsEvent clickCount];

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


@@ -174,33 +276,55 @@ void SetupMouseEvent( wxMouseEvent &wxevent , NSEvent * nsEvent )
     wxevent.m_metaDown = modifiers & NSCommandKeyMask;
     wxevent.m_clickCount = clickCount;
     wxevent.SetTimestamp( [nsEvent timestamp] * 1000.0 ) ;
     wxevent.m_metaDown = modifiers & NSCommandKeyMask;
     wxevent.m_clickCount = clickCount;
     wxevent.SetTimestamp( [nsEvent timestamp] * 1000.0 ) ;

-/*
+
+    UInt32 mouseChord = 0; 
+
+    switch (eventType)
+    {
+        case NSLeftMouseDown :
+        case NSLeftMouseDragged :
+            mouseChord = 1U;
+            break;
+        case NSRightMouseDown :
+        case NSRightMouseDragged :
+            mouseChord = 2U;
+            break;
+        case NSOtherMouseDown :
+        case NSOtherMouseDragged :
+            mouseChord = 4U;
+            break;
+    }
+

     // a control click is interpreted as a right click
     bool thisButtonIsFakeRight = false ;
     // a control click is interpreted as a right click
     bool thisButtonIsFakeRight = false ;

-    if ( button == kEventMouseButtonPrimary && (modifiers & controlKey) )
+    if ( button == 0 && (modifiers & NSControlKeyMask) )

     {
     {

-        button = kEventMouseButtonSecondary ;
+        button = 1 ;

         thisButtonIsFakeRight = true ;
     }
 
     // otherwise we report double clicks by connecting a left click with a ctrl-left click
     if ( clickCount > 1 && button != g_lastButton )
         clickCount = 1 ;
         thisButtonIsFakeRight = true ;
     }
 
     // otherwise we report double clicks by connecting a left click with a ctrl-left click
     if ( clickCount > 1 && button != g_lastButton )
         clickCount = 1 ;

+

     // we must make sure that our synthetic 'right' button corresponds in
     // mouse down, moved and mouse up, and does not deliver a right down and left up
     // we must make sure that our synthetic 'right' button corresponds in
     // mouse down, moved and mouse up, and does not deliver a right down and left up

-
-    if ( cEvent.GetKind() == kEventMouseDown )
+    switch (eventType)

     {
     {

-        g_lastButton = button ;
-        g_lastButtonWasFakeRight = thisButtonIsFakeRight ;
-    }
+        case NSLeftMouseDown :
+        case NSRightMouseDown :
+        case NSOtherMouseDown :
+            g_lastButton = button ;
+            g_lastButtonWasFakeRight = thisButtonIsFakeRight ;
+            break;
+     }

 
     if ( button == 0 )
     {
         g_lastButton = 0 ;
         g_lastButtonWasFakeRight = false ;
     }
 
     if ( button == 0 )
     {
         g_lastButton = 0 ;
         g_lastButtonWasFakeRight = false ;
     }

-    else if ( g_lastButton == kEventMouseButtonSecondary && g_lastButtonWasFakeRight )
+    else if ( g_lastButton == 1 && g_lastButtonWasFakeRight )

         button = g_lastButton ;
 
     // Adjust the chord mask to remove the primary button and add the
         button = g_lastButton ;
 
     // Adjust the chord mask to remove the primary button and add the


@@ -217,9 +341,7 @@ void SetupMouseEvent( wxMouseEvent &wxevent , NSEvent * nsEvent )
     if(mouseChord & 4U)
                 wxevent.m_middleDown = true ;
 
     if(mouseChord & 4U)
                 wxevent.m_middleDown = true ;
 

-*/

     // translate into wx types
     // translate into wx types

-    int eventType = [nsEvent type];

     switch (eventType)
     {
         case NSLeftMouseDown :
     switch (eventType)
     {
         case NSLeftMouseDown :


@@ -269,20 +391,27 @@ void SetupMouseEvent( wxMouseEvent &wxevent , NSEvent * nsEvent )
      case NSScrollWheel :
         {
             wxevent.SetEventType( wxEVT_MOUSEWHEEL ) ;
      case NSScrollWheel :
         {
             wxevent.SetEventType( wxEVT_MOUSEWHEEL ) ;

-            /*
-            EventMouseWheelAxis axis = cEvent.GetParameter<EventMouseWheelAxis>(kEventParamMouseWheelAxis, typeMouseWheelAxis) ;
-            SInt32 delta = cEvent.GetParameter<SInt32>(kEventParamMouseWheelDelta, typeSInt32) ;
-            */
-            wxevent.m_wheelRotation = 10; // delta;
-            wxevent.m_wheelDelta = 1;
+            wxevent.m_wheelDelta = 10;

             wxevent.m_linesPerAction = 1;
             wxevent.m_linesPerAction = 1;

-            if ( 0 /* axis == kEventMouseWheelAxisX*/ )
+            NSLog(@"deltaX %f, deltaY %f",[nsEvent deltaX], [nsEvent deltaY]);
+            if ( abs([nsEvent deltaX]) > abs([nsEvent deltaY]) )
+            {

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

+                wxevent.m_wheelRotation = [nsEvent deltaX] * 10.0;
+            }
+            else
+            {
+                wxevent.m_wheelRotation = [nsEvent deltaY] * 10.0;
+            }

         }
         break ;
 
         case NSMouseEntered :
         }
         break ;
 
         case NSMouseEntered :

+            wxevent.SetEventType( wxEVT_ENTER_WINDOW ) ;
+            break;

         case NSMouseExited :
         case NSMouseExited :

+            wxevent.SetEventType( wxEVT_LEAVE_WINDOW ) ;
+            break;

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


@@ -296,183 +425,583 @@ void SetupMouseEvent( wxMouseEvent &wxevent , NSEvent * nsEvent )
 
 @implementation wxNSView
 
 
 @implementation wxNSView
 

-#define OSX_DEBUG_DRAWING 0
-
-- (void)drawRect: (NSRect) rect
++ (void)initialize

 {
 {

-    if ( impl )
+    static BOOL initialized = NO;
+    if (!initialized) 

     {
     {

-        CGContextRef context = (CGContextRef) [[NSGraphicsContext currentContext] graphicsPort];
-        CGContextSaveGState( context );
-#if OSX_DEBUG_DRAWING
-        CGContextBeginPath( context );
-        CGContextMoveToPoint(context, 0, 0);
-        NSRect bounds = [self bounds];
-        CGContextAddLineToPoint(context, 10, 0);
-        CGContextMoveToPoint(context, 0, 0);
-        CGContextAddLineToPoint(context, 0, 10);
-        CGContextMoveToPoint(context, bounds.size.width, bounds.size.height);
-        CGContextAddLineToPoint(context, bounds.size.width, bounds.size.height-10);
-        CGContextMoveToPoint(context, bounds.size.width, bounds.size.height);
-        CGContextAddLineToPoint(context, bounds.size.width-10, bounds.size.height);
-        CGContextClosePath( context );
-        CGContextStrokePath(context);
-#endif
+        initialized = YES;
+        wxOSXCocoaClassAddWXMethods( self );
+    }
+}

 
 

-        if ( [ self isFlipped ] == NO )
-        {
-            CGContextTranslateCTM( context, 0,  [self bounds].size.height );
-            CGContextScaleCTM( context, 1, -1 );
-        }
+- (BOOL) canBecomeKeyView
+{
+    return YES;
+}
+
+- (void) setTrackingTag: (NSTrackingRectTag)tag
+{
+    rectTag = tag;
+}
+
+- (NSTrackingRectTag) trackingTag
+{
+    return rectTag;
+}
+
+@end // wxNSView
+
+//
+// event handlers
+//
+
+#if wxUSE_DRAG_AND_DROP
+
+// see http://lists.apple.com/archives/Cocoa-dev/2005/Jul/msg01244.html
+// for details on the NSPasteboard -> PasteboardRef conversion
+
+NSDragOperation wxOSX_draggingEntered( id self, SEL _cmd, id <NSDraggingInfo>sender )
+{
+    wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
+    if (impl == NULL)
+        return NSDragOperationNone;

         
         

-        wxRegion updateRgn;
-        const NSRect *rects;
-        NSInteger count;
+    return impl->draggingEntered(sender, self, _cmd);
+}

 
 

-        [self getRectsBeingDrawn:&rects count:&count];
-        for ( int i = 0 ; i < count ; ++i )
-        {
-            updateRgn.Union(wxFromNSRect(self, rects[i]) );
-        }
+void wxOSX_draggingExited( id self, SEL _cmd, id <NSDraggingInfo> sender )
+{
+    wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
+    if (impl == NULL)
+        return ;
+        
+    return impl->draggingExited(sender, self, _cmd);
+}

 
 

-        wxWindow* wxpeer = impl->GetWXPeer();
-        wxpeer->GetUpdateRegion() = updateRgn;
-        wxpeer->MacSetCGContextRef( context );
+NSDragOperation wxOSX_draggingUpdated( id self, SEL _cmd, id <NSDraggingInfo>sender )
+{
+    wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
+    if (impl == NULL)
+        return NSDragOperationNone;

         
         

-        wxPaintEvent event;
-        event.SetTimestamp(0); //  todo
-        event.SetEventObject(wxpeer);
-        wxpeer->HandleWindowEvent(event);
-                
-        CGContextRestoreGState( context );
-    }
+    return impl->draggingUpdated(sender, self, _cmd);

 }
 
 }
 

--(void)mouseDown:(NSEvent *)event 
+BOOL wxOSX_performDragOperation( id self, SEL _cmd, id <NSDraggingInfo> sender )

 {
 {

-    [self handleMouseEvent:event];
+    wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
+    if (impl == NULL)
+        return NSDragOperationNone;
+        
+    return impl->performDragOperation(sender, self, _cmd) ? YES:NO ;

 }
 
 }
 

--(void)rightMouseDown:(NSEvent *)event 
+void wxOSX_mouseEvent(NSView* self, SEL _cmd, NSEvent *event) 

 {
 {

-    [self handleMouseEvent:event];
+    wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
+    if (impl == NULL)
+        return;
+        
+    impl->mouseEvent(event, self, _cmd);

 }
 
 }
 

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

 {
 {

-    [self handleMouseEvent:event];
+    wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
+    if (impl == NULL)
+        return;
+        
+    impl->keyEvent(event, self, _cmd);

 }
 
 }
 

--(void)mouseUp:(NSEvent *)event 
+void wxOSX_insertText(NSView* self, SEL _cmd, NSString* text) 

 {
 {

-    [self handleMouseEvent:event];
+    wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
+    if (impl == NULL)
+        return;
+        
+    impl->insertText(text, self, _cmd);

 }
 
 }
 

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

 {
 {

-    [self handleMouseEvent:event];
+    wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
+    if (impl == NULL)
+        return NO;
+        
+    return impl->performKeyEquivalent(event, self, _cmd);

 }
 
 }
 

--(void)otherMouseUp:(NSEvent *)event 
+BOOL wxOSX_becomeFirstResponder(NSView* self, SEL _cmd)

 {
 {

-    [self handleMouseEvent:event];
+    wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
+    if (impl == NULL)
+        return NO;
+        
+    return impl->becomeFirstResponder(self, _cmd);

 }
 
 }
 

--(void)handleMouseEvent:(NSEvent *)event 
-{ 
-    NSPoint clickLocation; 
-    clickLocation = [self convertPoint:[event locationInWindow] fromView:nil]; 
-    wxPoint pt = wxFromNSPoint( self, clickLocation );
-    wxMouseEvent wxevent(wxEVT_LEFT_DOWN);
-    SetupMouseEvent( wxevent , event ) ;
-    wxevent.m_x = pt.x;
-    wxevent.m_y = pt.y;
-    impl->GetWXPeer()->HandleWindowEvent(wxevent);
+BOOL wxOSX_resignFirstResponder(NSView* self, SEL _cmd)
+{
+    wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
+    if (impl == NULL)
+        return NO;
+        
+    return impl->resignFirstResponder(self, _cmd);

 }
 
 }
 

-- (void)keyDown:(NSEvent *)event
+void wxOSX_resetCursorRects(NSView* self, SEL _cmd)

 {
 {

-    [self handleKeyEvent:event];
+    wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
+    if (impl == NULL)
+        return;
+        
+    impl->resetCursorRects(self, _cmd);

 }
 
 }
 

-- (void)keyUp:(NSEvent *)event
+BOOL wxOSX_isFlipped(NSView* self, SEL _cmd)

 {
 {

-    [self handleKeyEvent:event];
+    wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
+    if (impl == NULL)
+        return NO;
+        
+    return impl->isFlipped(self, _cmd) ? YES:NO;

 }
 
 }
 

-- (void)flagsChanged:(NSEvent *)event
+void wxOSX_drawRect(NSView* self, SEL _cmd, NSRect rect)

 {
 {

-    [self handleKeyEvent:event];
+    wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
+    if (impl == NULL)
+        return;
+        
+    return impl->drawRect(&rect, self, _cmd);

 }
 
 }
 

-- (void)handleKeyEvent:(NSEvent *)event
+void wxOSX_controlAction(NSView* self, SEL _cmd, id sender)

 {
 {

-    wxKeyEvent wxevent(wxEVT_KEY_DOWN);
-    SetupKeyEvent( wxevent, event );
-    impl->GetWXPeer()->HandleWindowEvent(wxevent);
+    wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
+    if (impl == NULL)
+        return;
+        
+    impl->controlAction(self, _cmd, sender);
+}
+
+void wxOSX_controlDoubleAction(NSView* self, SEL _cmd, id sender)
+{
+    wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
+    if (impl == NULL)
+        return;
+        
+    impl->controlDoubleAction(self, _cmd, sender);

 }
 
 }
 

+unsigned int wxWidgetCocoaImpl::draggingEntered(void* s, WXWidget slf, void *_cmd)
+{
+    id <NSDraggingInfo>sender = (id <NSDraggingInfo>) s;
+    NSPasteboard *pboard = [sender draggingPasteboard];
+    NSDragOperation sourceDragMask = [sender draggingSourceOperationMask];
+    
+    wxWindow* wxpeer = GetWXPeer();
+    if ( wxpeer == NULL )
+        return NSDragOperationNone;
+        
+    wxDropTarget* target = wxpeer->GetDropTarget();
+    if ( target == NULL )
+        return NSDragOperationNone;
+
+    wxDragResult result = wxDragNone;
+    wxPoint pt = wxFromNSPoint( m_osxView, [sender draggingLocation] );
+
+    if ( sourceDragMask & NSDragOperationLink )
+        result = wxDragLink;
+    else if ( sourceDragMask & NSDragOperationCopy )
+        result = wxDragCopy;
+    else if ( sourceDragMask & NSDragOperationMove )
+        result = wxDragMove;
+
+    PasteboardRef pboardRef;    
+    PasteboardCreate((CFStringRef)[pboard name], &pboardRef);
+    target->SetCurrentDragPasteboard(pboardRef);
+    result = target->OnEnter(pt.x, pt.y, result);
+    CFRelease(pboardRef);
+     
+    NSDragOperation nsresult = NSDragOperationNone;
+    switch (result )
+    {
+        case wxDragLink:
+            nsresult = NSDragOperationLink;
+        case wxDragMove:
+            nsresult = NSDragOperationMove;
+        case wxDragCopy:
+            nsresult = NSDragOperationCopy;
+        default :
+            break;
+    }
+    return nsresult;
+}

 
 

-- (void)setImplementation: (wxWidgetImpl *) theImplementation
+void wxWidgetCocoaImpl::draggingExited(void* s, WXWidget slf, void *_cmd)
+{
+    id <NSDraggingInfo>sender = (id <NSDraggingInfo>) s;
+    NSPasteboard *pboard = [sender draggingPasteboard];
+    
+    wxWindow* wxpeer = GetWXPeer();
+    if ( wxpeer == NULL )
+        return;
+        
+    wxDropTarget* target = wxpeer->GetDropTarget();
+    if ( target == NULL )
+        return;
+        
+    PasteboardRef pboardRef;    
+    PasteboardCreate((CFStringRef)[pboard name], &pboardRef);
+    target->SetCurrentDragPasteboard(pboardRef);
+    target->OnLeave();
+    CFRelease(pboardRef);
+ }
+
+unsigned int wxWidgetCocoaImpl::draggingUpdated(void* s, WXWidget slf, void *_cmd)

 {
 {

-    impl = theImplementation;
+    id <NSDraggingInfo>sender = (id <NSDraggingInfo>) s;
+    NSPasteboard *pboard = [sender draggingPasteboard];
+    NSDragOperation sourceDragMask = [sender draggingSourceOperationMask];
+        
+    wxWindow* wxpeer = GetWXPeer();
+    if ( wxpeer == NULL )
+        return NSDragOperationNone;
+        
+    wxDropTarget* target = wxpeer->GetDropTarget();
+    if ( target == NULL )
+        return NSDragOperationNone;
+
+    wxDragResult result = wxDragNone;
+    wxPoint pt = wxFromNSPoint( m_osxView, [sender draggingLocation] );
+
+    if ( sourceDragMask & NSDragOperationLink )
+        result = wxDragLink;
+    else if ( sourceDragMask & NSDragOperationCopy )
+        result = wxDragCopy;
+    else if ( sourceDragMask & NSDragOperationMove )
+        result = wxDragMove;
+
+    PasteboardRef pboardRef;    
+    PasteboardCreate((CFStringRef)[pboard name], &pboardRef);
+    target->SetCurrentDragPasteboard(pboardRef);
+    result = target->OnDragOver(pt.x, pt.y, result);
+    CFRelease(pboardRef);
+     
+    NSDragOperation nsresult = NSDragOperationNone;
+    switch (result )
+    {
+        case wxDragLink:
+            nsresult = NSDragOperationLink;
+        case wxDragMove:
+            nsresult = NSDragOperationMove;
+        case wxDragCopy:
+            nsresult = NSDragOperationCopy;
+        default :
+            break;
+    }
+    return nsresult;

 }
 
 }
 

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

 {
 {

-    return impl;
+    id <NSDraggingInfo>sender = (id <NSDraggingInfo>) s;
+
+    NSPasteboard *pboard = [sender draggingPasteboard];
+    NSDragOperation sourceDragMask = [sender draggingSourceOperationMask];
+    
+    wxWindow* wxpeer = GetWXPeer();
+    wxDropTarget* target = wxpeer->GetDropTarget();
+    wxDragResult result = wxDragNone;
+    wxPoint pt = wxFromNSPoint( m_osxView, [sender draggingLocation] );
+
+    if ( sourceDragMask & NSDragOperationLink )
+        result = wxDragLink;
+    else if ( sourceDragMask & NSDragOperationCopy )
+        result = wxDragCopy;
+    else if ( sourceDragMask & NSDragOperationMove )
+        result = wxDragMove;
+
+    PasteboardRef pboardRef;    
+    PasteboardCreate((CFStringRef)[pboard name], &pboardRef);
+    target->SetCurrentDragPasteboard(pboardRef);
+    result = target->OnData(pt.x, pt.y, result);
+    CFRelease(pboardRef);
+     
+    return result != wxDragNone;

 }
 
 }
 

-- (BOOL) isFlipped
+#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 BOOL (*wxOSX_DrawRectHandlerPtr)(NSView* self, SEL _cmd, NSRect rect);
+
+void wxWidgetCocoaImpl::mouseEvent(WX_NSEvent event, WXWidget slf, void *_cmd)

 {
 {

-    return YES;
+    if ( !DoHandleMouseEvent(event) )
+    {
+        wxOSX_EventHandlerPtr superimpl = (wxOSX_EventHandlerPtr) [[slf superclass] instanceMethodForSelector:(SEL)_cmd];
+        superimpl(slf, (SEL)_cmd, event);
+    }

 }
 
 }
 

-- (BOOL) becomeFirstResponder
+void wxWidgetCocoaImpl::keyEvent(WX_NSEvent event, WXWidget slf, void *_cmd)

 {
 {

-    BOOL r = [super becomeFirstResponder];
-    if ( r )
+    if ( [[slf window] firstResponder] != slf || !DoHandleKeyEvent(event) )
+    {
+        wxOSX_EventHandlerPtr superimpl = (wxOSX_EventHandlerPtr) [[slf superclass] instanceMethodForSelector:(SEL)_cmd];
+        superimpl(slf, (SEL)_cmd, event);
+    }
+}
+
+void wxWidgetCocoaImpl::insertText(NSString* text, WXWidget slf, void *_cmd)
+{
+    if (m_lastKeyDownEvent && !DoHandleCharEvent(m_lastKeyDownEvent, text) )

     {
     {

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

     }
     }

+    m_lastKeyDownEvent = NULL;
+}
+
+
+bool wxWidgetCocoaImpl::performKeyEquivalent(WX_NSEvent event, WXWidget slf, void *_cmd)
+{
+    wxOSX_PerformKeyEventHandlerPtr superimpl = (wxOSX_PerformKeyEventHandlerPtr) [[slf superclass] instanceMethodForSelector:(SEL)_cmd];
+    return superimpl(slf, (SEL)_cmd, event);
+}
+
+bool wxWidgetCocoaImpl::becomeFirstResponder(WXWidget slf, void *_cmd)
+{
+    wxOSX_FocusHandlerPtr superimpl = (wxOSX_FocusHandlerPtr) [[slf superclass] instanceMethodForSelector:(SEL)_cmd];
+    BOOL r = superimpl(slf, (SEL)_cmd);
+    if ( r )
+        DoNotifyFocusEvent( true );

     return r;
 }
 
     return r;
 }
 

-- (BOOL) resignFirstResponder
+bool wxWidgetCocoaImpl::resignFirstResponder(WXWidget slf, void *_cmd)

 {
 {

-    BOOL r = [super resignFirstResponder];
+    wxOSX_FocusHandlerPtr superimpl = (wxOSX_FocusHandlerPtr) [[slf superclass] instanceMethodForSelector:(SEL)_cmd];
+    BOOL r = superimpl(slf, (SEL)_cmd);

     if ( r )
     if ( r )

+        DoNotifyFocusEvent( false );
+    return r;
+}
+
+void wxWidgetCocoaImpl::resetCursorRects(WXWidget slf, void *_cmd)
+{
+    wxWindow* wxpeer = GetWXPeer();
+    if ( wxpeer )

     {
     {

+        NSCursor *cursor = (NSCursor*)wxpeer->GetCursor().GetHCURSOR();
+        if (cursor == NULL)
+        {
+            wxOSX_ResetCursorRectsHandlerPtr superimpl = (wxOSX_ResetCursorRectsHandlerPtr) [[slf superclass] instanceMethodForSelector:(SEL)_cmd];
+            superimpl(slf, (SEL)_cmd);
+        }
+        else
+        {
+            [slf addCursorRect: [slf bounds]
+                cursor: cursor];
+        }

     }
     }

-    return r;
+}
+  
+bool wxWidgetCocoaImpl::isFlipped(WXWidget slf, void *_cmd)
+{
+    return m_isFlipped;

 }
 
 }
 

-- (BOOL) canBecomeKeyView
+
+#define OSX_DEBUG_DRAWING 0
+
+void wxWidgetCocoaImpl::drawRect(void* rect, WXWidget slf, void *_cmd)

 {
 {

-    return YES;
+    CGContextRef context = (CGContextRef) [[NSGraphicsContext currentContext] graphicsPort];
+    CGContextSaveGState( context );
+    
+#if OSX_DEBUG_DRAWING
+    CGContextBeginPath( context );
+    CGContextMoveToPoint(context, 0, 0);
+    NSRect bounds = [self bounds];
+    CGContextAddLineToPoint(context, 10, 0);
+    CGContextMoveToPoint(context, 0, 0);
+    CGContextAddLineToPoint(context, 0, 10);
+    CGContextMoveToPoint(context, bounds.size.width, bounds.size.height);
+    CGContextAddLineToPoint(context, bounds.size.width, bounds.size.height-10);
+    CGContextMoveToPoint(context, bounds.size.width, bounds.size.height);
+    CGContextAddLineToPoint(context, bounds.size.width-10, bounds.size.height);
+    CGContextClosePath( context );
+    CGContextStrokePath(context);
+#endif
+
+    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 );
+            
+    CGContextRestoreGState( context );
+
+    CGContextSaveGState( context );
+    if ( !handled )
+    {
+        // call super
+        SEL _cmd = @selector(drawRect:);
+        wxOSX_DrawRectHandlerPtr superimpl = (wxOSX_DrawRectHandlerPtr) [[slf superclass] instanceMethodForSelector:_cmd];
+        superimpl(slf, _cmd, *(NSRect*)rect);
+        CGContextRestoreGState( context );
+        CGContextSaveGState( context );
+    }
+    wxpeer->MacPaintChildrenBorders();
+    wxpeer->MacSetCGContextRef( NULL );
+    CGContextRestoreGState( context );

 }
 
 }
 

-@end // wxNSView
+void wxWidgetCocoaImpl::controlAction( WXWidget slf, void *_cmd, void *sender)
+{
+    wxWindow* wxpeer = (wxWindow*) GetWXPeer();
+    if ( wxpeer )
+        wxpeer->OSXHandleClicked(0);
+}
+
+void wxWidgetCocoaImpl::controlDoubleAction( WXWidget slf, void *_cmd, void *sender)
+{
+}
+
+// 
+
+#if OBJC_API_VERSION >= 2
+
+#define wxOSX_CLASS_ADD_METHOD( c, s, i, t ) \
+    class_addMethod(c, s, i, t );
+
+#else
+
+#define wxOSX_CLASS_ADD_METHOD( c, s, i, t ) \
+    { s, t, i },
+
+#endif
+
+void wxOSXCocoaClassAddWXMethods(Class c)
+{
+
+#if OBJC_API_VERSION < 2
+    static objc_method wxmethods[] =
+    {
+#endif
+
+    wxOSX_CLASS_ADD_METHOD(c, @selector(mouseDown:), (IMP) wxOSX_mouseEvent, "v@:@" )
+    wxOSX_CLASS_ADD_METHOD(c, @selector(rightMouseDown:), (IMP) wxOSX_mouseEvent, "v@:@" )
+    wxOSX_CLASS_ADD_METHOD(c, @selector(otherMouseDown:), (IMP) wxOSX_mouseEvent, "v@:@" )
+
+    wxOSX_CLASS_ADD_METHOD(c, @selector(mouseUp:), (IMP) wxOSX_mouseEvent, "v@:@" )
+    wxOSX_CLASS_ADD_METHOD(c, @selector(rightMouseUp:), (IMP) wxOSX_mouseEvent, "v@:@" )
+    wxOSX_CLASS_ADD_METHOD(c, @selector(otherMouseUp:), (IMP) wxOSX_mouseEvent, "v@:@" )
+
+    wxOSX_CLASS_ADD_METHOD(c, @selector(mouseMoved:), (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(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(insertText:), (IMP) wxOSX_insertText, "v@:@" )
+
+    wxOSX_CLASS_ADD_METHOD(c, @selector(performKeyEquivalent:), (IMP) wxOSX_performKeyEquivalent, "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@:" )
+
+    wxOSX_CLASS_ADD_METHOD(c, @selector(isFlipped), (IMP) wxOSX_isFlipped, "c@:" )
+    wxOSX_CLASS_ADD_METHOD(c, @selector(drawRect:), (IMP) wxOSX_drawRect, "v@:{_NSRect={_NSPoint=ff}{_NSSize=ff}}" )
+
+    wxOSX_CLASS_ADD_METHOD(c, @selector(controlAction:), (IMP) wxOSX_controlAction, "v@:@" )
+    wxOSX_CLASS_ADD_METHOD(c, @selector(controlDoubleAction:), (IMP) wxOSX_controlDoubleAction, "v@:@" )
+
+#if wxUSE_DRAG_AND_DROP
+    wxOSX_CLASS_ADD_METHOD(c, @selector(draggingEntered:), (IMP) wxOSX_draggingEntered, "I@:@" )
+    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     
+        
+#if OBJC_API_VERSION < 2
+    } ;
+    static int method_count = WXSIZEOF( wxmethods );
+    static objc_method_list *wxmethodlist = NULL;
+    if ( wxmethodlist == NULL )
+    {
+        wxmethodlist = (objc_method_list*) malloc(sizeof(objc_method_list) + sizeof(wxmethods) );
+        memcpy( &wxmethodlist->method_list[0], &wxmethods[0], sizeof(wxmethods) );
+        wxmethodlist->method_count = method_count;
+        wxmethodlist->obsolete = 0;
+    }
+    class_addMethods( c, wxmethodlist );
+#endif
+}
+
+//
+// C++ implementation class
+//

 
 IMPLEMENT_DYNAMIC_CLASS( wxWidgetCocoaImpl , wxWidgetImpl )
 
 wxWidgetCocoaImpl::wxWidgetCocoaImpl( wxWindowMac* peer , WXWidget w, bool isRootControl ) :
 
 IMPLEMENT_DYNAMIC_CLASS( wxWidgetCocoaImpl , wxWidgetImpl )
 
 wxWidgetCocoaImpl::wxWidgetCocoaImpl( wxWindowMac* peer , WXWidget w, bool isRootControl ) :

-    wxWidgetImpl( peer, isRootControl ), m_osxView(w)
+    wxWidgetImpl( peer, isRootControl )

 {
 {

+    Init();
+    m_osxView = w;

 }
 
 wxWidgetCocoaImpl::wxWidgetCocoaImpl() 
 {
 }
 
 wxWidgetCocoaImpl::wxWidgetCocoaImpl() 
 {

+    Init();

 }
 
 void wxWidgetCocoaImpl::Init()
 {
     m_osxView = NULL;
 }
 
 void wxWidgetCocoaImpl::Init()
 {
     m_osxView = NULL;

+    m_isFlipped = true;
+    m_lastKeyDownEvent = NULL;

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

-    if ( [m_osxView respondsToSelector:@selector(setImplementation:) ] )
-        [m_osxView setImplementation:NULL];
+    RemoveAssociations( this );
+

     if ( !IsRootControl() )
     {
         NSView *sv = [m_osxView superview];
     if ( !IsRootControl() )
     {
         NSView *sv = [m_osxView superview];


@@ -502,12 +1031,45 @@ void wxWidgetCocoaImpl::Lower()
 
 void wxWidgetCocoaImpl::ScrollRect( const wxRect *rect, int dx, int dy )
 {
 
 void wxWidgetCocoaImpl::ScrollRect( const wxRect *rect, int dx, int dy )
 {

+#if 1
+    SetNeedsDisplay() ;
+#else
+    // We should do something like this, but it wasn't working in 10.4.
+    if (GetNeedsDisplay() )
+    {
+        SetNeedsDisplay() ;
+    }
+    NSRect r = wxToNSRect( [m_osxView superview], *rect );
+    NSSize offset = NSMakeSize((float)dx, (float)dy);
+    [m_osxView scrollRect:r by:offset];
+#endif

 }
 
 void wxWidgetCocoaImpl::Move(int x, int y, int width, int height)
 {
 }
 
 void wxWidgetCocoaImpl::Move(int x, int y, int width, int height)
 {

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

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

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

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


@@ -526,8 +1088,27 @@ void wxWidgetCocoaImpl::GetSize( int &width, int &height ) const
 
 void wxWidgetCocoaImpl::GetContentArea( int&left, int &top, int &width, int &height ) const
 {
 
 void wxWidgetCocoaImpl::GetContentArea( int&left, int &top, int &width, int &height ) const
 {

-    left = top = 0;
-    GetSize( width, height );
+    if ( [m_osxView respondsToSelector:@selector(contentView) ] )
+    {
+        NSView* cv = [m_osxView contentView];
+     
+        NSRect bounds = [m_osxView bounds];
+        NSRect rect = [cv frame];
+        
+        int y = rect.origin.y;
+        int x = rect.origin.x;
+        if ( ![ m_osxView isFlipped ] )
+            y = bounds.size.height - (rect.origin.y + rect.size.height);
+        left = x;
+        top = y;
+        width = rect.size.width;
+        height = rect.size.height;
+    }
+    else
+    {
+        left = top = 0;
+        GetSize( width, height );
+    }

 }
 
 void wxWidgetCocoaImpl::SetNeedsDisplay( const wxRect* where )
 }
 
 void wxWidgetCocoaImpl::SetNeedsDisplay( const wxRect* where )


@@ -587,6 +1168,11 @@ void wxWidgetCocoaImpl::SetLabel( const wxString& title, wxFontEncoding encoding
         wxCFStringRef cf( title , m_wxPeer->GetFont().GetEncoding() );
         [m_osxView setTitle:cf.AsNSString()];
     }
         wxCFStringRef cf( title , m_wxPeer->GetFont().GetEncoding() );
         [m_osxView setTitle:cf.AsNSString()];
     }

+    else if ( [m_osxView respondsToSelector:@selector(setStringValue:) ] )
+    {
+        wxCFStringRef cf( title , m_wxPeer->GetFont().GetEncoding() );
+        [m_osxView setStringValue:cf.AsNSString()];
+    }

 }
     
 
 }
     
 


@@ -634,6 +1220,24 @@ void wxWidgetCocoaImpl::SetMaximum( wxInt32 v )
     }
 }
 
     }
 }
 

+wxInt32 wxWidgetCocoaImpl::GetMinimum() const 
+{
+    if (  [m_osxView respondsToSelector:@selector(getMinValue:)] )
+    {
+        return [m_osxView minValue];
+    }
+    return 0;
+}
+
+wxInt32 wxWidgetCocoaImpl::GetMaximum() const 
+{
+    if (  [m_osxView respondsToSelector:@selector(getMaxValue:)] )
+    {
+        return [m_osxView maxValue];
+    }
+    return 0;
+}
+

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


@@ -718,6 +1322,130 @@ void wxWidgetCocoaImpl::SetFont(wxFont const&, wxColour const&, long, bool)
     // TODO
 }
 
     // TODO
 }
 

+void wxWidgetCocoaImpl::InstallEventHandler( WXWidget control )
+{
+    WXWidget c =  control ? control : (WXWidget) m_osxView;
+    wxWidgetImpl::Associate( c, this ) ;
+    if ([c respondsToSelector:@selector(setAction:)])
+    {
+        [c setTarget: c];
+        [c setAction: @selector(controlAction:)];
+        if ([c respondsToSelector:@selector(setDoubleAction:)])
+        {
+            [c setDoubleAction: @selector(controlDoubleAction:)];
+        }
+        
+    }
+}
+
+bool wxWidgetCocoaImpl::DoHandleCharEvent(NSEvent *event, NSString *text)
+{
+    wxKeyEvent wxevent(wxEVT_KEY_DOWN);
+    SetupKeyEvent( wxevent, event, text );
+
+    return GetWXPeer()->OSXHandleKeyEvent(wxevent);
+}
+
+bool wxWidgetCocoaImpl::DoHandleKeyEvent(NSEvent *event)
+{
+    wxKeyEvent wxevent(wxEVT_KEY_DOWN);
+    SetupKeyEvent( wxevent, event );
+    
+    bool result = GetWXPeer()->OSXHandleKeyEvent(wxevent);
+
+    // this will fire higher level events, like insertText, to help
+    // us handle EVT_CHAR, etc.
+    if ([event type] == NSKeyDown)
+    {
+        m_lastKeyDownEvent = event;
+        [m_osxView interpretKeyEvents:[NSArray arrayWithObject:event]];
+    }
+    return result;
+}
+
+bool wxWidgetCocoaImpl::DoHandleMouseEvent(NSEvent *event)
+{
+    NSPoint clickLocation; 
+    clickLocation = [m_osxView convertPoint:[event locationInWindow] fromView:nil]; 
+    wxPoint pt = wxFromNSPoint( m_osxView, clickLocation );
+    wxMouseEvent wxevent(wxEVT_LEFT_DOWN);
+    SetupMouseEvent( wxevent , event ) ;
+    wxevent.m_x = pt.x;
+    wxevent.m_y = pt.y;
+
+    return GetWXPeer()->HandleWindowEvent(wxevent);
+}
+
+void wxWidgetCocoaImpl::DoNotifyFocusEvent(bool receivedFocus)
+{
+    wxWindow* thisWindow = GetWXPeer();
+    if ( thisWindow->MacGetTopLevelWindow() && NeedsFocusRect() )
+    {
+        thisWindow->MacInvalidateBorders();
+    }
+
+    if ( receivedFocus )
+    {
+        wxLogTrace(_T("Focus"), _T("focus set(%p)"), static_cast<void*>(thisWindow));
+        wxChildFocusEvent eventFocus((wxWindow*)thisWindow);
+        thisWindow->HandleWindowEvent(eventFocus);
+
+#if wxUSE_CARET
+        if ( thisWindow->GetCaret() )
+            thisWindow->GetCaret()->OnSetFocus();
+#endif
+
+        wxFocusEvent event(wxEVT_SET_FOCUS, thisWindow->GetId());
+        event.SetEventObject(thisWindow);
+        // TODO how to find out the targetFocusWindow ?
+        // event.SetWindow(targetFocusWindow);
+        thisWindow->HandleWindowEvent(event) ;
+    }
+    else // !receivedFocuss
+    {
+#if wxUSE_CARET
+        if ( thisWindow->GetCaret() )
+            thisWindow->GetCaret()->OnKillFocus();
+#endif
+
+        wxLogTrace(_T("Focus"), _T("focus lost(%p)"), static_cast<void*>(thisWindow));
+                    
+        wxFocusEvent event( wxEVT_KILL_FOCUS, thisWindow->GetId());
+        event.SetEventObject(thisWindow);
+        // TODO how to find out the targetFocusWindow ?
+        // event.SetWindow(targetFocusWindow);
+        thisWindow->HandleWindowEvent(event) ;
+    }
+}
+
+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) )
+    {
+        [(NSCursor*)cursor.GetHCURSOR() set];
+    }
+    [[m_osxView window] invalidateCursorRectsForView:m_osxView];
+}
+
+void wxWidgetCocoaImpl::CaptureMouse()
+{
+    [[m_osxView window] disableCursorRects];
+}
+
+void wxWidgetCocoaImpl::ReleaseMouse()
+{
+    [[m_osxView window] enableCursorRects];
+}
+
+void wxWidgetCocoaImpl::SetFlipped(bool flipped)
+{
+    m_isFlipped = flipped;
+}
+

 //
 // Factory methods
 //
 //
 // Factory methods
 //


@@ -725,13 +1453,14 @@ void wxWidgetCocoaImpl::SetFont(wxFont const&, wxColour const&, long, bool)
 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* parent, wxWindowID id, const wxPoint& pos, const wxSize& size,
                             long style, long extraStyle)
 {

-    NSView* sv = (wxpeer->GetParent()->GetHandle() );
-    

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

-    [sv addSubview:v];
+
+    // temporary hook for dnd
+    [v registerForDraggedTypes:[NSArray arrayWithObjects:
+        NSStringPboardType, NSFilenamesPboardType, NSTIFFPboardType, NSPICTPboardType, NSPDFPboardType, nil]];
+        

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

-    [v setImplementation:c];

     return c;
 }
 
     return c;
 }
 


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

-    [v setImplementation:c];
+    c->InstallEventHandler();

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