]> git.saurik.com Git - wxWidgets.git/blobdiff - src/cocoa/window.mm
don't declare inline function with dllexport declaration, this provokes mingw32 warni...
[wxWidgets.git] / src / cocoa / window.mm
index 964d65e8da7ee9234697faa8e91b22ed057bc424..13024b9f67201304dcb56ada7b959aee5a56045e 100644 (file)
@@ -4,21 +4,97 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2002/12/26
-// RCS-ID:      $Id:
+// RCS-ID:      $Id$
 // 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/string.h"
 
-#import <Appkit/NSView.h>
+#include "wx/cocoa/objc/NSView.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
+
+// 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
@@ -34,19 +110,22 @@ protected:
     wxWindowCocoa *m_owner;
     WX_NSView m_dummyNSView;
     virtual void Cocoa_FrameChanged(void);
+#ifdef WXCOCOA_FILL_DUMMY_VIEW
+    virtual bool Cocoa_drawRect(const NSRect& rect);
+#endif //def WXCOCOA_FILL_DUMMY_VIEW
 private:
     wxWindowCocoaHider();
 };
 
 // ========================================================================
-// wxWindowCocoaScroller
+// wxWindowCocoaScrollView
 // ========================================================================
-class wxWindowCocoaScroller: protected wxCocoaNSView
+class wxWindowCocoaScrollView: protected wxCocoaNSView
 {
-    DECLARE_NO_COPY_CLASS(wxWindowCocoaScroller)
+    DECLARE_NO_COPY_CLASS(wxWindowCocoaScrollView)
 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;
@@ -57,9 +136,24 @@ protected:
     WX_NSScrollView m_cocoaNSScrollView;
     virtual void Cocoa_FrameChanged(void);
 private:
-    wxWindowCocoaScroller();
+    wxWindowCocoaScrollView();
 };
 
+// ========================================================================
+// wxDummyNSView
+// ========================================================================
+@interface wxDummyNSView : NSView
+- (NSView *)hitTest:(NSPoint)aPoint;
+@end
+
+@implementation wxDummyNSView : NSView
+- (NSView *)hitTest:(NSPoint)aPoint
+{
+    return nil;
+}
+
+@end
+
 // ========================================================================
 // wxWindowCocoaHider
 // ========================================================================
@@ -68,8 +162,9 @@ wxWindowCocoaHider::wxWindowCocoaHider(wxWindow *owner)
 {
     wxASSERT(owner);
     wxASSERT(owner->GetNSViewForHiding());
-    m_dummyNSView = [[NSView alloc]
+    m_dummyNSView = [[wxDummyNSView alloc]
         initWithFrame:[owner->GetNSViewForHiding() frame]];
+    [m_dummyNSView setAutoresizingMask: [owner->GetNSViewForHiding() autoresizingMask]];
     AssociateNSView(m_dummyNSView);
 }
 
@@ -86,6 +181,18 @@ void wxWindowCocoaHider::Cocoa_FrameChanged(void)
     [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
 // ========================================================================
@@ -102,11 +209,12 @@ void wxWindowCocoaHider::Cocoa_FrameChanged(void)
 @end
 
 // ========================================================================
-// wxWindowCocoaScroller
+// wxWindowCocoaScrollView
 // ========================================================================
-wxWindowCocoaScroller::wxWindowCocoaScroller(wxWindow *owner)
+wxWindowCocoaScrollView::wxWindowCocoaScrollView(wxWindow *owner)
 :   m_owner(owner)
 {
+    wxAutoNSAutoreleasePool pool;
     wxASSERT(owner);
     wxASSERT(owner->GetNSView());
     m_cocoaNSScrollView = [[NSScrollView alloc]
@@ -126,8 +234,11 @@ wxWindowCocoaScroller::wxWindowCocoaScroller(wxWindow *owner)
     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
@@ -137,41 +248,43 @@ void wxWindowCocoaScroller::Encapsulate()
     // 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());
+    if(![[m_owner->GetNSView() superview] isFlipped])
+        [m_owner->GetNSView() setAutoresizingMask: NSViewMinYMargin];
 }
 
-wxWindowCocoaScroller::~wxWindowCocoaScroller()
+wxWindowCocoaScrollView::~wxWindowCocoaScrollView()
 {
     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]];
-    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)
-        *x = nssize.width;
+        *x = (int)nssize.width;
     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);
