don't declare inline function with dllexport declaration, this provokes mingw32 warni...

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

diff --git a/src/cocoa/window.mm b/src/cocoa/window.mm
index f2b9e653415121df2373c305019f17d831f91d85..13024b9f67201304dcb56ada7b959aee5a56045e 100644 (file)
--- a/src/cocoa/window.mm
+++ b/src/cocoa/window.mm
@@ -4,30 +4,33 @@
 // 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:    wxWidgets licence
+// Licence:     wxWidgets licence

 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"

+

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

-    #include "wx/tooltip.h"

     #include "wx/window.h"
     #include "wx/window.h"

+    #include "wx/dc.h"
+    #include "wx/utils.h"

 #endif //WX_PRECOMP
 
 #endif //WX_PRECOMP
 

+#include "wx/tooltip.h"
+

 #include "wx/cocoa/autorelease.h"
 #include "wx/cocoa/string.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/NSEvent.h>
 #import <AppKit/NSScrollView.h>
 #import <AppKit/NSColor.h>
 #import <AppKit/NSClipView.h>
 #import <Foundation/NSException.h>

-#import <Foundation/NSString.h>
-
-#include <objc/objc-runtime.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
 
 // Turn this on to paint green over the dummy views for debugging
 #undef WXCOCOA_FILL_DUMMY_VIEW


@@ -36,6 +39,63 @@
 #import <AppKit/NSBezierPath.h>
 #endif //def 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
 // ========================================================================
 // ========================================================================
 // wxWindowCocoaHider
 // ========================================================================


@@ -58,14 +118,14 @@ private:
 };
 
 // ========================================================================
 };
 
 // ========================================================================

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


@@ -76,7 +136,7 @@ protected:
     WX_NSScrollView m_cocoaNSScrollView;
     virtual void Cocoa_FrameChanged(void);
 private:
     WX_NSScrollView m_cocoaNSScrollView;
     virtual void Cocoa_FrameChanged(void);
 private:

-    wxWindowCocoaScroller();
+    wxWindowCocoaScrollView();

 };
 
 // ========================================================================
 };
 
 // ========================================================================


@@ -121,6 +181,7 @@ 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)
 {
 #ifdef WXCOCOA_FILL_DUMMY_VIEW
 bool wxWindowCocoaHider::Cocoa_drawRect(const NSRect& rect)
 {


@@ -148,9 +209,9 @@ bool wxWindowCocoaHider::Cocoa_drawRect(const NSRect& rect)
 @end
 
 // ========================================================================
 @end
 
 // ========================================================================

-// wxWindowCocoaScroller
+// wxWindowCocoaScrollView

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

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

 :   m_owner(owner)
 {
     wxAutoNSAutoreleasePool pool;
 :   m_owner(owner)
 {
     wxAutoNSAutoreleasePool pool;


@@ -173,7 +234,7 @@ 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]];
 {
     // Set the scroll view autoresizingMask to match the current NSView
     [m_cocoaNSScrollView setAutoresizingMask: [m_owner->GetNSView() autoresizingMask]];


@@ -187,7 +248,7 @@ 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());


@@ -195,13 +256,13 @@ void wxWindowCocoaScroller::Unencapsulate()
         [m_owner->GetNSView() setAutoresizingMask: NSViewMinYMargin];
 }
 
         [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)
 {
     NSSize frameSize = [NSScrollView
         frameSizeForContentSize: NSMakeSize(width,height)


@@ -212,7 +273,7 @@ void wxWindowCocoaScroller::ClientSizeToSize(int &width, int &height)
     height = (int)frameSize.height;
 }
 
     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)


@@ -221,7 +282,7 @@ void wxWindowCocoaScroller::DoGetClientSize(int *x, int *y) const
         *y = (int)nssize.height;
 }
 
         *y = (int)nssize.height;
 }
 

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

 {
     wxLogTrace(wxTRACE_COCOA,wxT("Cocoa_FrameChanged"));
     wxSizeEvent event(m_owner->GetSize(), m_owner->GetId());
 {
     wxLogTrace(wxTRACE_COCOA,wxT("Cocoa_FrameChanged"));
     wxSizeEvent event(m_owner->GetSize(), m_owner->GetId());


@@ -249,10 +310,9 @@ void wxWindowCocoa::Init()
 {
     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;

 }
 
 // Constructor
 }
 
 // Constructor


@@ -267,7 +327,7 @@ 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([[WXNSView alloc] initWithFrame: MakeDefaultNSRect(size)]);

     [m_cocoaNSView release];
 
     if (m_parent)
     [m_cocoaNSView release];
 
     if (m_parent)


@@ -277,7 +337,7 @@ bool wxWindow::Create(wxWindow *parent, wxWindowID winid,
         SetInitialFrameRect(pos,size);
     }
 
         SetInitialFrameRect(pos,size);
     }
 

