deTABbed wxQsort()

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

diff --git a/src/cocoa/window.mm b/src/cocoa/window.mm
index dd2e272a75232a363c5291875d40eb3e6ec2534b..2eaaafc97baa0cb1623ee4c1b09574d0f91d3d07 100644 (file)
--- a/src/cocoa/window.mm
+++ b/src/cocoa/window.mm
@@ -4,21 +4,112 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2002/12/26
 // Author:      David Elliott
 // Modified by:
 // Created:     2002/12/26

-// RCS-ID:      $Id:
+// RCS-ID:      $Id$

 // Copyright:   (c) 2002 David Elliott
 // Copyright:   (c) 2002 David Elliott

-// Licence:    wxWindows license
+// Licence:     wxWidgets licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#include "wx/window.h"
-#include "wx/log.h"
+#include "wx/wxprec.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+    #include "wx/window.h"
+    #include "wx/dc.h"
+    #include "wx/utils.h"
+#endif //WX_PRECOMP
+
+#include "wx/tooltip.h"

 
 #include "wx/cocoa/autorelease.h"
 
 #include "wx/cocoa/autorelease.h"

+#include "wx/cocoa/string.h"
+#include "wx/cocoa/trackingrectmanager.h"

 
 

-#import <Appkit/NSView.h>
+#import <Foundation/NSArray.h>
+#import <Foundation/NSRunLoop.h>
+#include "wx/cocoa/objc/NSView.h"

 #import <AppKit/NSEvent.h>
 #import <AppKit/NSScrollView.h>
 #import <AppKit/NSColor.h>
 #import <AppKit/NSClipView.h>
 #import <AppKit/NSEvent.h>
 #import <AppKit/NSScrollView.h>
 #import <AppKit/NSColor.h>
 #import <AppKit/NSClipView.h>

+#import <Foundation/NSException.h>
+#import <AppKit/NSApplication.h>
+#import <AppKit/NSWindow.h>
+
+// Turn this on to paint green over the dummy views for debugging
+#undef WXCOCOA_FILL_DUMMY_VIEW
+
+#ifdef WXCOCOA_FILL_DUMMY_VIEW
+#import <AppKit/NSBezierPath.h>
+#endif //def WXCOCOA_FILL_DUMMY_VIEW
+
+/* NSComparisonResult is typedef'd as an enum pre-Leopard but typedef'd as
+ * NSInteger post-Leopard.  Pre-Leopard the Cocoa toolkit expects a function
+ * returning int and not NSComparisonResult.  Post-Leopard the Cocoa toolkit
+ * expects a function returning the new non-enum NSComparsionResult.
+ * Hence we create a typedef named CocoaWindowCompareFunctionResult.
+ */
+#if defined(NSINTEGER_DEFINED)
+typedef NSComparisonResult CocoaWindowCompareFunctionResult;
+#else
+typedef int CocoaWindowCompareFunctionResult;
+#endif
+
+// A category for methods that are only present in Panther's SDK
+@interface NSView(wxNSViewPrePantherCompatibility)
+- (void)getRectsBeingDrawn:(const NSRect **)rects count:(int *)count;
+@end
+
+NSPoint CocoaTransformNSViewBoundsToWx(NSView *nsview, NSPoint pointBounds)
+{
+    wxCHECK_MSG(nsview, pointBounds, wxT("Need to have a Cocoa view to do translation"));
+    if([nsview isFlipped])
+        return pointBounds;
+    NSRect ourBounds = [nsview bounds];
+    return NSMakePoint
+    (   pointBounds.x
+    ,   ourBounds.size.height - pointBounds.y
+    );
+}
+
+NSRect CocoaTransformNSViewBoundsToWx(NSView *nsview, NSRect rectBounds)
+{
+    wxCHECK_MSG(nsview, rectBounds, wxT("Need to have a Cocoa view to do translation"));
+    if([nsview isFlipped])
+        return rectBounds;
+    NSRect ourBounds = [nsview bounds];
+    return NSMakeRect
+    (   rectBounds.origin.x
+    ,   ourBounds.size.height - (rectBounds.origin.y + rectBounds.size.height)
+    ,   rectBounds.size.width
+    ,   rectBounds.size.height
+    );
+}
+
+NSPoint CocoaTransformNSViewWxToBounds(NSView *nsview, NSPoint pointWx)
+{
+    wxCHECK_MSG(nsview, pointWx, wxT("Need to have a Cocoa view to do translation"));
+    if([nsview isFlipped])
+        return pointWx;
+    NSRect ourBounds = [nsview bounds];
+    return NSMakePoint
+    (   pointWx.x
+    ,   ourBounds.size.height - pointWx.y
+    );
+}
+
+NSRect CocoaTransformNSViewWxToBounds(NSView *nsview, NSRect rectWx)
+{
+    wxCHECK_MSG(nsview, rectWx, wxT("Need to have a Cocoa view to do translation"));
+    if([nsview isFlipped])
+        return rectWx;
+    NSRect ourBounds = [nsview bounds];
+    return NSMakeRect
+    (   rectWx.origin.x
+    ,   ourBounds.size.height - (rectWx.origin.y + rectWx.size.height)
+    ,   rectWx.size.width
+    ,   rectWx.size.height
+    );
+}

 
 // ========================================================================
 // wxWindowCocoaHider
 
 // ========================================================================
 // wxWindowCocoaHider


@@ -34,19 +125,23 @@ protected:
     wxWindowCocoa *m_owner;
     WX_NSView m_dummyNSView;
     virtual void Cocoa_FrameChanged(void);
     wxWindowCocoa *m_owner;
     WX_NSView m_dummyNSView;
     virtual void Cocoa_FrameChanged(void);

+    virtual void Cocoa_synthesizeMouseMoved(void) {}
+#ifdef WXCOCOA_FILL_DUMMY_VIEW
+    virtual bool Cocoa_drawRect(const NSRect& rect);
+#endif //def WXCOCOA_FILL_DUMMY_VIEW

 private:
     wxWindowCocoaHider();
 };
 
 // ========================================================================
 private:
     wxWindowCocoaHider();
 };
 
 // ========================================================================

-// wxWindowCocoaScroller
+// wxWindowCocoaScrollView

 // ========================================================================
 // ========================================================================

-class wxWindowCocoaScroller: protected wxCocoaNSView
+class wxWindowCocoaScrollView: protected wxCocoaNSView

 {
 {

-    DECLARE_NO_COPY_CLASS(wxWindowCocoaScroller)
+    DECLARE_NO_COPY_CLASS(wxWindowCocoaScrollView)

 public:
 public:

-    wxWindowCocoaScroller(wxWindow *owner);
-    virtual ~wxWindowCocoaScroller();
+    wxWindowCocoaScrollView(wxWindow *owner);
+    virtual ~wxWindowCocoaScrollView();

     inline WX_NSScrollView GetNSScrollView() { return m_cocoaNSScrollView; }
     void ClientSizeToSize(int &width, int &height);
     void DoGetClientSize(int *x, int *y) const;
     inline WX_NSScrollView GetNSScrollView() { return m_cocoaNSScrollView; }
     void ClientSizeToSize(int &width, int &height);
     void DoGetClientSize(int *x, int *y) const;


@@ -56,10 +151,28 @@ protected:
     wxWindowCocoa *m_owner;
     WX_NSScrollView m_cocoaNSScrollView;
     virtual void Cocoa_FrameChanged(void);
     wxWindowCocoa *m_owner;
     WX_NSScrollView m_cocoaNSScrollView;
     virtual void Cocoa_FrameChanged(void);

+    virtual void Cocoa_synthesizeMouseMoved(void) {}

 private:
 private:

-    wxWindowCocoaScroller();
+    wxWindowCocoaScrollView();

 };
 
 };
 

+// ========================================================================
+// wxDummyNSView
+// ========================================================================
+@interface wxDummyNSView : NSView
+- (NSView *)hitTest:(NSPoint)aPoint;
+@end
+WX_DECLARE_GET_OBJC_CLASS(wxDummyNSView,NSView)
+
+@implementation wxDummyNSView : NSView
+- (NSView *)hitTest:(NSPoint)aPoint
+{
+    return nil;
+}
+
+@end
+WX_IMPLEMENT_GET_OBJC_CLASS(wxDummyNSView,NSView)
+

 // ========================================================================
 // wxWindowCocoaHider
 // ========================================================================
 // ========================================================================
 // wxWindowCocoaHider
 // ========================================================================