@@ -195,13 +308,11 @@ wxWindow *wxWindowCocoa::sm_capturedWindow = NULL;
 // Constructor
 void wxWindowCocoa::Init()
 {
-    InitBase();
-
     m_cocoaNSView = NULL;
     m_cocoaHider = NULL;
-    m_cocoaScroller = NULL;
-    m_isBeingDeleted = FALSE;
-    m_isInPaint = FALSE;
+    m_wxCocoaScrollView = NULL;
+    m_isBeingDeleted = false;
+    m_isInPaint = false;
 }
 
 // Constructor
@@ -216,17 +327,17 @@ bool wxWindow::Create(wxWindow *parent, wxWindowID winid,
 
     // TODO: create the window
     m_cocoaNSView = NULL;
-    SetNSView([[NSView alloc] initWithFrame: MakeDefaultNSRect(size)]);
+    SetNSView([[WXNSView alloc] initWithFrame: MakeDefaultNSRect(size)]);
     [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
@@ -235,12 +346,14 @@ wxWindow::~wxWindow()
     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_cocoaScroller;
+    delete m_wxCocoaScrollView;
+    if(m_cocoaNSView)
+        SendDestroyEvent();
     SetNSView(NULL);
 }
 
@@ -261,59 +374,108 @@ void wxWindowCocoa::CocoaRemoveFromParent(void)
 void wxWindowCocoa::SetNSView(WX_NSView 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);
-    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()
-        :   m_cocoaScroller
-            ?   m_cocoaScroller->GetNSScrollView()
+        :   m_wxCocoaScrollView
+            ?   m_wxCocoaScrollView->GetNSScrollView()
             :   m_cocoaNSView;
 }
 
 WX_NSView wxWindowCocoa::GetNSViewForHiding() const
 {
-    return m_cocoaScroller
-        ?   m_cocoaScroller->GetNSScrollView()
+    return m_wxCocoaScrollView
+        ?   m_wxCocoaScrollView->GetNSScrollView()
         :   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)
 {
-    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)
     {
-        wxLogDebug("Paint event recursion!");
+        wxLogDebug(wxT("Paint event recursion!"));
         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
+    int 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);
-    m_isInPaint = FALSE;
+    m_isInPaint = false;
     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];
-    NSRect cocoaRect = [m_cocoaNSView frame];
+    NSPoint pointWx = CocoaTransformBoundsToWx(cocoaPoint);
+    // FIXME: Should we be adjusting for client area origin?
     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;
@@ -329,7 +491,7 @@ bool wxWindowCocoa::Cocoa_mouseMoved(WX_NSEvent theEvent)
 {
     wxMouseEvent event(wxEVT_MOTION);
     InitMouseEvent(event,theEvent);
-    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);
 }
 
@@ -347,7 +509,7 @@ 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);
 }
 
@@ -356,7 +518,7 @@ bool wxWindowCocoa::Cocoa_mouseDragged(WX_NSEvent theEvent)
     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);
 }
 
@@ -364,23 +526,33 @@ bool wxWindowCocoa::Cocoa_mouseUp(WX_NSEvent 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 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)
 {
-    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)
 {
-    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)
@@ -400,15 +572,27 @@ bool wxWindowCocoa::Cocoa_otherMouseUp(WX_NSEvent theEvent)
 
 void wxWindowCocoa::Cocoa_FrameChanged(void)
 {
-    wxLogDebug("Cocoa_FrameChanged");
+    wxLogTrace(wxTRACE_COCOA,wxT("Cocoa_FrameChanged"));
     wxSizeEvent event(GetSize(), m_windowId);
     event.SetEventObject(this);
     GetEventHandler()->ProcessEvent(event);
 }
 
+bool wxWindowCocoa::Cocoa_resetCursorRects()
+{
+    if(!m_cursor.GetNSCursor())
+        return false;
+
+    [GetNSView() addCursorRect: [GetNSView() visibleRect]  cursor: m_cursor.GetNSCursor()];
+
+    return true;
+}
+
 bool wxWindow::Close(bool force)
 {
-    return false;
+    // The only reason this function exists is that it is virtual and
+    // wxTopLevelWindowCocoa will override it.
+    return wxWindowBase::Close(force);
 }
 
 void wxWindow::CocoaReplaceView(WX_NSView oldView, WX_NSView newView)