-    return TRUE;
+    return true;

 }
 
 // Destructor
 }
 
 // Destructor


@@ -291,7 +351,7 @@ wxWindow::~wxWindow()
     if(m_parent && m_parent->GetNSView()==[GetNSViewForSuperview() superview])
         CocoaRemoveFromParent();
     delete m_cocoaHider;
     if(m_parent && m_parent->GetNSView()==[GetNSViewForSuperview() superview])
         CocoaRemoveFromParent();
     delete m_cocoaHider;

-    delete m_cocoaScroller;
+    delete m_wxCocoaScrollView;

     if(m_cocoaNSView)
         SendDestroyEvent();
     SetNSView(NULL);
     if(m_cocoaNSView)
         SendDestroyEvent();
     SetNSView(NULL);


@@ -327,18 +387,49 @@ WX_NSView wxWindowCocoa::GetNSViewForSuperview() const
 {
     return m_cocoaHider
         ?   m_cocoaHider->GetNSView()
 {
     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)
 {
     wxLogTrace(wxTRACE_COCOA,wxT("Cocoa_drawRect"));
 bool wxWindowCocoa::Cocoa_drawRect(const NSRect &rect)
 {
     wxLogTrace(wxTRACE_COCOA,wxT("Cocoa_drawRect"));


@@ -350,35 +441,41 @@ bool wxWindowCocoa::Cocoa_drawRect(const NSRect &rect)
         wxLogDebug(wxT("Paint event recursion!"));
         return false;
     }
         wxLogDebug(wxT("Paint event recursion!"));
         return false;
     }

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

-NS_DURING
-    //getRectsBeingDrawn:count: is a optimization that is only available on
-    //Panthar (10.3) and higher.  Check to see if it supports it -
-    if ( [GetNSView() respondsToSelector:@selector(getRectsBeingDrawn:count:)] )    objc_msgSend(GetNSView(),@selector(getRectsBeingDrawn:count:),&rects,&countRects);
-NS_HANDLER
-NS_ENDHANDLER
-    m_updateRegion = wxRegion(rects,countRects);
+    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)
 {
     wxASSERT_MSG([m_cocoaNSView window]==[cocoaEvent window],wxT("Mouse event for different NSWindow"));
     return ret;
 }
 
 void wxWindowCocoa::InitMouseEvent(wxMouseEvent& event, WX_NSEvent cocoaEvent)
 {
     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;


@@ -481,6 +578,16 @@ void wxWindowCocoa::Cocoa_FrameChanged(void)
     GetEventHandler()->ProcessEvent(event);
 }
 
     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)
 {
     // The only reason this function exists is that it is virtual and
 bool wxWindow::Close(bool force)
 {
     // The only reason this function exists is that it is virtual and


@@ -493,32 +600,9 @@ void wxWindow::CocoaReplaceView(WX_NSView oldView, WX_NSView newView)
     [[oldView superview] replaceSubview:oldView with:newView];
 }
 
     [[oldView superview] replaceSubview:oldView with:newView];
 }
 

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

 {
 {

-    // 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;
-}
-
-bool wxWindow::Enable(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)


@@ -574,7 +658,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))
     {


@@ -600,22 +684,20 @@ void wxWindowCocoa::DoSetSize(int x, int y, int width, int height, int sizeFlags
     DoMoveWindow(x,y,width,height);
 }
 
     DoMoveWindow(x,y,width,height);
 }
 

-//We should really get rid of wxToolTip :)
-IMPLEMENT_ABSTRACT_CLASS(wxToolTip, wxObject)
+#if wxUSE_TOOLTIPS

 
 void wxWindowCocoa::DoSetToolTip( wxToolTip *tip )
 {
     wxWindowBase::DoSetToolTip(tip);
 
 
 void wxWindowCocoa::DoSetToolTip( wxToolTip *tip )
 {
     wxWindowBase::DoSetToolTip(tip);
 

-    wxAutoNSAutoreleasePool pool;
-

     if ( m_tooltip )
     {
         m_tooltip->SetWindow((wxWindow *)this);
     if ( m_tooltip )
     {
         m_tooltip->SetWindow((wxWindow *)this);

-        [GetNSView() setToolTip:wxNSStringWithWxString(m_tooltip->GetTip())];

     }
 }
 
     }
 }
 