@@ -68,8 +181,9 @@ wxWindowCocoaHider::wxWindowCocoaHider(wxWindow *owner)
 {
     wxASSERT(owner);
     wxASSERT(owner->GetNSViewForHiding());
 {
     wxASSERT(owner);
     wxASSERT(owner->GetNSViewForHiding());

-    m_dummyNSView = [[NSView alloc]
+    m_dummyNSView = [[WX_GET_OBJC_CLASS(wxDummyNSView) alloc]

         initWithFrame:[owner->GetNSViewForHiding() frame]];
         initWithFrame:[owner->GetNSViewForHiding() frame]];

+    [m_dummyNSView setAutoresizingMask: [owner->GetNSViewForHiding() autoresizingMask]];

     AssociateNSView(m_dummyNSView);
 }
 
     AssociateNSView(m_dummyNSView);
 }
 


@@ -86,12 +200,25 @@ void wxWindowCocoaHider::Cocoa_FrameChanged(void)
     [m_owner->GetNSViewForHiding() setFrame:[m_dummyNSView frame]];
 }
 
     [m_owner->GetNSViewForHiding() setFrame:[m_dummyNSView frame]];
 }
 

+
+#ifdef WXCOCOA_FILL_DUMMY_VIEW
+bool wxWindowCocoaHider::Cocoa_drawRect(const NSRect& rect)
+{
+    NSBezierPath *bezpath = [NSBezierPath bezierPathWithRect:rect];
+    [[NSColor greenColor] set];
+    [bezpath stroke];
+    [bezpath fill];
+    return true;
+}
+#endif //def WXCOCOA_FILL_DUMMY_VIEW
+

 // ========================================================================
 // wxFlippedNSClipView
 // ========================================================================
 @interface wxFlippedNSClipView : NSClipView
 - (BOOL)isFlipped;
 @end
 // ========================================================================
 // wxFlippedNSClipView
 // ========================================================================
 @interface wxFlippedNSClipView : NSClipView
 - (BOOL)isFlipped;
 @end

+WX_DECLARE_GET_OBJC_CLASS(wxFlippedNSClipView,NSClipView)

 
 @implementation wxFlippedNSClipView : NSClipView
 - (BOOL)isFlipped
 
 @implementation wxFlippedNSClipView : NSClipView
 - (BOOL)isFlipped


@@ -100,13 +227,15 @@ void wxWindowCocoaHider::Cocoa_FrameChanged(void)
 }
 
 @end
 }
 
 @end

+WX_IMPLEMENT_GET_OBJC_CLASS(wxFlippedNSClipView,NSClipView)

 
 // ========================================================================
 
 // ========================================================================

-// wxWindowCocoaScroller
+// wxWindowCocoaScrollView

 // ========================================================================
 // ========================================================================