@@ -416,13 +600,18 @@ void wxWindow::CocoaReplaceView(WX_NSView oldView, WX_NSView newView)
     [[oldView superview] replaceSubview:oldView with:newView];
 }
 
+void wxWindow::DoEnable(bool enable)
+{
+       CocoaSetEnabled(enable);
+}
+
 bool wxWindow::Show(bool show)
 {
     wxAutoNSAutoreleasePool pool;
     // 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)
@@ -457,7 +646,7 @@ bool wxWindow::Show(bool show)
 
 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);
@@ -469,7 +658,7 @@ void wxWindowCocoa::DoSetSize(int x, int y, int width, int height, int sizeFlags
 
     AdjustForParentClientOrigin(x,y,sizeFlags);
 
-    wxSize size(-1,-1);
+    wxSize size(wxDefaultSize);
 
     if((width==-1)&&!(sizeFlags&wxSIZE_ALLOW_MINUS_ONE))
     {
@@ -495,41 +684,61 @@ void wxWindowCocoa::DoSetSize(int x, int y, int width, int height, int sizeFlags
     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)
 {
-//    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];
-    wxCHECK_RET(superview,"NSView does not have a superview");
-    NSRect parentRect = [superview frame];
 
-    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
-    [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];
-    wxCHECK_RET(superview,"NSView does not have a superview");
-    NSRect parentRect = [superview frame];
+    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;
-    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
-    // 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];
+    // 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
@@ -540,22 +749,20 @@ void wxWindow::DoGetSize(int *w, int *h) const
         *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();
-    NSView *superview = [nsview superview];
-    wxCHECK_RET(superview,"NSView does not have a superview");
-    NSRect parentRect = [superview frame];
 
     NSRect cocoaRect = [nsview frame];
+    NSRect rectWx = GetParent()->CocoaTransformBoundsToWx(cocoaRect);
     if(x)
-        *x=(int)cocoaRect.origin.x;
+        *x=(int)rectWx.origin.x;
     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
@@ -563,6 +770,11 @@ WXWidget wxWindow::GetHandle() const
     return m_cocoaNSView;
 }
 
+wxWindow* wxWindow::GetWxWindow() const
+{
+    return (wxWindow*) this;
+}
+
 void wxWindow::Refresh(bool eraseBack, const wxRect *rect)
 {
     [m_cocoaNSView setNeedsDisplay:YES];
@@ -570,7 +782,8 @@ void wxWindow::Refresh(bool eraseBack, const wxRect *rect)
 
 void wxWindow::SetFocus()
 {
-    // TODO
+    if([GetNSView() acceptsFirstResponder])
+        [[GetNSView() window] makeFirstResponder: GetNSView()];
 }
 
 void wxWindow::DoCaptureMouse()
@@ -598,24 +811,35 @@ 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
 {
-    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)
 {
-    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)
 {
-    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))
+{
+    // TODO
+}
+
+wxString wxWindow::GetLabel() const
+{
+    // TODO
+    return wxEmptyString;
 }
 
 int wxWindow::GetCharHeight() const
@@ -669,9 +893,9 @@ void wxWindow::SetScrollPos(int orient, int pos, bool refresh)
 
 void wxWindow::CocoaCreateNSScrollView()
 {
-    if(!m_cocoaScroller)
+    if(!m_wxCocoaScrollView)
     {
-        m_cocoaScroller = new wxWindowCocoaScroller(this);
+        m_wxCocoaScrollView = new wxWindowCocoaScrollView(this);
     }
 }
 
@@ -699,7 +923,7 @@ void wxWindow::DoSetVirtualSize( int x, int y )
 bool wxWindow::SetFont(const wxFont& font)
 {
     // TODO
-    return TRUE;
+    return true;
 }
 
 static int CocoaRaiseWindowCompareFunction(id first, id second, void *target)
@@ -745,13 +969,35 @@ void wxWindow::Lower()
 
 bool wxWindow::DoPopupMenu(wxMenu *menu, int x, int y)
 {
-    return FALSE;
+    return false;
 }
 
 // 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;
 }
 
@@ -773,9 +1019,15 @@ wxPoint wxGetMousePosition()
     return wxDefaultPosition;
 }
 
+wxMouseState wxGetMouseState()
+{
+    wxMouseState ms;
+    // TODO
+    return ms;
+}
+
 wxWindow* wxFindWindowAtPointer(wxPoint& pt)
 {
     pt = wxGetMousePosition();
     return NULL;
 }
-