+#endif
+

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


@@ -623,13 +705,15 @@ void wxWindowCocoa::DoMoveWindow(int x, int y, int width, int height)
 
     NSView *nsview = GetNSViewForSuperview();
     NSView *superview = [nsview superview];
 
     NSView *nsview = GetNSViewForSuperview();
     NSView *superview = [nsview superview];

-    wxCHECK_RET(superview,wxT("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)
 }
 
 void wxWindowCocoa::SetInitialFrameRect(const wxPoint& pos, const wxSize& size)


@@ -637,14 +721,14 @@ void wxWindowCocoa::SetInitialFrameRect(const wxPoint& pos, const wxSize& size)
     NSView *nsview = GetNSViewForSuperview();
     NSView *superview = [nsview superview];
     wxCHECK_RET(superview,wxT("NSView does not have a superview"));
     NSView *nsview = GetNSViewForSuperview();
     NSView *superview = [nsview superview];
     wxCHECK_RET(superview,wxT("NSView does not have a superview"));

-    NSRect parentRect = [superview bounds];
+    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);
+    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 wxWidgets coordinate
     // 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 wxWidgets coordinate


@@ -653,6 +737,7 @@ void wxWindowCocoa::SetInitialFrameRect(const wxPoint& pos, const wxSize& size)
         [nsview setAutoresizingMask: NSViewMinYMargin];
     // MUST set the mask before setFrame: which can generate a size event
     // and cause a scroller to be added!
         [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];
 }
 
     [nsview setFrame: frameRect];
 }
 


@@ -670,15 +755,13 @@ void wxWindow::DoGetSize(int *w, int *h) const
 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,wxT("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));
+        *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);
 }
 
     wxLogTrace(wxTRACE_COCOA_Window_Size,wxT("wxWindow=%p::DoGetPosition = (%d,%d)"),this,(int)cocoaRect.origin.x,(int)cocoaRect.origin.y);
 }
 


@@ -687,6 +770,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];


@@ -694,7 +782,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()


@@ -723,8 +812,8 @@ void wxWindow::DoClientToScreen(int *x, int *y) const
 void wxWindow::DoGetClientSize(int *x, int *y) const
 {
     wxLogTrace(wxTRACE_COCOA,wxT("DoGetClientSize:"));
 void wxWindow::DoGetClientSize(int *x, int *y) const
 {
     wxLogTrace(wxTRACE_COCOA,wxT("DoGetClientSize:"));

-    if(m_cocoaScroller)
-        m_cocoaScroller->DoGetClientSize(x,y);
+    if(m_wxCocoaScrollView)
+        m_wxCocoaScrollView->DoGetClientSize(x,y);

     else
         wxWindowCocoa::DoGetSize(x,y);
 }
     else
         wxWindowCocoa::DoGetSize(x,y);
 }


@@ -732,14 +821,25 @@ void wxWindow::DoGetClientSize(int *x, int *y) const
 void wxWindow::DoSetClientSize(int width, int height)
 {
     wxLogTrace(wxTRACE_COCOA_Window_Size,wxT("DoSetClientSize=(%d,%d)"),width,height);
 void wxWindow::DoSetClientSize(int width, int height)
 {
     wxLogTrace(wxTRACE_COCOA_Window_Size,wxT("DoSetClientSize=(%d,%d)"),width,height);

-    if(m_cocoaScroller)
-        m_cocoaScroller->ClientSizeToSize(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))
+{
+    // TODO
+}
+
+wxString wxWindow::GetLabel() const
+{
+    // TODO
+    return wxEmptyString;

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


@@ -793,9 +893,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);

     }
 }
 
     }
 }
 


@@ -823,7 +923,7 @@ void wxWindow::DoSetVirtualSize( int x, int y )
 bool wxWindow::SetFont(const wxFont& font)
 {
     // TODO
 bool wxWindow::SetFont(const wxFont& font)
 {
     // TODO

-    return TRUE;
+    return true;

 }
 
 static int CocoaRaiseWindowCompareFunction(id first, id second, void *target)
 }
 
 static int CocoaRaiseWindowCompareFunction(id first, id second, void *target)


@@ -869,13 +969,35 @@ void wxWindow::Lower()
 
 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
 wxWindow *wxWindowBase::DoFindFocus()
 {
 }
 
 // Get the window with the focus
 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;
 }
 


@@ -897,9 +1019,15 @@ 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;
 }

-