-wxWindowCocoaScroller::wxWindowCocoaScroller(wxWindow *owner)
+wxWindowCocoaScrollView::wxWindowCocoaScrollView(wxWindow *owner)

 :   m_owner(owner)
 {
 :   m_owner(owner)
 {

+    wxAutoNSAutoreleasePool pool;

     wxASSERT(owner);
     wxASSERT(owner->GetNSView());
     m_cocoaNSScrollView = [[NSScrollView alloc]
     wxASSERT(owner);
     wxASSERT(owner->GetNSView());
     m_cocoaNSScrollView = [[NSScrollView alloc]


@@ -115,7 +244,7 @@ wxWindowCocoaScroller::wxWindowCocoaScroller(wxWindow *owner)
 
     /* Replace the default NSClipView with a flipped one.  This ensures
        scrolling is "pinned" to the top-left instead of bottom-right. */
 
     /* Replace the default NSClipView with a flipped one.  This ensures
        scrolling is "pinned" to the top-left instead of bottom-right. */

-    NSClipView *flippedClip = [[wxFlippedNSClipView alloc]
+    NSClipView *flippedClip = [[WX_GET_OBJC_CLASS(wxFlippedNSClipView) alloc]

         initWithFrame: [[m_cocoaNSScrollView contentView] frame]];
     [m_cocoaNSScrollView setContentView:flippedClip];
     [flippedClip release];
         initWithFrame: [[m_cocoaNSScrollView contentView] frame]];
     [m_cocoaNSScrollView setContentView:flippedClip];
     [flippedClip release];


@@ -126,8 +255,11 @@ wxWindowCocoaScroller::wxWindowCocoaScroller(wxWindow *owner)
     Encapsulate();
 }
 
     Encapsulate();
 }
 

-void wxWindowCocoaScroller::Encapsulate()
+void wxWindowCocoaScrollView::Encapsulate()

 {
 {

+    // Set the scroll view autoresizingMask to match the current NSView
+    [m_cocoaNSScrollView setAutoresizingMask: [m_owner->GetNSView() autoresizingMask]];
+    [m_owner->GetNSView() setAutoresizingMask: NSViewNotSizable];

     // NOTE: replaceSubView will cause m_cocaNSView to be released
     // except when it hasn't been added into an NSView hierarchy in which
     // case it doesn't need to be and this should work out to a no-op
     // NOTE: replaceSubView will cause m_cocaNSView to be released
     // except when it hasn't been added into an NSView hierarchy in which
     // case it doesn't need to be and this should work out to a no-op


@@ -137,41 +269,43 @@ void wxWindowCocoaScroller::Encapsulate()
     // Now it's also retained by the NSScrollView
 }
 
     // Now it's also retained by the NSScrollView
 }
 

-void wxWindowCocoaScroller::Unencapsulate()
+void wxWindowCocoaScrollView::Unencapsulate()

 {
     [m_cocoaNSScrollView setDocumentView: nil];
     m_owner->CocoaReplaceView(m_cocoaNSScrollView, m_owner->GetNSView());
 {
     [m_cocoaNSScrollView setDocumentView: nil];
     m_owner->CocoaReplaceView(m_cocoaNSScrollView, m_owner->GetNSView());

+    if(![[m_owner->GetNSView() superview] isFlipped])
+        [m_owner->GetNSView() setAutoresizingMask: NSViewMinYMargin];

 }
 
 }
 

-wxWindowCocoaScroller::~wxWindowCocoaScroller()
+wxWindowCocoaScrollView::~wxWindowCocoaScrollView()

 {
     DisassociateNSView(m_cocoaNSScrollView);
     [m_cocoaNSScrollView release];
 }
 
 {
     DisassociateNSView(m_cocoaNSScrollView);
     [m_cocoaNSScrollView release];
 }
 

-void wxWindowCocoaScroller::ClientSizeToSize(int &width, int &height)
+void wxWindowCocoaScrollView::ClientSizeToSize(int &width, int &height)

 {
     NSSize frameSize = [NSScrollView
         frameSizeForContentSize: NSMakeSize(width,height)
         hasHorizontalScroller: [m_cocoaNSScrollView hasHorizontalScroller]
         hasVerticalScroller: [m_cocoaNSScrollView hasVerticalScroller]
         borderType: [m_cocoaNSScrollView borderType]];
 {
     NSSize frameSize = [NSScrollView
         frameSizeForContentSize: NSMakeSize(width,height)
         hasHorizontalScroller: [m_cocoaNSScrollView hasHorizontalScroller]
         hasVerticalScroller: [m_cocoaNSScrollView hasVerticalScroller]
         borderType: [m_cocoaNSScrollView borderType]];

-    width = frameSize.width;
-    height = frameSize.height;
+    width = (int)frameSize.width;
+    height = (int)frameSize.height;

 }
 
 }
 

-void wxWindowCocoaScroller::DoGetClientSize(int *x, int *y) const
+void wxWindowCocoaScrollView::DoGetClientSize(int *x, int *y) const

 {
     NSSize nssize = [m_cocoaNSScrollView contentSize];
     if(x)
 {
     NSSize nssize = [m_cocoaNSScrollView contentSize];
     if(x)

-        *x = nssize.width;
+        *x = (int)nssize.width;

     if(y)
     if(y)

-        *y = nssize.height;
+        *y = (int)nssize.height;

 }
 
 }
 

-void wxWindowCocoaScroller::Cocoa_FrameChanged(void)
+void wxWindowCocoaScrollView::Cocoa_FrameChanged(void)

 {
 {

-    wxLogDebug("Cocoa_FrameChanged");
+    wxLogTrace(wxTRACE_COCOA,wxT("Cocoa_FrameChanged"));

     wxSizeEvent event(m_owner->GetSize(), m_owner->GetId());
     event.SetEventObject(m_owner);
     m_owner->GetEventHandler()->ProcessEvent(event);
     wxSizeEvent event(m_owner->GetSize(), m_owner->GetId());
     event.SetEventObject(m_owner);
     m_owner->GetEventHandler()->ProcessEvent(event);


@@ -195,14 +329,12 @@ wxWindow *wxWindowCocoa::sm_capturedWindow = NULL;
 // Constructor
 void wxWindowCocoa::Init()
 {
 // Constructor
 void wxWindowCocoa::Init()
 {

-    InitBase();
-

     m_cocoaNSView = NULL;
     m_cocoaHider = NULL;
     m_cocoaNSView = NULL;
     m_cocoaHider = NULL;

-    m_cocoaScroller = NULL;
-    m_isBeingDeleted = FALSE;
-    m_isInPaint = FALSE;
-    m_shouldBeEnabled = true;
+    m_wxCocoaScrollView = NULL;
+    m_isBeingDeleted = false;
+    m_isInPaint = false;
+    m_visibleTrackingRectManager = NULL;

 }
 
 // Constructor
 }
 
 // Constructor


@@ -217,17 +349,17 @@ bool wxWindow::Create(wxWindow *parent, wxWindowID winid,
 
     // TODO: create the window
     m_cocoaNSView = NULL;
 
     // TODO: create the window
     m_cocoaNSView = NULL;

-    SetNSView([[NSView alloc] initWithFrame: MakeDefaultNSRect(size)]);
+    SetNSView([[WX_GET_OBJC_CLASS(WXNSView) alloc] initWithFrame: MakeDefaultNSRect(size)]);

     [m_cocoaNSView release];
 
     if (m_parent)
     {
         m_parent->AddChild(this);
         m_parent->CocoaAddChild(this);
     [m_cocoaNSView release];
 
     if (m_parent)
     {
         m_parent->AddChild(this);
         m_parent->CocoaAddChild(this);

+        SetInitialFrameRect(pos,size);

     }
     }

-    SetInitialFrameRect(pos,size);

 
 

-    return TRUE;
+    return true;

 }
 
 // Destructor
 }
 
 // Destructor


@@ -236,17 +368,22 @@ wxWindow::~wxWindow()
     wxAutoNSAutoreleasePool pool;
     DestroyChildren();
 
     wxAutoNSAutoreleasePool pool;
     DestroyChildren();
 

-    if(m_parent)
-        m_parent->RemoveChild(this);
-
-    CocoaRemoveFromParent();
+    // Make sure our parent (in the wxWidgets sense) is our superview
+    // before we go removing from it.
+    if(m_parent && m_parent->GetNSView()==[GetNSViewForSuperview() superview])
+        CocoaRemoveFromParent();

     delete m_cocoaHider;
     delete m_cocoaHider;

-    delete m_cocoaScroller;
+    delete m_wxCocoaScrollView;
+    if(m_cocoaNSView)
+        SendDestroyEvent();

     SetNSView(NULL);
 }
 
 void wxWindowCocoa::CocoaAddChild(wxWindowCocoa *child)
 {
     SetNSView(NULL);
 }
 
 void wxWindowCocoa::CocoaAddChild(wxWindowCocoa *child)
 {

+    // Pool here due to lack of one during wx init phase
+    wxAutoNSAutoreleasePool pool;
+

     NSView *childView = child->GetNSViewForSuperview();
 
     wxASSERT(childView);
     NSView *childView = child->GetNSViewForSuperview();
 
     wxASSERT(childView);


@@ -261,60 +398,113 @@ void wxWindowCocoa::CocoaRemoveFromParent(void)
 
 void wxWindowCocoa::SetNSView(WX_NSView cocoaNSView)
 {
 
 void wxWindowCocoa::SetNSView(WX_NSView cocoaNSView)
 {

+    // Clear the visible area tracking rect if we have one.
+    delete m_visibleTrackingRectManager;
+    m_visibleTrackingRectManager = NULL;
+

     bool need_debug = cocoaNSView || m_cocoaNSView;
     bool need_debug = cocoaNSView || m_cocoaNSView;

-    if(need_debug) wxLogDebug("wxWindowCocoa=%p::SetNSView [m_cocoaNSView=%p retainCount]=%d",this,m_cocoaNSView,[m_cocoaNSView retainCount]);
+    if(need_debug) wxLogTrace(wxTRACE_COCOA_RetainRelease,wxT("wxWindowCocoa=%p::SetNSView [m_cocoaNSView=%p retainCount]=%d"),this,m_cocoaNSView,[m_cocoaNSView retainCount]);

     DisassociateNSView(m_cocoaNSView);
     [cocoaNSView retain];
     [m_cocoaNSView release];
     m_cocoaNSView = cocoaNSView;
     AssociateNSView(m_cocoaNSView);
     DisassociateNSView(m_cocoaNSView);
     [cocoaNSView retain];
     [m_cocoaNSView release];
     m_cocoaNSView = cocoaNSView;
     AssociateNSView(m_cocoaNSView);

-    if(need_debug) wxLogDebug("wxWindowCocoa=%p::SetNSView [cocoaNSView=%p retainCount]=%d",this,cocoaNSView,[cocoaNSView retainCount]);
+    if(need_debug) wxLogTrace(wxTRACE_COCOA_RetainRelease,wxT("wxWindowCocoa=%p::SetNSView [cocoaNSView=%p retainCount]=%d"),this,cocoaNSView,[cocoaNSView retainCount]);

 }
 
 WX_NSView wxWindowCocoa::GetNSViewForSuperview() const
 {
     return m_cocoaHider
         ?   m_cocoaHider->GetNSView()
 }
 
 WX_NSView wxWindowCocoa::GetNSViewForSuperview() const
 {
     return m_cocoaHider
         ?   m_cocoaHider->GetNSView()

-        :   m_cocoaScroller
-            ?   m_cocoaScroller->GetNSScrollView()
+        :   m_wxCocoaScrollView
+            ?   m_wxCocoaScrollView->GetNSScrollView()

             :   m_cocoaNSView;
 }
 
 WX_NSView wxWindowCocoa::GetNSViewForHiding() const
 {
             :   m_cocoaNSView;
 }
 
 WX_NSView wxWindowCocoa::GetNSViewForHiding() const
 {

-    return m_cocoaScroller
-        ?   m_cocoaScroller->GetNSScrollView()
+    return m_wxCocoaScrollView
+        ?   m_wxCocoaScrollView->GetNSScrollView()

         :   m_cocoaNSView;
 }
 
         :   m_cocoaNSView;
 }
 

+NSPoint wxWindowCocoa::CocoaTransformBoundsToWx(NSPoint pointBounds)
+{
+    // TODO: Handle scrolling offset
+    return CocoaTransformNSViewBoundsToWx(GetNSView(), pointBounds);
+}
+
+NSRect wxWindowCocoa::CocoaTransformBoundsToWx(NSRect rectBounds)
+{
+    // TODO: Handle scrolling offset
+    return CocoaTransformNSViewBoundsToWx(GetNSView(), rectBounds);
+}
+
+NSPoint wxWindowCocoa::CocoaTransformWxToBounds(NSPoint pointWx)
+{
+    // TODO: Handle scrolling offset
+    return CocoaTransformNSViewWxToBounds(GetNSView(), pointWx);
+}
+
+NSRect wxWindowCocoa::CocoaTransformWxToBounds(NSRect rectWx)
+{
+    // TODO: Handle scrolling offset
+    return CocoaTransformNSViewWxToBounds(GetNSView(), rectWx);
+}
+
+WX_NSAffineTransform wxWindowCocoa::CocoaGetWxToBoundsTransform()
+{
+    // TODO: Handle scrolling offset
+    NSAffineTransform *transform = wxDC::CocoaGetWxToBoundsTransform([GetNSView() isFlipped], [GetNSView() bounds].size.height);
+    return transform;
+}
+

 bool wxWindowCocoa::Cocoa_drawRect(const NSRect &rect)
 {
 bool wxWindowCocoa::Cocoa_drawRect(const NSRect &rect)
 {

-    wxLogDebug("Cocoa_drawRect");
+    wxLogTrace(wxTRACE_COCOA,wxT("Cocoa_drawRect"));

     // Recursion can happen if the event loop runs from within the paint
     // handler.  For instance, if an assertion dialog is shown.
     // FIXME: This seems less than ideal.
     if(m_isInPaint)
     {
     // Recursion can happen if the event loop runs from within the paint
     // handler.  For instance, if an assertion dialog is shown.
     // FIXME: This seems less than ideal.
     if(m_isInPaint)
     {

-        wxLogDebug("Paint event recursion!");
+        wxLogDebug(wxT("Paint event recursion!"));

         return false;
     }
         return false;
     }

-    //FIXME: should probably turn that rect into the update region
-    m_isInPaint = TRUE;
+    m_isInPaint = true;
+
+    // Set m_updateRegion
+    const NSRect *rects = &rect; // The bounding box of the region
+    NSInteger countRects = 1;
+    // Try replacing the larger rectangle with a list of smaller ones:
+    if ([GetNSView() respondsToSelector:@selector(getRectsBeingDrawn:count:)])
+        [GetNSView() getRectsBeingDrawn:&rects count:&countRects];
+
+    NSRect *transformedRects = (NSRect*)malloc(sizeof(NSRect)*countRects);
+    for(int i=0; i<countRects; i++)
+    {
+        transformedRects[i] = CocoaTransformBoundsToWx(rects[i]);
+    }
+    m_updateRegion = wxRegion(transformedRects,countRects);
+    free(transformedRects);
+

     wxPaintEvent event(m_windowId);
     event.SetEventObject(this);
     bool ret = GetEventHandler()->ProcessEvent(event);
     wxPaintEvent event(m_windowId);
     event.SetEventObject(this);
     bool ret = GetEventHandler()->ProcessEvent(event);

-    m_isInPaint = FALSE;
+    m_isInPaint = false;

     return ret;
 }
 
 void wxWindowCocoa::InitMouseEvent(wxMouseEvent& event, WX_NSEvent cocoaEvent)
 {
     return ret;
 }
 
 void wxWindowCocoa::InitMouseEvent(wxMouseEvent& event, WX_NSEvent cocoaEvent)
 {

-    wxASSERT_MSG([m_cocoaNSView window]==[cocoaEvent window],"Mouse event for different NSWindow");
+    wxASSERT_MSG([m_cocoaNSView window]==[cocoaEvent window],wxT("Mouse event for different NSWindow"));
+    // Mouse events happen at the NSWindow level so we need to convert
+    // into our bounds coordinates then convert to wx coordinates.

     NSPoint cocoaPoint = [m_cocoaNSView convertPoint:[(NSEvent*)cocoaEvent locationInWindow] fromView:nil];
     NSPoint cocoaPoint = [m_cocoaNSView convertPoint:[(NSEvent*)cocoaEvent locationInWindow] fromView:nil];

-    NSRect cocoaRect = [m_cocoaNSView frame];
+    NSPoint pointWx = CocoaTransformBoundsToWx(cocoaPoint);
+    // FIXME: Should we be adjusting for client area origin?

     const wxPoint &clientorigin = GetClientAreaOrigin();
     const wxPoint &clientorigin = GetClientAreaOrigin();

-    event.m_x = (wxCoord)cocoaPoint.x - clientorigin.x;
-    event.m_y = (wxCoord)(cocoaRect.size.height - cocoaPoint.y) - clientorigin.y;
+    event.m_x = (wxCoord)pointWx.x - clientorigin.x;
+    event.m_y = (wxCoord)pointWx.y - clientorigin.y;

 
     event.m_shiftDown = [cocoaEvent modifierFlags] & NSShiftKeyMask;
     event.m_controlDown = [cocoaEvent modifierFlags] & NSControlKeyMask;
 
     event.m_shiftDown = [cocoaEvent modifierFlags] & NSShiftKeyMask;
     event.m_controlDown = [cocoaEvent modifierFlags] & NSControlKeyMask;


@@ -330,25 +520,72 @@ bool wxWindowCocoa::Cocoa_mouseMoved(WX_NSEvent theEvent)
 {
     wxMouseEvent event(wxEVT_MOTION);
     InitMouseEvent(event,theEvent);
 {
     wxMouseEvent event(wxEVT_MOTION);
     InitMouseEvent(event,theEvent);

-    wxLogDebug("Mouse Drag @%d,%d",event.m_x,event.m_y);
+    wxLogTrace(wxTRACE_COCOA,wxT("wxWindow=%p::Cocoa_mouseMoved @%d,%d"),this,event.m_x,event.m_y);

     return GetEventHandler()->ProcessEvent(event);
 }
 
     return GetEventHandler()->ProcessEvent(event);
 }
 

+void wxWindowCocoa::Cocoa_synthesizeMouseMoved()
+{
+    wxMouseEvent event(wxEVT_MOTION);
+    NSWindow *window = [GetNSView() window];
+    NSPoint locationInWindow = [window mouseLocationOutsideOfEventStream];
+    NSPoint cocoaPoint = [m_cocoaNSView convertPoint:locationInWindow fromView:nil];
+
+    NSPoint pointWx = CocoaTransformBoundsToWx(cocoaPoint);
+    // FIXME: Should we be adjusting for client area origin?
+    const wxPoint &clientorigin = GetClientAreaOrigin();
+    event.m_x = (wxCoord)pointWx.x - clientorigin.x;
+    event.m_y = (wxCoord)pointWx.y - clientorigin.y;
+
+    // TODO: Handle shift, control, alt, meta flags
+    event.SetEventObject(this);
+    event.SetId(GetId());
+
+    wxLogTrace(wxTRACE_COCOA,wxT("wxwin=%p Synthesized Mouse Moved @%d,%d"),this,event.m_x,event.m_y);
+    GetEventHandler()->ProcessEvent(event);
+}
+

 bool wxWindowCocoa::Cocoa_mouseEntered(WX_NSEvent theEvent)
 {
 bool wxWindowCocoa::Cocoa_mouseEntered(WX_NSEvent theEvent)
 {

-    return false;
+    if(m_visibleTrackingRectManager != NULL && m_visibleTrackingRectManager->IsOwnerOfEvent(theEvent))
+    {
+        m_visibleTrackingRectManager->BeginSynthesizingEvents();
+
+        // Although we synthesize the mouse moved events we don't poll for them but rather send them only when
+        // some other event comes in.  That other event is (guess what) mouse moved events that will be sent
+        // to the NSWindow which will forward them on to the first responder.  We are not likely to be the
+        // first responder, so the mouseMoved: events are effectively discarded.
+        [[GetNSView() window] setAcceptsMouseMovedEvents:YES];
+
+        wxMouseEvent event(wxEVT_ENTER_WINDOW);
+        InitMouseEvent(event,theEvent);
+        wxLogTrace(wxTRACE_COCOA,wxT("wxwin=%p Mouse Entered @%d,%d"),this,event.m_x,event.m_y);
+        return GetEventHandler()->ProcessEvent(event);
+    }
+    else
+        return false;

 }
 
 bool wxWindowCocoa::Cocoa_mouseExited(WX_NSEvent theEvent)
 {
 }
 
 bool wxWindowCocoa::Cocoa_mouseExited(WX_NSEvent theEvent)
 {

-    return false;
+    if(m_visibleTrackingRectManager != NULL && m_visibleTrackingRectManager->IsOwnerOfEvent(theEvent))
+    {
+        m_visibleTrackingRectManager->StopSynthesizingEvents();
+
+        wxMouseEvent event(wxEVT_LEAVE_WINDOW);
+        InitMouseEvent(event,theEvent);
+        wxLogTrace(wxTRACE_COCOA,wxT("wxwin=%p Mouse Exited @%d,%d"),this,event.m_x,event.m_y);
+        return GetEventHandler()->ProcessEvent(event);
+    }
+    else
+        return false;

 }
 
 bool wxWindowCocoa::Cocoa_mouseDown(WX_NSEvent theEvent)
 {
     wxMouseEvent event([theEvent clickCount]<2?wxEVT_LEFT_DOWN:wxEVT_LEFT_DCLICK);
     InitMouseEvent(event,theEvent);
 }
 
 bool wxWindowCocoa::Cocoa_mouseDown(WX_NSEvent theEvent)
 {
     wxMouseEvent event([theEvent clickCount]<2?wxEVT_LEFT_DOWN:wxEVT_LEFT_DCLICK);
     InitMouseEvent(event,theEvent);

-    wxLogDebug("Mouse Down @%d,%d num clicks=%d",event.m_x,event.m_y,[theEvent clickCount]);
+    wxLogTrace(wxTRACE_COCOA,wxT("Mouse Down @%d,%d num clicks=%d"),event.m_x,event.m_y,[theEvent clickCount]);

     return GetEventHandler()->ProcessEvent(event);
 }
 
     return GetEventHandler()->ProcessEvent(event);
 }
 


@@ -357,7 +594,7 @@ bool wxWindowCocoa::Cocoa_mouseDragged(WX_NSEvent theEvent)
     wxMouseEvent event(wxEVT_MOTION);
     InitMouseEvent(event,theEvent);
     event.m_leftDown = true;
     wxMouseEvent event(wxEVT_MOTION);
     InitMouseEvent(event,theEvent);
     event.m_leftDown = true;

-    wxLogDebug("Mouse Drag @%d,%d",event.m_x,event.m_y);
+    wxLogTrace(wxTRACE_COCOA,wxT("Mouse Drag @%d,%d"),event.m_x,event.m_y);

     return GetEventHandler()->ProcessEvent(event);
 }
 
     return GetEventHandler()->ProcessEvent(event);
 }
 


@@ -365,23 +602,33 @@ bool wxWindowCocoa::Cocoa_mouseUp(WX_NSEvent theEvent)
 {
     wxMouseEvent event(wxEVT_LEFT_UP);
     InitMouseEvent(event,theEvent);
 {
     wxMouseEvent event(wxEVT_LEFT_UP);
     InitMouseEvent(event,theEvent);

-    wxLogDebug("Mouse Up @%d,%d",event.m_x,event.m_y);
+    wxLogTrace(wxTRACE_COCOA,wxT("Mouse Up @%d,%d"),event.m_x,event.m_y);

     return GetEventHandler()->ProcessEvent(event);
 }
 
 bool wxWindowCocoa::Cocoa_rightMouseDown(WX_NSEvent theEvent)
 {
     return GetEventHandler()->ProcessEvent(event);
 }
 
 bool wxWindowCocoa::Cocoa_rightMouseDown(WX_NSEvent theEvent)
 {

-    return false;
+    wxMouseEvent event([theEvent clickCount]<2?wxEVT_RIGHT_DOWN:wxEVT_RIGHT_DCLICK);
+    InitMouseEvent(event,theEvent);
+    wxLogDebug(wxT("Mouse Down @%d,%d num clicks=%d"),event.m_x,event.m_y,[theEvent clickCount]);
+    return GetEventHandler()->ProcessEvent(event);

 }
 
 bool wxWindowCocoa::Cocoa_rightMouseDragged(WX_NSEvent theEvent)
 {
 }
 
 bool wxWindowCocoa::Cocoa_rightMouseDragged(WX_NSEvent theEvent)
 {

-    return false;
+    wxMouseEvent event(wxEVT_MOTION);
+    InitMouseEvent(event,theEvent);
+    event.m_rightDown = true;
+    wxLogDebug(wxT("Mouse Drag @%d,%d"),event.m_x,event.m_y);
+    return GetEventHandler()->ProcessEvent(event);

 }
 
 bool wxWindowCocoa::Cocoa_rightMouseUp(WX_NSEvent theEvent)
 {
 }
 
 bool wxWindowCocoa::Cocoa_rightMouseUp(WX_NSEvent theEvent)
 {

-    return false;
+    wxMouseEvent event(wxEVT_RIGHT_UP);
+    InitMouseEvent(event,theEvent);
+    wxLogDebug(wxT("Mouse Up @%d,%d"),event.m_x,event.m_y);
+    return GetEventHandler()->ProcessEvent(event);

 }
 
 bool wxWindowCocoa::Cocoa_otherMouseDown(WX_NSEvent theEvent)
 }
 
 bool wxWindowCocoa::Cocoa_otherMouseDown(WX_NSEvent theEvent)


@@ -401,48 +648,70 @@ bool wxWindowCocoa::Cocoa_otherMouseUp(WX_NSEvent theEvent)
 
 void wxWindowCocoa::Cocoa_FrameChanged(void)
 {
 
 void wxWindowCocoa::Cocoa_FrameChanged(void)
 {

-    wxLogDebug("Cocoa_FrameChanged");
+    wxLogTrace(wxTRACE_COCOA,wxT("wxWindow=%p::Cocoa_FrameChanged"),this);
+    if(m_visibleTrackingRectManager != NULL)
+        m_visibleTrackingRectManager->RebuildTrackingRect();

     wxSizeEvent event(GetSize(), m_windowId);
     event.SetEventObject(this);
     GetEventHandler()->ProcessEvent(event);
 }
 
     wxSizeEvent event(GetSize(), m_windowId);
     event.SetEventObject(this);
     GetEventHandler()->ProcessEvent(event);
 }
 

-bool wxWindow::Close(bool force)
+bool wxWindowCocoa::Cocoa_resetCursorRects()

 {
 {

+    wxLogTrace(wxTRACE_COCOA,wxT("wxWindow=%p::Cocoa_resetCursorRects"),this);
+    if(m_visibleTrackingRectManager != NULL)
+        m_visibleTrackingRectManager->RebuildTrackingRect();
+
+    if(!m_cursor.GetNSCursor())
+        return false;
+
+    [GetNSView() addCursorRect: [GetNSView() visibleRect]  cursor: m_cursor.GetNSCursor()];
+
+    return true;
+}
+
+bool wxWindowCocoa::SetCursor(const wxCursor &cursor)
+{
+    if(!wxWindowBase::SetCursor(cursor))
+        return false;
+    // Invalidate the cursor rects so the cursor will change
+    [[GetNSView() window] invalidateCursorRectsForView:GetNSView()];
+    return true;
+}
+
+bool wxWindowCocoa::Cocoa_viewDidMoveToWindow()
+{
+    wxLogTrace(wxTRACE_COCOA,wxT("wxWindow=%p::viewDidMoveToWindow"),this);
+    // Set up new tracking rects.  I am reasonably sure the new window must be set before doing this.
+    if(m_visibleTrackingRectManager != NULL)
+        m_visibleTrackingRectManager->BuildTrackingRect();

     return false;
 }
 
     return false;
 }
 

-void wxWindow::CocoaReplaceView(WX_NSView oldView, WX_NSView newView)
+bool wxWindowCocoa::Cocoa_viewWillMoveToWindow(WX_NSWindow newWindow)

 {
 {

-    [[oldView superview] replaceSubview:oldView with:newView];
+    wxLogTrace(wxTRACE_COCOA,wxT("wxWindow=%p::viewWillMoveToWindow:%p"),this, newWindow);
+    // Clear tracking rects.  It is imperative this be done before the new window is set.
+    if(m_visibleTrackingRectManager != NULL)
+        m_visibleTrackingRectManager->ClearTrackingRect();
+    return false;
+}
+
+bool wxWindow::Close(bool force)
+{
+    // The only reason this function exists is that it is virtual and
+    // wxTopLevelWindowCocoa will override it.
+    return wxWindowBase::Close(force);

 }
 
 }
 

-bool wxWindow::EnableSelfAndChildren(bool enable)
+void wxWindow::CocoaReplaceView(WX_NSView oldView, WX_NSView newView)

 {
 {

-    // If the state isn't changing, don't do anything
-    if(!wxWindowBase::Enable(enable && m_shouldBeEnabled))
-        return false;
-    // Set the state of the Cocoa window
-    CocoaSetEnabled(m_isEnabled);
-    // Disable all children or (if enabling) return them to their proper state
-    for(wxWindowList::compatibility_iterator node = GetChildren().GetFirst();
-        node; node = node->GetNext())
-    {
-        node->GetData()->EnableSelfAndChildren(enable);
-    }
-    return true;
+    [[oldView superview] replaceSubview:oldView with:newView];

 }
 
 }
 

-bool wxWindow::Enable(bool enable)
+void wxWindow::DoEnable(bool enable)

 {
 {

-    // Keep track of what the window SHOULD be doing
-    m_shouldBeEnabled = enable;
-    // If the parent is disabled for any reason, then this window will be too.
-    if(!IsTopLevel() && GetParent())
-    {
-        enable = enable && GetParent()->IsEnabled();
-    }
-    return EnableSelfAndChildren(enable);
+       CocoaSetEnabled(enable);

 }
 
 bool wxWindow::Show(bool show)
 }
 
 bool wxWindow::Show(bool show)


@@ -451,7 +720,7 @@ bool wxWindow::Show(bool show)
     // If the window is marked as visible, then it shouldn't have a dummy view
     // If the window is marked hidden, then it should have a dummy view
     // wxSpinCtrl (generic) abuses m_isShown, don't use it for any logic
     // If the window is marked as visible, then it shouldn't have a dummy view
     // If the window is marked hidden, then it should have a dummy view
     // wxSpinCtrl (generic) abuses m_isShown, don't use it for any logic

-//    wxASSERT_MSG( (m_isShown && !m_dummyNSView) || (!m_isShown && m_dummyNSView),"wxWindow: m_isShown does not agree with m_dummyNSView");
+//    wxASSERT_MSG( (m_isShown && !m_dummyNSView) || (!m_isShown && m_dummyNSView),wxT("wxWindow: m_isShown does not agree with m_dummyNSView"));

     // Return false if there isn't a window to show or hide
     NSView *cocoaView = GetNSViewForHiding();
     if(!cocoaView)
     // Return false if there isn't a window to show or hide
     NSView *cocoaView = GetNSViewForHiding();
     if(!cocoaView)


@@ -486,7 +755,7 @@ bool wxWindow::Show(bool show)
 
 void wxWindowCocoa::DoSetSize(int x, int y, int width, int height, int sizeFlags)
 {
 
 void wxWindowCocoa::DoSetSize(int x, int y, int width, int height, int sizeFlags)
 {

-//    wxLogDebug("wxWindow=%p::DoSetSizeWindow(%d,%d,%d,%d,Auto: %s%s)",this,x,y,width,height,(sizeFlags&wxSIZE_AUTO_WIDTH)?"W":".",sizeFlags&wxSIZE_AUTO_HEIGHT?"H":".");
+    wxLogTrace(wxTRACE_COCOA_Window_Size,wxT("wxWindow=%p::DoSetSizeWindow(%d,%d,%d,%d,Auto: %s%s)"),this,x,y,width,height,(sizeFlags&wxSIZE_AUTO_WIDTH)?"W":".",sizeFlags&wxSIZE_AUTO_HEIGHT?"H":".");

     int currentX, currentY;
     int currentW, currentH;
     DoGetPosition(&currentX, &currentY);
     int currentX, currentY;
     int currentW, currentH;
     DoGetPosition(&currentX, &currentY);


@@ -498,7 +767,7 @@ void wxWindowCocoa::DoSetSize(int x, int y, int width, int height, int sizeFlags
 
     AdjustForParentClientOrigin(x,y,sizeFlags);
 
 
     AdjustForParentClientOrigin(x,y,sizeFlags);
 

-    wxSize size(-1,-1);
+    wxSize size(wxDefaultSize);

 
     if((width==-1)&&!(sizeFlags&wxSIZE_ALLOW_MINUS_ONE))
     {
 
     if((width==-1)&&!(sizeFlags&wxSIZE_ALLOW_MINUS_ONE))
     {


@@ -524,41 +793,61 @@ void wxWindowCocoa::DoSetSize(int x, int y, int width, int height, int sizeFlags
     DoMoveWindow(x,y,width,height);
 }
 
     DoMoveWindow(x,y,width,height);
 }
 

+#if wxUSE_TOOLTIPS
+
+void wxWindowCocoa::DoSetToolTip( wxToolTip *tip )
+{
+    wxWindowBase::DoSetToolTip(tip);
+
+    if ( m_tooltip )
+    {
+        m_tooltip->SetWindow((wxWindow *)this);
+    }
+}
+
+#endif
+

 void wxWindowCocoa::DoMoveWindow(int x, int y, int width, int height)
 {
 void wxWindowCocoa::DoMoveWindow(int x, int y, int width, int height)
 {

-//    wxLogDebug("wxWindow=%p::DoMoveWindow(%d,%d,%d,%d)",this,x,y,width,height);
+    wxAutoNSAutoreleasePool pool;
+    wxLogTrace(wxTRACE_COCOA_Window_Size,wxT("wxWindow=%p::DoMoveWindow(%d,%d,%d,%d)"),this,x,y,width,height);

 
     NSView *nsview = GetNSViewForSuperview();
     NSView *superview = [nsview superview];
 
     NSView *nsview = GetNSViewForSuperview();
     NSView *superview = [nsview superview];

-    wxCHECK_RET(superview,"NSView does not have a superview");
-    NSRect parentRect = [superview bounds];

 
 

-    NSRect cocoaRect = NSMakeRect(x,parentRect.size.height-(y+height),width,height);
-    [nsview setFrame: cocoaRect];
+    wxCHECK_RET(GetParent(), wxT("Window can only be placed correctly when it has a parent"));
+
+    NSRect oldFrameRect = [nsview frame];
+    NSRect newFrameRect = GetParent()->CocoaTransformWxToBounds(NSMakeRect(x,y,width,height));
+    [nsview setFrame:newFrameRect];

     // Be sure to redraw the parent to reflect the changed position
     // Be sure to redraw the parent to reflect the changed position

-    [superview setNeedsDisplay:YES];
+    [superview setNeedsDisplayInRect:oldFrameRect];
+    [superview setNeedsDisplayInRect:newFrameRect];

 }
 
 void wxWindowCocoa::SetInitialFrameRect(const wxPoint& pos, const wxSize& size)
 {
     NSView *nsview = GetNSViewForSuperview();
     NSView *superview = [nsview superview];
 }
 
 void wxWindowCocoa::SetInitialFrameRect(const wxPoint& pos, const wxSize& size)
 {
     NSView *nsview = GetNSViewForSuperview();
     NSView *superview = [nsview superview];

-    wxCHECK_RET(superview,"NSView does not have a superview");
-    NSRect parentRect = [superview bounds];
+    wxCHECK_RET(superview,wxT("NSView does not have a superview"));
+    wxCHECK_RET(GetParent(), wxT("Window can only be placed correctly when it has a parent"));

     NSRect frameRect = [nsview frame];
     if(size.x!=-1)
         frameRect.size.width = size.x;
     if(size.y!=-1)
         frameRect.size.height = size.y;
     frameRect.origin.x = pos.x;
     NSRect frameRect = [nsview frame];
     if(size.x!=-1)
         frameRect.size.width = size.x;
     if(size.y!=-1)
         frameRect.size.height = size.y;
     frameRect.origin.x = pos.x;

-    frameRect.origin.y = parentRect.size.height-(pos.y+frameRect.size.height);
-    [nsview setFrame: frameRect];
+    frameRect.origin.y = pos.y;

     // Tell Cocoa to change the margin between the bottom of the superview
     // and the bottom of the control.  Keeps the control pinned to the top
     // Tell Cocoa to change the margin between the bottom of the superview
     // and the bottom of the control.  Keeps the control pinned to the top

-    // of its superview so that its position in the wxWindows coordinate
+    // of its superview so that its position in the wxWidgets coordinate

     // system doesn't change.
     if(![superview isFlipped])
         [nsview setAutoresizingMask: NSViewMinYMargin];
     // system doesn't change.
     if(![superview isFlipped])
         [nsview setAutoresizingMask: NSViewMinYMargin];

+    // MUST set the mask before setFrame: which can generate a size event
+    // and cause a scroller to be added!
+    frameRect = GetParent()->CocoaTransformWxToBounds(frameRect);
+    [nsview setFrame: frameRect];

 }
 
 // Get total size
 }
 
 // Get total size


@@ -569,22 +858,20 @@ void wxWindow::DoGetSize(int *w, int *h) const
         *w=(int)cocoaRect.size.width;
     if(h)
         *h=(int)cocoaRect.size.height;
         *w=(int)cocoaRect.size.width;
     if(h)
         *h=(int)cocoaRect.size.height;

-//    wxLogDebug("wxWindow=%p::DoGetSize = (%d,%d)",this,(int)cocoaRect.size.width,(int)cocoaRect.size.height);
+    wxLogTrace(wxTRACE_COCOA_Window_Size,wxT("wxWindow=%p::DoGetSize = (%d,%d)"),this,(int)cocoaRect.size.width,(int)cocoaRect.size.height);

 }
 
 void wxWindow::DoGetPosition(int *x, int *y) const
 {
     NSView *nsview = GetNSViewForSuperview();
 }
 
 void wxWindow::DoGetPosition(int *x, int *y) const
 {
     NSView *nsview = GetNSViewForSuperview();

-    NSView *superview = [nsview superview];
-    wxCHECK_RET(superview,"NSView does not have a superview");
-    NSRect parentRect = [superview bounds];

 
     NSRect cocoaRect = [nsview frame];
 
     NSRect cocoaRect = [nsview frame];

+    NSRect rectWx = GetParent()->CocoaTransformBoundsToWx(cocoaRect);

     if(x)
     if(x)

-        *x=(int)cocoaRect.origin.x;
+        *x=(int)rectWx.origin.x;

     if(y)
     if(y)

-        *y=(int)(parentRect.size.height-(cocoaRect.origin.y+cocoaRect.size.height));
-//    wxLogDebug("wxWindow=%p::DoGetPosition = (%d,%d)",this,(int)cocoaRect.origin.x,(int)cocoaRect.origin.y);
+        *y=(int)rectWx.origin.y;
+    wxLogTrace(wxTRACE_COCOA_Window_Size,wxT("wxWindow=%p::DoGetPosition = (%d,%d)"),this,(int)cocoaRect.origin.x,(int)cocoaRect.origin.y);

 }
 
 WXWidget wxWindow::GetHandle() const
 }
 
 WXWidget wxWindow::GetHandle() const


@@ -592,6 +879,11 @@ WXWidget wxWindow::GetHandle() const
     return m_cocoaNSView;
 }
 
     return m_cocoaNSView;
 }
 

+wxWindow* wxWindow::GetWxWindow() const
+{
+    return (wxWindow*) this;
+}
+

 void wxWindow::Refresh(bool eraseBack, const wxRect *rect)
 {
     [m_cocoaNSView setNeedsDisplay:YES];
 void wxWindow::Refresh(bool eraseBack, const wxRect *rect)
 {
     [m_cocoaNSView setNeedsDisplay:YES];


@@ -599,7 +891,8 @@ void wxWindow::Refresh(bool eraseBack, const wxRect *rect)
 
 void wxWindow::SetFocus()
 {
 
 void wxWindow::SetFocus()
 {

-    // TODO
+    if([GetNSView() acceptsFirstResponder])
+        [[GetNSView() window] makeFirstResponder: GetNSView()];

 }
 
 void wxWindow::DoCaptureMouse()
 }
 
 void wxWindow::DoCaptureMouse()


@@ -627,24 +920,36 @@ void wxWindow::DoClientToScreen(int *x, int *y) const
 // Get size *available for subwindows* i.e. excluding menu bar etc.
 void wxWindow::DoGetClientSize(int *x, int *y) const
 {
 // Get size *available for subwindows* i.e. excluding menu bar etc.
 void wxWindow::DoGetClientSize(int *x, int *y) const
 {

-    wxLogDebug("DoGetClientSize:");
-    if(m_cocoaScroller)
-        m_cocoaScroller->DoGetClientSize(x,y);
+    wxLogTrace(wxTRACE_COCOA,wxT("DoGetClientSize:"));
+    if(m_wxCocoaScrollView)
+        m_wxCocoaScrollView->DoGetClientSize(x,y);

     else
         wxWindowCocoa::DoGetSize(x,y);
 }
 
 void wxWindow::DoSetClientSize(int width, int height)
 {
     else
         wxWindowCocoa::DoGetSize(x,y);
 }
 
 void wxWindow::DoSetClientSize(int width, int height)
 {

-    wxLogDebug("DoSetClientSize=(%d,%d)",width,height);
-    if(m_cocoaScroller)
-        m_cocoaScroller->ClientSizeToSize(width,height);
+    wxLogTrace(wxTRACE_COCOA_Window_Size,wxT("DoSetClientSize=(%d,%d)"),width,height);
+    if(m_wxCocoaScrollView)
+        m_wxCocoaScrollView->ClientSizeToSize(width,height);

     CocoaSetWxWindowSize(width,height);
 }
 
 void wxWindow::CocoaSetWxWindowSize(int width, int height)
 {
     CocoaSetWxWindowSize(width,height);
 }
 
 void wxWindow::CocoaSetWxWindowSize(int width, int height)
 {

-    wxWindowCocoa::DoSetSize(-1,-1,width,height,wxSIZE_USE_EXISTING);
+    wxWindowCocoa::DoSetSize(wxDefaultCoord,wxDefaultCoord,width,height,wxSIZE_USE_EXISTING);
+}
+
+void wxWindow::SetLabel(const wxString& WXUNUSED(label))
+{
+    // Intentional no-op.
+}
+
+wxString wxWindow::GetLabel() const
+{
+    // General Get/Set of labels is implemented in wxControlBase
+    wxLogDebug(wxT("wxWindow::GetLabel: Should be overridden if needed."));
+    return wxEmptyString;

 }
 
 int wxWindow::GetCharHeight() const
 }
 
 int wxWindow::GetCharHeight() const


@@ -698,9 +1003,9 @@ void wxWindow::SetScrollPos(int orient, int pos, bool refresh)
 
 void wxWindow::CocoaCreateNSScrollView()
 {
 
 void wxWindow::CocoaCreateNSScrollView()
 {

-    if(!m_cocoaScroller)
+    if(!m_wxCocoaScrollView)

     {
     {

-        m_cocoaScroller = new wxWindowCocoaScroller(this);
+        m_wxCocoaScrollView = new wxWindowCocoaScrollView(this);

     }
 }
 
     }
 }
 


@@ -727,19 +1032,82 @@ void wxWindow::DoSetVirtualSize( int x, int y )
 
 bool wxWindow::SetFont(const wxFont& font)
 {
 
 bool wxWindow::SetFont(const wxFont& font)
 {

-    // TODO
-    return TRUE;
+    // FIXME: We may need to handle wx font inheritance.
+    return wxWindowBase::SetFont(font);

 }
 
 }
 

-static int CocoaRaiseWindowCompareFunction(id first, id second, void *target)
+#if 0 // these are used when debugging the algorithm.
+static char const * const comparisonresultStrings[] =
+{   "<"
+,   "=="
+,   ">"
+};
+#endif
+
+class CocoaWindowCompareContext

 {
 {

+    DECLARE_NO_COPY_CLASS(CocoaWindowCompareContext)
+public:
+    CocoaWindowCompareContext(); // Not implemented
+    CocoaWindowCompareContext(NSView *target, NSArray *subviews)
+    {
+        m_target = target;
+        // Cocoa sorts subviews in-place.. make a copy
+        m_subviews = [subviews copy];
+    }
+    ~CocoaWindowCompareContext()
+    {   // release the copy
+        [m_subviews release];
+    }
+    NSView* target()
+    {   return m_target; }
+    NSArray* subviews()
+    {   return m_subviews; }
+    /* Helper function that returns the comparison based off of the original ordering */
+    CocoaWindowCompareFunctionResult CompareUsingOriginalOrdering(id first, id second)
+    {
+        NSUInteger firstI = [m_subviews indexOfObjectIdenticalTo:first];
+        NSUInteger secondI = [m_subviews indexOfObjectIdenticalTo:second];
+        // NOTE: If either firstI or secondI is NSNotFound then it will be NSIntegerMax and thus will
+        // likely compare higher than the other view which is reasonable considering the only way that
+        // can happen is if the subview was added after our call to subviews but before the call to
+        // sortSubviewsUsingFunction:context:.  Thus we don't bother checking.  Particularly because
+        // that case should never occur anyway because that would imply a multi-threaded GUI call
+        // which is a big no-no with Cocoa.
+
+        // Subviews are ordered from back to front meaning one that is already lower will have an lower index.
+        NSComparisonResult result = (firstI < secondI)
+            ?   NSOrderedAscending /* -1 */
+            :   (firstI > secondI)
+                ?   NSOrderedDescending /* 1 */
+                :   NSOrderedSame /* 0 */;
+
+#if 0 // Enable this if you need to debug the algorithm.
+        NSLog(@"%@ [%d] %s %@ [%d]\n", first, firstI, comparisonresultStrings[result+1], second, secondI);
+#endif
+        return result;
+    }
+private:
+    /* The subview we are trying to Raise or Lower */
+    NSView *m_target;
+    /* A copy of the original array of subviews */
+    NSArray *m_subviews;
+};
+
+/* Causes Cocoa to raise the target view to the top of the Z-Order by telling the sort function that
+ * the target view is always higher than every other view.  When comparing two views neither of
+ * which is the target, it returns the correct response based on the original ordering
+ */
+static CocoaWindowCompareFunctionResult CocoaRaiseWindowCompareFunction(id first, id second, void *ctx)
+{
+    CocoaWindowCompareContext *compareContext = (CocoaWindowCompareContext*)ctx;

     // first should be ordered higher
     // first should be ordered higher

-    if(first==target)
+    if(first==compareContext->target())

         return NSOrderedDescending;
     // second should be ordered higher
         return NSOrderedDescending;
     // second should be ordered higher

-    if(second==target)
+    if(second==compareContext->target())

         return NSOrderedAscending;
         return NSOrderedAscending;

-    return NSOrderedSame;
+    return compareContext->CompareUsingOriginalOrdering(first,second);

 }
 
 // Raise the window to the top of the Z order
 }
 
 // Raise the window to the top of the Z order


@@ -747,40 +1115,80 @@ void wxWindow::Raise()
 {
 //    wxAutoNSAutoreleasePool pool;
     NSView *nsview = GetNSViewForSuperview();
 {
 //    wxAutoNSAutoreleasePool pool;
     NSView *nsview = GetNSViewForSuperview();

-    [[nsview superview] sortSubviewsUsingFunction:
+    NSView *superview = [nsview superview];
+    CocoaWindowCompareContext compareContext(nsview, [superview subviews]);
+
+    [superview sortSubviewsUsingFunction:

             CocoaRaiseWindowCompareFunction
             CocoaRaiseWindowCompareFunction

-        context: nsview];
+        context: &compareContext];

 }
 
 }
 

-static int CocoaLowerWindowCompareFunction(id first, id second, void *target)
+/* Causes Cocoa to lower the target view to the bottom of the Z-Order by telling the sort function that
+ * the target view is always lower than every other view.  When comparing two views neither of
+ * which is the target, it returns the correct response based on the original ordering
+ */
+static CocoaWindowCompareFunctionResult CocoaLowerWindowCompareFunction(id first, id second, void *ctx)

 {
 {

+    CocoaWindowCompareContext *compareContext = (CocoaWindowCompareContext*)ctx;

     // first should be ordered lower
     // first should be ordered lower

-    if(first==target)
+    if(first==compareContext->target())

         return NSOrderedAscending;
     // second should be ordered lower
         return NSOrderedAscending;
     // second should be ordered lower

-    if(second==target)
+    if(second==compareContext->target())

         return NSOrderedDescending;
         return NSOrderedDescending;

-    return NSOrderedSame;
+    return compareContext->CompareUsingOriginalOrdering(first,second);

 }
 
 // Lower the window to the bottom of the Z order
 void wxWindow::Lower()
 {
     NSView *nsview = GetNSViewForSuperview();
 }
 
 // Lower the window to the bottom of the Z order
 void wxWindow::Lower()
 {
     NSView *nsview = GetNSViewForSuperview();

-    [[nsview superview] sortSubviewsUsingFunction:
+    NSView *superview = [nsview superview];
+    CocoaWindowCompareContext compareContext(nsview, [superview subviews]);
+
+#if 0
+    NSLog(@"Target:\n%@\n", nsview);
+    NSLog(@"Before:\n%@\n", compareContext.subviews());
+#endif
+    [superview sortSubviewsUsingFunction:

             CocoaLowerWindowCompareFunction
             CocoaLowerWindowCompareFunction

-        context: nsview];
+        context: &compareContext];
+#if 0
+    NSLog(@"After:\n%@\n", [superview subviews]);
+#endif

 }
 
 bool wxWindow::DoPopupMenu(wxMenu *menu, int x, int y)
 {
 }
 
 bool wxWindow::DoPopupMenu(wxMenu *menu, int x, int y)
 {

-    return FALSE;
+    return false;

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

-wxWindow *wxWindowBase::FindFocus()
+wxWindow *wxWindowBase::DoFindFocus()

 {
 {

-    // TODO
+    // Basically we are somewhat emulating the responder chain here except
+    // we are only loking for the first responder in the key window or
+    // upon failing to find one if the main window is different we look
+    // for the first responder in the main window.
+
+    // Note that the firstResponder doesn't necessarily have to be an
+    // NSView but wxCocoaNSView::GetFromCocoa() will simply return
+    // NULL unless it finds its argument in its hash map.
+
+    wxCocoaNSView *win;
+
+    NSWindow *keyWindow = [[NSApplication sharedApplication] keyWindow];
+    win = wxCocoaNSView::GetFromCocoa(static_cast<NSView*>([keyWindow firstResponder]));
+    if(win)
+        return win->GetWxWindow();
+
+    NSWindow *mainWindow = [[NSApplication sharedApplication] keyWindow];
+    if(mainWindow == keyWindow)
+        return NULL;
+    win = wxCocoaNSView::GetFromCocoa(static_cast<NSView*>([mainWindow firstResponder]));
+    if(win)
+        return win->GetWxWindow();
+

     return NULL;
 }
 
     return NULL;
 }
 


@@ -802,9 +1210,104 @@ wxPoint wxGetMousePosition()
     return wxDefaultPosition;
 }
 
     return wxDefaultPosition;
 }
 

+wxMouseState wxGetMouseState()
+{
+    wxMouseState ms;
+    // TODO
+    return ms;
+}
+

 wxWindow* wxFindWindowAtPointer(wxPoint& pt)
 {
     pt = wxGetMousePosition();
     return NULL;
 }
 
 wxWindow* wxFindWindowAtPointer(wxPoint& pt)
 {
     pt = wxGetMousePosition();
     return NULL;
 }
 

+
+// ========================================================================
+// wxCocoaTrackingRectManager
+// ========================================================================
+
+wxCocoaTrackingRectManager::wxCocoaTrackingRectManager(wxWindow *window)
+:   m_window(window)
+{
+    m_isTrackingRectActive = false;
+    m_runLoopObserver = NULL;
+    BuildTrackingRect();
+}
+
+void wxCocoaTrackingRectManager::ClearTrackingRect()
+{
+    if(m_isTrackingRectActive)
+    {
+        [m_window->GetNSView() removeTrackingRect:m_trackingRectTag];
+        m_isTrackingRectActive = false;
+    }
+    // If we were doing periodic events we need to clear those too
+    StopSynthesizingEvents();
+}
+
+void wxCocoaTrackingRectManager::StopSynthesizingEvents()
+{
+    if(m_runLoopObserver != NULL)
+    {
+        CFRunLoopRemoveObserver([[NSRunLoop currentRunLoop] getCFRunLoop], m_runLoopObserver, kCFRunLoopCommonModes);
+        CFRelease(m_runLoopObserver);
+        m_runLoopObserver = NULL;
+    }
+}
+
+void wxCocoaTrackingRectManager::BuildTrackingRect()
+{
+    // Pool here due to lack of one during wx init phase
+    wxAutoNSAutoreleasePool pool;
+
+    wxASSERT_MSG(!m_isTrackingRectActive, wxT("Tracking rect was not cleared"));
+    if([m_window->GetNSView() window] != nil)
+    {
+        m_trackingRectTag = [m_window->GetNSView() addTrackingRect:[m_window->GetNSView() visibleRect] owner:m_window->GetNSView() userData:NULL assumeInside:NO];
+        m_isTrackingRectActive = true;
+    }
+}
+
+static NSPoint s_lastScreenMouseLocation = NSZeroPoint;
+
+static void SynthesizeMouseMovedEvent(CFRunLoopObserverRef observer, CFRunLoopActivity activity, void *info)
+{
+    NSPoint screenMouseLocation = [NSEvent mouseLocation];
+    if(screenMouseLocation.x != s_lastScreenMouseLocation.x || screenMouseLocation.y != s_lastScreenMouseLocation.y)
+    {
+        wxCocoaNSView *win = reinterpret_cast<wxCocoaNSView*>(info);
+        win->Cocoa_synthesizeMouseMoved();
+    }
+}
+
+void wxCocoaTrackingRectManager::BeginSynthesizingEvents()
+{
+    CFRunLoopObserverContext observerContext =
+    {   0
+    ,   static_cast<wxCocoaNSView*>(m_window)
+    ,   NULL
+    ,   NULL
+    ,   NULL
+    };
+    m_runLoopObserver = CFRunLoopObserverCreate(kCFAllocatorDefault, kCFRunLoopBeforeWaiting, TRUE, 0, SynthesizeMouseMovedEvent, &observerContext);
+    CFRunLoopAddObserver([[NSRunLoop currentRunLoop] getCFRunLoop], m_runLoopObserver, kCFRunLoopCommonModes);
+}
+
+void wxCocoaTrackingRectManager::RebuildTrackingRect()
+{
+    ClearTrackingRect();
+    BuildTrackingRect();
+}
+
+wxCocoaTrackingRectManager::~wxCocoaTrackingRectManager()
+{
+    ClearTrackingRect();
+}
+
+bool wxCocoaTrackingRectManager::IsOwnerOfEvent(NSEvent *anEvent)
+{
+    return m_isTrackingRectActive && (m_trackingRectTag == [anEvent trackingNumber]);
+}
+