Store HTML "id" parameter value in wxHtmlCell.

[wxWidgets.git] / src / osx / window_osx.cpp

diff --git a/src/osx/window_osx.cpp b/src/osx/window_osx.cpp
index 8231ba5bb3ffd5a8443b9363f1a64156e21a4f89..afbf5a0a3247ec1ef23e87e85dcd816d77df41b0 100644 (file)
--- a/src/osx/window_osx.cpp
+++ b/src/osx/window_osx.cpp
@@ -1,10 +1,9 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        src/osx/carbon/window.cpp
+// Name:        src/osx/window_osx.cpp

 // Purpose:     wxWindowMac
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
 // Purpose:     wxWindowMac
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01

-// RCS-ID:      $Id: window.cpp 54981 2008-08-05 17:52:02Z SC $

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


@@ -58,17 +57,15 @@
 #endif
 
 #if wxUSE_DRAG_AND_DROP
 #endif
 
 #if wxUSE_DRAG_AND_DROP

-#include "wx/dnd.h"
+    #include "wx/dnd.h"

 #endif
 
 #include "wx/graphics.h"
 
 #if wxOSX_USE_CARBON
 #endif
 
 #include "wx/graphics.h"
 
 #if wxOSX_USE_CARBON

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

 #else
 #else

-#include "wx/osx/private.h"
-// bring in themeing
-#include <Carbon/Carbon.h>
+    #include "wx/osx/private.h"

 #endif
 
 #define MAC_SCROLLBAR_SIZE 15
 #endif
 
 #define MAC_SCROLLBAR_SIZE 15


@@ -78,14 +75,9 @@
 
 #ifdef __WXUNIVERSAL__
     IMPLEMENT_ABSTRACT_CLASS(wxWindowMac, wxWindowBase)
 
 #ifdef __WXUNIVERSAL__
     IMPLEMENT_ABSTRACT_CLASS(wxWindowMac, wxWindowBase)

-#else
-    IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowBase)

 #endif
 
 BEGIN_EVENT_TABLE(wxWindowMac, wxWindowBase)
 #endif
 
 BEGIN_EVENT_TABLE(wxWindowMac, wxWindowBase)

-    EVT_NC_PAINT(wxWindowMac::OnNcPaint)
-    EVT_ERASE_BACKGROUND(wxWindowMac::OnEraseBackground)
-    EVT_PAINT(wxWindowMac::OnPaint)

     EVT_MOUSE_EVENTS(wxWindowMac::OnMouseEvent)
 END_EVENT_TABLE()
 
     EVT_MOUSE_EVENTS(wxWindowMac::OnMouseEvent)
 END_EVENT_TABLE()
 


@@ -94,10 +86,100 @@ END_EVENT_TABLE()
 #define wxMAC_DEBUG_REDRAW 0
 #endif
 
 #define wxMAC_DEBUG_REDRAW 0
 #endif
 

+wxWidgetImplType* kOSXNoWidgetImpl = (wxWidgetImplType*) -1L;
+
+#if wxUSE_HOTKEY && wxOSX_USE_COCOA_OR_CARBON
+
+typedef struct  {
+    EventHotKeyRef ref;
+    int keyId;
+    wxWindow* window;
+} wxHotKeyRec;
+
+wxVector<wxHotKeyRec> s_hotkeys;
+
+#endif
+

 // ===========================================================================
 // implementation
 // ===========================================================================
 
 // ===========================================================================
 // implementation
 // ===========================================================================
 

+// the grow box has to be implemented as an inactive window, so that nothing can direct
+// the focus to it
+
+class WXDLLIMPEXP_CORE wxBlindPlateWindow : public wxWindow
+{
+public:
+    wxBlindPlateWindow() { Init(); }
+
+    // Old-style constructor (no default values for coordinates to avoid
+    // ambiguity with the new one)
+    wxBlindPlateWindow(wxWindow *parent,
+            int x, int y, int width, int height,
+            long style = wxTAB_TRAVERSAL | wxNO_BORDER,
+            const wxString& name = wxPanelNameStr)
+    {
+        Init();
+
+        Create(parent, wxID_ANY, wxPoint(x, y), wxSize(width, height), style, name);
+    }
+
+    // Constructor
+    wxBlindPlateWindow(wxWindow *parent,
+            wxWindowID winid = wxID_ANY,
+            const wxPoint& pos = wxDefaultPosition,
+            const wxSize& size = wxDefaultSize,
+            long style = wxTAB_TRAVERSAL | wxNO_BORDER,
+            const wxString& name = wxPanelNameStr)
+    {
+        Init();
+
+        Create(parent, winid, pos, size, style, name);
+    }
+
+    // Pseudo ctor
+    bool Create(wxWindow *parent,
+                wxWindowID winid = wxID_ANY,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                long style = wxTAB_TRAVERSAL | wxNO_BORDER,
+                const wxString& name = wxPanelNameStr)
+    {
+        if ( !wxWindow::Create(parent, winid, pos, size, style, name) )
+            return false;
+
+        // so that non-solid background renders correctly under GTK+:
+        SetThemeEnabled(true);
+        return true;
+    }
+
+    virtual ~wxBlindPlateWindow();
+
+    virtual bool AcceptsFocus() const
+    {
+        return false;
+    }
+
+protected:
+    // common part of all ctors
+    void Init()
+    {
+    }
+
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxBlindPlateWindow)
+    DECLARE_EVENT_TABLE()
+};
+
+wxBlindPlateWindow::~wxBlindPlateWindow()
+{
+}
+
+IMPLEMENT_DYNAMIC_CLASS(wxBlindPlateWindow, wxWindow)
+
+BEGIN_EVENT_TABLE(wxBlindPlateWindow, wxWindow)
+END_EVENT_TABLE()
+
+

 // ----------------------------------------------------------------------------
  // constructors and such
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
  // constructors and such
 // ----------------------------------------------------------------------------


@@ -131,15 +213,31 @@ void wxWindowMac::Init()
     m_vScrollBar = NULL ;
     m_hScrollBarAlwaysShown = false;
     m_vScrollBarAlwaysShown = false;
     m_vScrollBar = NULL ;
     m_hScrollBarAlwaysShown = false;
     m_vScrollBarAlwaysShown = false;

+    m_growBox = NULL ;

 
 

-    m_macIsUserPane = true;

     m_clipChildren = false ;
     m_cachedClippedRectValid = false ;
     m_clipChildren = false ;
     m_cachedClippedRectValid = false ;

+    m_isNativeWindowWrapper = false;

 }
 
 wxWindowMac::~wxWindowMac()
 {
     SendDestroyEvent();
 }
 
 wxWindowMac::~wxWindowMac()
 {
     SendDestroyEvent();

+    
+#if wxUSE_HOTKEY && wxOSX_USE_COCOA_OR_CARBON
+    for ( int i = s_hotkeys.size()-1; i>=0; -- i )
+    {
+        if ( s_hotkeys[i].window == this )
+        {
+            EventHotKeyRef ref = s_hotkeys[i].ref;
+            s_hotkeys.erase(s_hotkeys.begin() + i);
+            if ( UnregisterEventHotKey(ref) != noErr )
+            {
+                wxLogLastError(wxT("UnregisterHotKey"));
+            }
+        }
+    }    
+#endif

 
     MacInvalidateBorders() ;
 
 
     MacInvalidateBorders() ;
 


@@ -184,24 +282,102 @@ wxWindowMac::~wxWindowMac()
 
     // delete our drop target if we've got one
 #if wxUSE_DRAG_AND_DROP
 
     // delete our drop target if we've got one
 #if wxUSE_DRAG_AND_DROP

-    if ( m_dropTarget != NULL )
-    {
-        delete m_dropTarget;
-        m_dropTarget = NULL;
-    }
+    wxDELETE(m_dropTarget);

 #endif
 
 #endif
 

-    delete m_peer ;
+    delete GetPeer() ;

 }
 
 WXWidget wxWindowMac::GetHandle() const
 {
 }
 
 WXWidget wxWindowMac::GetHandle() const
 {

-    return (WXWidget) m_peer->GetWXWidget() ;
+    if ( GetPeer() )
+        return (WXWidget) GetPeer()->GetWXWidget() ;
+    return NULL;

 }
 
 }
 

-//
-// TODO END move to window_osx.cpp
-//
+wxOSXWidgetImpl* wxWindowMac::GetPeer() const 
+{ 
+    return m_peer == kOSXNoWidgetImpl ? NULL : m_peer ; 
+}
+
+bool wxWindowMac::ShouldCreatePeer() const
+{
+    return m_peer != kOSXNoWidgetImpl;
+}
+
+void wxWindowMac::DontCreatePeer()
+{
+    m_peer = kOSXNoWidgetImpl;
+}
+
+void wxWindowMac::SetWrappingPeer(wxOSXWidgetImpl* wrapper)
+{ 
+    wxOSXWidgetImpl* inner = GetPeer();
+    wxASSERT_MSG( inner != NULL && inner->IsOk(), "missing or incomplete inner peer" );
+    wxASSERT_MSG( wrapper != NULL && wrapper->IsOk(), "missing or incomplete wrapper" );
+    
+    if ( !(inner != NULL && inner->IsOk() && wrapper != NULL && wrapper->IsOk()) )
+        return;
+    
+    inner->RemoveFromParent();
+    wrapper->InstallEventHandler();
+    wrapper->Embed(inner);
+    m_peer = wrapper;
+}
+
+void wxWindowMac::SetPeer(wxOSXWidgetImpl* peer)
+{
+    if ( GetPeer() )
+    {
+        if ( !GetPeer()->IsRootControl() )
+            GetPeer()->RemoveFromParent();
+        wxDELETE(m_peer);
+    }
+
+    m_peer = peer;
+
+    if ( GetPeer() && !GetPeer()->IsRootControl())
+    {
+        wxASSERT_MSG( GetPeer()->IsOk() , wxT("The native control must exist already") ) ;
+        
+        if (!GetParent()->GetChildren().Find((wxWindow*)this))
+            GetParent()->AddChild( this );
+        
+        GetPeer()->InstallEventHandler();
+        GetPeer()->Embed(GetParent()->GetPeer());
+        
+        GetParent()->MacChildAdded() ;
+        
+        // adjust font, controlsize etc
+        GetPeer()->SetControlSize( m_windowVariant );
+        InheritAttributes();
+        // in case nothing has been set, use the variant default fonts
+        if ( !m_hasFont )
+            DoSetWindowVariant( m_windowVariant );
+        
+        GetPeer()->SetLabel( wxStripMenuCodes(m_label, wxStrip_Mnemonics), GetFont().GetEncoding() ) ;
+        
+        // for controls we want to use best size for wxDefaultSize params )
+        if ( !GetPeer()->IsUserPane() )
+            SetInitialSize(GetMinSize());
+        
+        SetCursor( *wxSTANDARD_CURSOR ) ;
+    }
+}
+
+#if WXWIN_COMPATIBILITY_2_8
+
+bool wxWindowMac::MacIsUserPane() 
+{ 
+    return GetPeer() == NULL || GetPeer()->IsUserPane(); 
+}
+
+#endif
+
+bool wxWindowMac::MacIsUserPane() const 
+{ 
+    return GetPeer() == NULL || GetPeer()->IsUserPane(); 
+}

 
 // ---------------------------------------------------------------------------
 // Utility Routines to move between different coordinate systems
 
 // ---------------------------------------------------------------------------
 // Utility Routines to move between different coordinate systems


@@ -210,7 +386,7 @@ WXWidget wxWindowMac::GetHandle() const
 /*
  * Right now we have the following setup :
  * a border that is not part of the native control is always outside the
 /*
  * Right now we have the following setup :
  * a border that is not part of the native control is always outside the

- * control's border (otherwise we loose all native intelligence, future ways
+ * control's border (otherwise we lose all native intelligence, future ways

  * may be to have a second embedding control responsible for drawing borders
  * and backgrounds eventually)
  * so all this border calculations have to be taken into account when calling
  * may be to have a second embedding control responsible for drawing borders
  * and backgrounds eventually)
  * so all this border calculations have to be taken into account when calling


@@ -239,15 +415,22 @@ bool wxWindowMac::Create(wxWindowMac *parent,
 
     m_windowVariant = parent->GetWindowVariant() ;
 
 
     m_windowVariant = parent->GetWindowVariant() ;
 

-    if ( m_macIsUserPane )
+    m_hScrollBarAlwaysShown =
+    m_vScrollBarAlwaysShown = HasFlag(wxALWAYS_SHOW_SB);
+
+    if ( m_peer != kOSXNoWidgetImpl )

     {
     {

-        m_peer = wxWidgetImpl::CreateUserPane( this, parent, id, pos, size , style, GetExtraStyle() );
+        SetPeer(wxWidgetImpl::CreateUserPane( this, parent, id, pos, size , style, GetExtraStyle() ));

         MacPostControlCreate(pos, size) ;
     }
 
 #ifndef __WXUNIVERSAL__
     // Don't give scrollbars to wxControls unless they ask for them
         MacPostControlCreate(pos, size) ;
     }
 
 #ifndef __WXUNIVERSAL__
     // Don't give scrollbars to wxControls unless they ask for them

-    if ( (! IsKindOf(CLASSINFO(wxControl)) && ! IsKindOf(CLASSINFO(wxStatusBar)))
+    if ( (! IsKindOf(CLASSINFO(wxControl))
+#if wxUSE_STATUSBAR
+        && ! IsKindOf(CLASSINFO(wxStatusBar))
+#endif
+        )

          || (IsKindOf(CLASSINFO(wxControl)) && ((style & wxHSCROLL) || (style & wxVSCROLL))))
     {
         MacCreateScrollBars( style ) ;
          || (IsKindOf(CLASSINFO(wxControl)) && ((style & wxHSCROLL) || (style & wxVSCROLL))))
     {
         MacCreateScrollBars( style ) ;


@@ -262,150 +445,89 @@ bool wxWindowMac::Create(wxWindowMac *parent,
 
 void wxWindowMac::MacChildAdded()
 {
 
 void wxWindowMac::MacChildAdded()
 {

+#if wxUSE_SCROLLBAR

     if ( m_vScrollBar )
         m_vScrollBar->Raise() ;
     if ( m_hScrollBar )
         m_hScrollBar->Raise() ;
     if ( m_vScrollBar )
         m_vScrollBar->Raise() ;
     if ( m_hScrollBar )
         m_hScrollBar->Raise() ;

+    if ( m_growBox )
+        m_growBox->Raise() ;
+#endif

 }
 
 }
 

-void wxWindowMac::MacPostControlCreate(const wxPoint& WXUNUSED(pos), const wxSize& size)
+void wxWindowMac::MacPostControlCreate(const wxPoint& WXUNUSED(pos),
+                                       const wxSize& WXUNUSED(size))

 {
 {

-    wxASSERT_MSG( m_peer != NULL && m_peer->IsOk() , wxT("No valid mac control") ) ;
+    // todo remove if refactoring works correctly
+#if 0
+    wxASSERT_MSG( GetPeer() != NULL && GetPeer()->IsOk() , wxT("No valid mac control") ) ;

 
 

-    GetParent()->AddChild( this );
+    if (!GetParent()->GetChildren().Find((wxWindow*)this))
+        GetParent()->AddChild( this );

 
 

-    m_peer->InstallEventHandler();
-    m_peer->Embed(GetParent()->GetPeer());
+    GetPeer()->InstallEventHandler();
+    GetPeer()->Embed(GetParent()->GetPeer());

 
     GetParent()->MacChildAdded() ;
 
     // adjust font, controlsize etc
     DoSetWindowVariant( m_windowVariant ) ;
 
 
     GetParent()->MacChildAdded() ;
 
     // adjust font, controlsize etc
     DoSetWindowVariant( m_windowVariant ) ;
 

-    m_peer->SetLabel( wxStripMenuCodes(m_label, wxStrip_Mnemonics), GetFont().GetEncoding() ) ;
+    GetPeer()->SetLabel( wxStripMenuCodes(m_label, wxStrip_Mnemonics), GetFont().GetEncoding() ) ;

 
     // for controls we want to use best size for wxDefaultSize params )
 
     // for controls we want to use best size for wxDefaultSize params )

-    if ( !m_macIsUserPane )
+    if ( !GetPeer()->IsUserPane() )

         SetInitialSize(size);
 
     SetCursor( *wxSTANDARD_CURSOR ) ;
         SetInitialSize(size);
 
     SetCursor( *wxSTANDARD_CURSOR ) ;

+#endif

 }
 
 void wxWindowMac::DoSetWindowVariant( wxWindowVariant variant )
 {
     // Don't assert, in case we set the window variant before
     // the window is created
 }
 
 void wxWindowMac::DoSetWindowVariant( wxWindowVariant variant )
 {
     // Don't assert, in case we set the window variant before
     // the window is created

-    // wxASSERT( m_peer->Ok() ) ;
+    // wxASSERT( GetPeer()->IsOk() ) ;

 
     m_windowVariant = variant ;
 
 
     m_windowVariant = variant ;
 

-    if (m_peer == NULL || !m_peer->IsOk())
+    if (GetPeer() == NULL || !GetPeer()->IsOk())

         return;
 
         return;
 

-    m_peer->SetControlSize( variant );
-#if wxOSX_USE_CARBON
-    ControlSize size ;
-
-    // we will get that from the settings later
-    // and make this NORMAL later, but first
-    // we have a few calculations that we must fix
-
-    switch ( variant )
-    {
-        case wxWINDOW_VARIANT_NORMAL :
-            size = kControlSizeNormal;
-            break ;
-
-        case wxWINDOW_VARIANT_SMALL :
-            size = kControlSizeSmall;
-            break ;
-
-        case wxWINDOW_VARIANT_MINI :
-            // not always defined in the headers
-            size = 3 ;
-            break ;
-
-        case wxWINDOW_VARIANT_LARGE :
-            size = kControlSizeLarge;
-            break ;
-
-        default:
-            wxFAIL_MSG(_T("unexpected window variant"));
-            break ;
-    }
-    m_peer->SetData<ControlSize>(kControlEntireControl, kControlSizeTag, &size ) ;
-#endif
-
-#if wxOSX_USE_COCOA_OR_CARBON
-    wxFont font ;
-
-#if wxOSX_USE_ATSU_TEXT
-    ThemeFontID themeFont = kThemeSystemFont ;
-
-    // we will get that from the settings later
-    // and make this NORMAL later, but first
-    // we have a few calculations that we must fix
-
-    switch ( variant )
-    {
-        case wxWINDOW_VARIANT_NORMAL :
-            themeFont = kThemeSystemFont ;
-            break ;
-
-        case wxWINDOW_VARIANT_SMALL :
-            themeFont = kThemeSmallSystemFont ;
-            break ;
-
-        case wxWINDOW_VARIANT_MINI :
-            // not always defined in the headers
-            themeFont = 109 ;
-            break ;
-
-        case wxWINDOW_VARIANT_LARGE :
-            themeFont = kThemeSystemFont ;
-            break ;
-
-        default:
-            wxFAIL_MSG(_T("unexpected window variant"));
-            break ;
-    }
+    GetPeer()->SetControlSize( variant );

 
 

-    font.MacCreateFromThemeFont( themeFont ) ;
-#else
-    CTFontUIFontType themeFont = kCTFontSystemFontType ;

     switch ( variant )
     {
         case wxWINDOW_VARIANT_NORMAL :
     switch ( variant )
     {
         case wxWINDOW_VARIANT_NORMAL :

-            themeFont = kCTFontSystemFontType;
+            static wxFont sysNormal(wxOSX_SYSTEM_FONT_NORMAL);
+            SetFont(sysNormal) ;

             break ;
 
         case wxWINDOW_VARIANT_SMALL :
             break ;
 
         case wxWINDOW_VARIANT_SMALL :

-            themeFont = kCTFontSmallSystemFontType;
+            static wxFont sysSmall(wxOSX_SYSTEM_FONT_SMALL);
+            SetFont(sysSmall) ;

             break ;
 
         case wxWINDOW_VARIANT_MINI :
             break ;
 
         case wxWINDOW_VARIANT_MINI :

-            themeFont = kCTFontMiniSystemFontType;
+            static wxFont sysMini(wxOSX_SYSTEM_FONT_MINI);
+            SetFont(sysMini) ;

             break ;
 
         case wxWINDOW_VARIANT_LARGE :
             break ;
 
         case wxWINDOW_VARIANT_LARGE :

-            themeFont = kCTFontSystemFontType;
+            static wxFont sysLarge(wxOSX_SYSTEM_FONT_NORMAL);
+            SetFont(sysLarge) ;

             break ;
 
         default:
             break ;
 
         default:

-            wxFAIL_MSG(_T("unexpected window variant"));
+            wxFAIL_MSG(wxT("unexpected window variant"));

             break ;
     }
             break ;
     }

-    font.MacCreateFromUIFont( themeFont ) ;
-#endif
-
-    SetFont( font ) ;
-#endif

 }
 
 void wxWindowMac::MacUpdateControlFont()
 {
 }
 
 void wxWindowMac::MacUpdateControlFont()
 {

-    if ( m_peer )
-        m_peer->SetFont( GetFont() , GetForegroundColour() , GetWindowStyle() ) ;
+    if ( GetPeer() )
+        GetPeer()->SetFont( GetFont() , GetForegroundColour() , GetWindowStyle() ) ;

 
     // do not trigger refreshes upon invisible and possible partly created objects
     if ( IsShownOnScreen() )
 
     // do not trigger refreshes upon invisible and possible partly created objects
     if ( IsShownOnScreen() )


@@ -431,33 +553,86 @@ bool wxWindowMac::SetForegroundColour(const wxColour& col )
     return retval;
 }
 
     return retval;
 }
 

+bool wxWindowMac::SetBackgroundStyle(wxBackgroundStyle style)
+{
+    if ( !wxWindowBase::SetBackgroundStyle(style) )
+        return false;
+
+    if ( GetPeer() )
+        GetPeer()->SetBackgroundStyle(style);
+    return true;
+}
+

 bool wxWindowMac::SetBackgroundColour(const wxColour& col )
 {
 bool wxWindowMac::SetBackgroundColour(const wxColour& col )
 {

+    if (m_growBox)
+    {
+        if ( m_backgroundColour.IsOk() )
+            m_growBox->SetBackgroundColour(m_backgroundColour);
+        else
+            m_growBox->SetBackgroundColour(*wxWHITE);
+    }
+

     if ( !wxWindowBase::SetBackgroundColour(col) && m_hasBgCol )
         return false ;
 
     if ( !wxWindowBase::SetBackgroundColour(col) && m_hasBgCol )
         return false ;
 

-    if ( m_peer )
-        m_peer->SetBackgroundColour( col ) ;
+    if ( GetPeer() )
+        GetPeer()->SetBackgroundColour( col ) ;

 
     return true ;
 }
 
 
     return true ;
 }
 

+static bool wxIsWindowOrParentDisabled(wxWindow* w)
+{
+    while (w && !w->IsTopLevel())
+    {
+        if (!w->IsEnabled())
+            return true;
+        w = w->GetParent();
+    }
+    return false;
+}
+

 void wxWindowMac::SetFocus()
 {
     if ( !AcceptsFocus() )
             return ;
 
 void wxWindowMac::SetFocus()
 {
     if ( !AcceptsFocus() )
             return ;
 

+    if (wxIsWindowOrParentDisabled((wxWindow*) this))
+        return;
+

     wxWindow* former = FindFocus() ;
     if ( former == this )
         return ;
 
     wxWindow* former = FindFocus() ;
     if ( former == this )
         return ;
 

-    m_peer->SetFocus() ;
+    GetPeer()->SetFocus() ;
+}
+
+void wxWindowMac::OSXSimulateFocusEvents()
+{
+    wxWindow* former = FindFocus() ;
+    if ( former != NULL && former != this )
+    {
+        {
+            wxFocusEvent event( wxEVT_KILL_FOCUS, former->GetId());
+            event.SetEventObject(former);
+            event.SetWindow(this);
+            former->HandleWindowEvent(event) ;
+        }
+
+        {
+            wxFocusEvent event(wxEVT_SET_FOCUS, former->GetId());
+            event.SetEventObject(former);
+            event.SetWindow(this);
+            former->HandleWindowEvent(event);
+        }
+    }

 }
 
 void wxWindowMac::DoCaptureMouse()
 {
     wxApp::s_captureWindow = (wxWindow*) this ;
 }
 
 void wxWindowMac::DoCaptureMouse()
 {
     wxApp::s_captureWindow = (wxWindow*) this ;

-    m_peer->CaptureMouse() ;
+    GetPeer()->CaptureMouse() ;

 }
 
 wxWindow * wxWindowBase::GetCapture()
 }
 
 wxWindow * wxWindowBase::GetCapture()


@@ -469,7 +644,7 @@ void wxWindowMac::DoReleaseMouse()
 {
     wxApp::s_captureWindow = NULL ;
 
 {
     wxApp::s_captureWindow = NULL ;
 

-    m_peer->ReleaseMouse() ;
+    GetPeer()->ReleaseMouse() ;

 }
 
 #if wxUSE_DRAG_AND_DROP
 }
 
 #if wxUSE_DRAG_AND_DROP


@@ -479,10 +654,8 @@ void wxWindowMac::SetDropTarget(wxDropTarget *pDropTarget)
     delete m_dropTarget;
 
     m_dropTarget = pDropTarget;
     delete m_dropTarget;
 
     m_dropTarget = pDropTarget;

-    if ( m_dropTarget != NULL )
-    {
-        // TODO:
-    }
+
+    GetPeer()->SetDropTarget(m_dropTarget) ;

 }
 
 #endif
 }
 
 #endif


@@ -505,8 +678,8 @@ bool wxWindowMac::MacGetBoundsForControl(
     x = (int)pos.x;
     y = (int)pos.y;
 
     x = (int)pos.x;
     y = (int)pos.y;
 

-    w = WidthDefault( size.x ); 
-    h = HeightDefault( size.y ); 
+    w = WidthDefault( size.x );
+    h = HeightDefault( size.y );

 
     x += MacGetLeftBorderSize() ;
     y += MacGetTopBorderSize() ;
 
     x += MacGetLeftBorderSize() ;
     y += MacGetTopBorderSize() ;


@@ -530,7 +703,7 @@ bool wxWindowMac::MacGetBoundsForControl(
 void wxWindowMac::DoGetSize(int *x, int *y) const
 {
     int width, height;
 void wxWindowMac::DoGetSize(int *x, int *y) const
 {
     int width, height;

-    m_peer->GetSize( width, height );
+    GetPeer()->GetSize( width, height );

 
     if (x)
        *x = width + MacGetLeftBorderSize() + MacGetRightBorderSize() ;
 
     if (x)
        *x = width + MacGetLeftBorderSize() + MacGetRightBorderSize() ;


@@ -542,8 +715,8 @@ void wxWindowMac::DoGetSize(int *x, int *y) const
 void wxWindowMac::DoGetPosition(int *x, int *y) const
 {
     int x1, y1;
 void wxWindowMac::DoGetPosition(int *x, int *y) const
 {
     int x1, y1;

-    
-    m_peer->GetPosition( x1, y1 ) ;
+
+    GetPeer()->GetPosition( x1, y1 ) ;

 
     // get the wx window position from the native one
     x1 -= MacGetLeftBorderSize() ;
 
     // get the wx window position from the native one
     x1 -= MacGetLeftBorderSize() ;


@@ -628,7 +801,7 @@ void wxWindowMac::MacWindowToRootWindow( int *x , int *y ) const
         {
             pt.x -= MacGetLeftBorderSize() ;
             pt.y -= MacGetTopBorderSize() ;
         {
             pt.x -= MacGetLeftBorderSize() ;
             pt.y -= MacGetTopBorderSize() ;

-            wxWidgetImpl::Convert( &pt , m_peer , top->m_peer ) ;
+            wxWidgetImpl::Convert( &pt , GetPeer() , top->GetPeer() ) ;

         }
     }
 
         }
     }
 


@@ -652,7 +825,7 @@ void wxWindowMac::MacRootWindowToWindow( int *x , int *y ) const
         wxNonOwnedWindow* top = MacGetTopLevelWindow();
         if (top)
         {
         wxNonOwnedWindow* top = MacGetTopLevelWindow();
         if (top)
         {

-            wxWidgetImpl::Convert( &pt , top->m_peer , m_peer ) ;
+            wxWidgetImpl::Convert( &pt , top->GetPeer() , GetPeer() ) ;

             pt.x += MacGetLeftBorderSize() ;
             pt.y += MacGetTopBorderSize() ;
         }
             pt.x += MacGetLeftBorderSize() ;
             pt.y += MacGetTopBorderSize() ;
         }


@@ -671,13 +844,13 @@ wxSize wxWindowMac::DoGetSizeFromClientSize( const wxSize & size )  const
     int innerwidth, innerheight;
     int left, top;
     int outerwidth, outerheight;
     int innerwidth, innerheight;
     int left, top;
     int outerwidth, outerheight;

-    
-    m_peer->GetContentArea( left, top, innerwidth, innerheight );
-    m_peer->GetSize( outerwidth, outerheight );
-    
+
+    GetPeer()->GetContentArea( left, top, innerwidth, innerheight );
+    GetPeer()->GetSize( outerwidth, outerheight );
+

     sizeTotal.x += outerwidth-innerwidth;
     sizeTotal.y += outerheight-innerheight;
     sizeTotal.x += outerwidth-innerwidth;
     sizeTotal.y += outerheight-innerheight;

-    
+

     sizeTotal.x += MacGetLeftBorderSize() + MacGetRightBorderSize() ;
     sizeTotal.y += MacGetTopBorderSize() + MacGetBottomBorderSize() ;
 
     sizeTotal.x += MacGetLeftBorderSize() + MacGetRightBorderSize() ;
     sizeTotal.y += MacGetTopBorderSize() + MacGetBottomBorderSize() ;
 


@@ -690,19 +863,33 @@ void wxWindowMac::DoGetClientSize( int *x, int *y ) const
     int ww, hh;
 
     int left, top;
     int ww, hh;
 
     int left, top;

-    
-    m_peer->GetContentArea( left, top, ww, hh );

 
 

+    GetPeer()->GetContentArea( left, top, ww, hh );
+#if wxUSE_SCROLLBAR

     if (m_hScrollBar  && m_hScrollBar->IsShown() )
         hh -= m_hScrollBar->GetSize().y ;
 
     if (m_vScrollBar  && m_vScrollBar->IsShown() )
         ww -= m_vScrollBar->GetSize().x ;
 
     if (m_hScrollBar  && m_hScrollBar->IsShown() )
         hh -= m_hScrollBar->GetSize().y ;
 
     if (m_vScrollBar  && m_vScrollBar->IsShown() )
         ww -= m_vScrollBar->GetSize().x ;
 

+#endif

     if (x)
     if (x)

-       *x = ww;
+    {
+        // we shouldn't return invalid width
+        if ( ww < 0 )
+            ww = 0;
+        
+        *x = ww;
+    }
+    

     if (y)
     if (y)

-       *y = hh;
+    {
+        // we shouldn't return invalid height
+        if ( hh < 0 )
+            hh = 0;
+        
+        *y = hh;
+    }

 }
 
 bool wxWindowMac::SetCursor(const wxCursor& cursor)
 }
 
 bool wxWindowMac::SetCursor(const wxCursor& cursor)


@@ -721,7 +908,7 @@ bool wxWindowMac::SetCursor(const wxCursor& cursor)
             return false ;
     }
 
             return false ;
     }
 

-    wxASSERT_MSG( m_cursor.Ok(),
+    wxASSERT_MSG( m_cursor.IsOk(),

         wxT("cursor must be valid after call to the base version"));
 
     if ( GetPeer() != NULL )
         wxT("cursor must be valid after call to the base version"));
 
     if ( GetPeer() != NULL )


@@ -734,7 +921,6 @@ bool wxWindowMac::SetCursor(const wxCursor& cursor)
 bool wxWindowMac::DoPopupMenu(wxMenu *menu, int x, int y)
 {
 #ifndef __WXUNIVERSAL__
 bool wxWindowMac::DoPopupMenu(wxMenu *menu, int x, int y)
 {
 #ifndef __WXUNIVERSAL__

-    menu->SetInvokingWindow((wxWindow*)this);

     menu->UpdateUI();
 
     if ( x == wxDefaultCoord && y == wxDefaultCoord )
     menu->UpdateUI();
 
     if ( x == wxDefaultCoord && y == wxDefaultCoord )


@@ -748,7 +934,6 @@ bool wxWindowMac::DoPopupMenu(wxMenu *menu, int x, int y)
         ClientToScreen( &x , &y ) ;
     }
     menu->GetPeer()->PopUp(this, x, y);
         ClientToScreen( &x , &y ) ;
     }
     menu->GetPeer()->PopUp(this, x, y);

-    menu->SetInvokingWindow( NULL );

     return true;
 #else
     // actually this shouldn't be called, because universal is having its own implementation
     return true;
 #else
     // actually this shouldn't be called, because universal is having its own implementation


@@ -769,13 +954,16 @@ void wxWindowMac::DoSetToolTip(wxToolTip *tooltip)
 
     if ( m_tooltip )
         m_tooltip->SetWindow(this);
 
     if ( m_tooltip )
         m_tooltip->SetWindow(this);

+
+    if (GetPeer())
+        GetPeer()->SetToolTip(tooltip);

 }
 
 #endif
 
 void wxWindowMac::MacInvalidateBorders()
 {
 }
 
 #endif
 
 void wxWindowMac::MacInvalidateBorders()
 {

-    if ( m_peer == NULL )
+    if ( GetPeer() == NULL )

         return ;
 
     bool vis = IsShownOnScreen() ;
         return ;
 
     bool vis = IsShownOnScreen() ;


@@ -783,32 +971,30 @@ void wxWindowMac::MacInvalidateBorders()
         return ;
 
     int outerBorder = MacGetLeftBorderSize() ;
         return ;
 
     int outerBorder = MacGetLeftBorderSize() ;

-#if wxOSX_USE_CARBON
-    if ( m_peer->NeedsFocusRect() /* && m_peer->HasFocus() */ )
+
+    if ( GetPeer()->NeedsFocusRect() )

         outerBorder += 4 ;
         outerBorder += 4 ;

-#endif

 
     if ( outerBorder == 0 )
         return ;
 
     // now we know that we have something to do at all
 
     if ( outerBorder == 0 )
         return ;
 
     // now we know that we have something to do at all

-    

 
     int tx,ty,tw,th;
 
     int tx,ty,tw,th;

-    
-    m_peer->GetSize( tw, th );
-    m_peer->GetPosition( tx, ty );
+
+    GetPeer()->GetSize( tw, th );
+    GetPeer()->GetPosition( tx, ty );

 
     wxRect leftupdate( tx-outerBorder,ty,outerBorder,th );
     wxRect rightupdate( tx+tw, ty, outerBorder, th );
     wxRect topupdate( tx-outerBorder, ty-outerBorder, tw + 2 * outerBorder, outerBorder );
     wxRect bottomupdate( tx-outerBorder, ty + th, tw + 2 * outerBorder, outerBorder );
 
     wxRect leftupdate( tx-outerBorder,ty,outerBorder,th );
     wxRect rightupdate( tx+tw, ty, outerBorder, th );
     wxRect topupdate( tx-outerBorder, ty-outerBorder, tw + 2 * outerBorder, outerBorder );
     wxRect bottomupdate( tx-outerBorder, ty + th, tw + 2 * outerBorder, outerBorder );

-    
+

     if (GetParent()) {
     if (GetParent()) {

-        GetParent()->m_peer->SetNeedsDisplay(&leftupdate);
-        GetParent()->m_peer->SetNeedsDisplay(&rightupdate);
-        GetParent()->m_peer->SetNeedsDisplay(&topupdate);
-        GetParent()->m_peer->SetNeedsDisplay(&bottomupdate);
+        GetParent()->GetPeer()->SetNeedsDisplay(&leftupdate);
+        GetParent()->GetPeer()->SetNeedsDisplay(&rightupdate);
+        GetParent()->GetPeer()->SetNeedsDisplay(&topupdate);
+        GetParent()->GetPeer()->SetNeedsDisplay(&bottomupdate);

     }
 }
 
     }
 }
 


@@ -834,6 +1020,8 @@ void wxWindowMac::DoMoveWindow(int x, int y, int width, int height)
     int actualX = x;
     int actualY = y;
 
     int actualX = x;
     int actualY = y;
 

+#if 0
+    // min and max sizes are only for sizers, not for explicit size setting

     if ((m_minWidth != -1) && (actualWidth < m_minWidth))
         actualWidth = m_minWidth;
     if ((m_minHeight != -1) && (actualHeight < m_minHeight))
     if ((m_minWidth != -1) && (actualWidth < m_minWidth))
         actualWidth = m_minWidth;
     if ((m_minHeight != -1) && (actualHeight < m_minHeight))


@@ -842,6 +1030,7 @@ void wxWindowMac::DoMoveWindow(int x, int y, int width, int height)
         actualWidth = m_maxWidth;
     if ((m_maxHeight != -1) && (actualHeight > m_maxHeight))
         actualHeight = m_maxHeight;
         actualWidth = m_maxWidth;
     if ((m_maxHeight != -1) && (actualHeight > m_maxHeight))
         actualHeight = m_maxHeight;

+#endif

 
     bool doMove = false, doResize = false ;
 
 
     bool doMove = false, doResize = false ;
 


@@ -867,8 +1056,8 @@ void wxWindowMac::DoMoveWindow(int x, int y, int width, int height)
         MacInvalidateBorders() ;
 
         m_cachedClippedRectValid = false ;
         MacInvalidateBorders() ;
 
         m_cachedClippedRectValid = false ;

-        
-        m_peer->Move( bounds.x, bounds.y, bounds.width, bounds.height);
+
+        GetPeer()->Move( bounds.x, bounds.y, bounds.width, bounds.height);

 
         wxWindowMac::MacSuperChangedPosition() ; // like this only children will be notified
 
 
         wxWindowMac::MacSuperChangedPosition() ; // like this only children will be notified
 


@@ -886,25 +1075,22 @@ void wxWindowMac::DoMoveWindow(int x, int y, int width, int height)
         if ( doResize )
         {
             MacRepositionScrollBars() ;
         if ( doResize )
         {
             MacRepositionScrollBars() ;

-            wxSize size(actualWidth, actualHeight);
-            wxSizeEvent event(size, m_windowId);
-            event.SetEventObject(this);
-            HandleWindowEvent(event);
+            SendSizeEvent();

         }
     }
 }
 
 wxSize wxWindowMac::DoGetBestSize() const
 {
         }
     }
 }
 
 wxSize wxWindowMac::DoGetBestSize() const
 {

-    if ( m_macIsUserPane || IsTopLevel() )
+    if ( GetPeer() == NULL || GetPeer()->IsUserPane() || IsTopLevel() )

     {
         return wxWindowBase::DoGetBestSize() ;
     }
     else
     {
         wxRect r ;
     {
         return wxWindowBase::DoGetBestSize() ;
     }
     else
     {
         wxRect r ;

-        
-        m_peer->GetBestRect(&r);
+
+        GetPeer()->GetBestRect(&r);

 
         if ( r.GetWidth() == 0 && r.GetHeight() == 0 )
         {
 
         if ( r.GetWidth() == 0 && r.GetHeight() == 0 )
         {


@@ -913,25 +1099,28 @@ wxSize wxWindowMac::DoGetBestSize() const
             r.width =
             r.height = 16 ;
 
             r.width =
             r.height = 16 ;
 

+#if wxUSE_SCROLLBAR

             if ( IsKindOf( CLASSINFO( wxScrollBar ) ) )
             {
                 r.height = 16 ;
             }
             if ( IsKindOf( CLASSINFO( wxScrollBar ) ) )
             {
                 r.height = 16 ;
             }

-    #if wxUSE_SPINBTN
-            else if ( IsKindOf( CLASSINFO( wxSpinButton ) ) )
+            else
+#endif
+#if wxUSE_SPINBTN
+            if ( IsKindOf( CLASSINFO( wxSpinButton ) ) )

             {
                 r.height = 24 ;
             }
             {
                 r.height = 24 ;
             }

-    #endif

             else
             else

+#endif

             {
                 // return wxWindowBase::DoGetBestSize() ;
             }
         }
 
             {
                 // return wxWindowBase::DoGetBestSize() ;
             }
         }
 

-        int bestWidth = r.width + MacGetLeftBorderSize() + 
+        int bestWidth = r.width + MacGetLeftBorderSize() +

                     MacGetRightBorderSize();
                     MacGetRightBorderSize();

-        int bestHeight = r.height + MacGetTopBorderSize() + 
+        int bestHeight = r.height + MacGetTopBorderSize() +

                      MacGetBottomBorderSize();
         if ( bestHeight < 10 )
             bestHeight = 13 ;
                      MacGetBottomBorderSize();
         if ( bestHeight < 10 )
             bestHeight = 13 ;


@@ -940,6 +1129,12 @@ wxSize wxWindowMac::DoGetBestSize() const
     }
 }
 
     }
 }
 

+void wxWindowMac::SendSizeEvent(int flags)
+{
+    MacOnInternalSize();
+    wxWindowBase::SendSizeEvent(flags);
+}
+

 // set the size of the window: if the dimensions are positive, just use them,
 // but if any of them is equal to -1, it means that we must find the value for
 // it ourselves (unless sizeFlags contains wxSIZE_ALLOW_MINUS_ONE flag, in
 // set the size of the window: if the dimensions are positive, just use them,
 // but if any of them is equal to -1, it means that we must find the value for
 // it ourselves (unless sizeFlags contains wxSIZE_ALLOW_MINUS_ONE flag, in


@@ -964,6 +1159,11 @@ void wxWindowMac::DoSetSize(int x, int y, int width, int height, int sizeFlags)
         // TODO: REMOVE
         MacRepositionScrollBars() ; // we might have a real position shift
 
         // TODO: REMOVE
         MacRepositionScrollBars() ; // we might have a real position shift
 

+        if (sizeFlags & wxSIZE_FORCE_EVENT)
+        {
+            SendSizeEvent();
+        }
+

         return;
     }
 
         return;
     }
 


@@ -1015,7 +1215,7 @@ void wxWindowMac::DoSetSize(int x, int y, int width, int height, int sizeFlags)
 wxPoint wxWindowMac::GetClientAreaOrigin() const
 {
     int left,top,width,height;
 wxPoint wxWindowMac::GetClientAreaOrigin() const
 {
     int left,top,width,height;

-    m_peer->GetContentArea( left , top , width , height);
+    GetPeer()->GetContentArea( left , top , width , height);

     return wxPoint( left + MacGetLeftBorderSize() , top + MacGetTopBorderSize() );
 }
 
     return wxPoint( left + MacGetLeftBorderSize() , top + MacGetTopBorderSize() );
 }
 


@@ -1034,12 +1234,22 @@ void wxWindowMac::DoSetClientSize(int clientwidth, int clientheight)
     }
 }
 
     }
 }
 

+double wxWindowMac::GetContentScaleFactor() const 
+{
+    return GetPeer()->GetContentScaleFactor();
+}
+

 void wxWindowMac::SetLabel(const wxString& title)
 {
 void wxWindowMac::SetLabel(const wxString& title)
 {

+    if ( title == m_label )
+        return;
+

     m_label = title ;
 
     m_label = title ;
 

-    if ( m_peer && m_peer->IsOk() )
-        m_peer->SetLabel( wxStripMenuCodes(m_label, wxStrip_Mnemonics), GetFont().GetEncoding() ) ;
+    InvalidateBestSize();
+
+    if ( GetPeer() && GetPeer()->IsOk() )
+        GetPeer()->SetLabel( wxStripMenuCodes(m_label, wxStrip_Mnemonics), GetFont().GetEncoding() ) ;

 
     // do not trigger refreshes upon invisible and possible partly created objects
     if ( IsShownOnScreen() )
 
     // do not trigger refreshes upon invisible and possible partly created objects
     if ( IsShownOnScreen() )


@@ -1053,18 +1263,47 @@ wxString wxWindowMac::GetLabel() const
 
 bool wxWindowMac::Show(bool show)
 {
 
 bool wxWindowMac::Show(bool show)
 {

+    if ( !show )
+        MacInvalidateBorders();
+    

     if ( !wxWindowBase::Show(show) )
         return false;
 
     if ( !wxWindowBase::Show(show) )
         return false;
 

-    if ( m_peer )
-        m_peer->SetVisibility( show ) ;
+    if ( GetPeer() )
+        GetPeer()->SetVisibility( show ) ;
+
+    if ( show )
+        MacInvalidateBorders();
+
+#ifdef __WXOSX_IPHONE__
+    // only when there's no native event support
+    if ( !IsTopLevel() )
+#endif
+    {
+        wxShowEvent eventShow(GetId(), show);
+        eventShow.SetEventObject(this);
+
+        HandleWindowEvent(eventShow);
+    }
+
+    return true;
+}
+
+bool wxWindowMac::OSXShowWithEffect(bool show,
+                                    wxShowEffect effect,
+                                    unsigned timeout)
+{
+    if ( effect == wxSHOW_EFFECT_NONE ||
+            !GetPeer() || !GetPeer()->ShowWithEffect(show, effect, timeout) )
+        return Show(show);

 
     return true;
 }
 
 void wxWindowMac::DoEnable(bool enable)
 {
 
     return true;
 }
 
 void wxWindowMac::DoEnable(bool enable)
 {

-    m_peer->Enable( enable ) ;
+    GetPeer()->Enable( enable ) ;
+    MacInvalidateBorders();

 }
 
 //
 }
 
 //


@@ -1081,7 +1320,6 @@ void wxWindowMac::MacHiliteChanged()
 
 void wxWindowMac::MacEnabledStateChanged()
 {
 
 void wxWindowMac::MacEnabledStateChanged()
 {

-    OnEnabled( m_peer->IsEnabled() );

 }
 
 //
 }
 
 //


@@ -1090,13 +1328,13 @@ void wxWindowMac::MacEnabledStateChanged()
 
 bool wxWindowMac::MacIsReallyEnabled()
 {
 
 bool wxWindowMac::MacIsReallyEnabled()
 {

-    return m_peer->IsEnabled() ;
+    return GetPeer()->IsEnabled() ;

 }
 
 bool wxWindowMac::MacIsReallyHilited()
 {
 #if wxOSX_USE_CARBON
 }
 
 bool wxWindowMac::MacIsReallyHilited()
 {
 #if wxOSX_USE_CARBON

-    return m_peer->IsActive();
+    return GetPeer()->IsActive();

 #else
     return true; // TODO
 #endif
 #else
     return true; // TODO
 #endif


@@ -1118,8 +1356,11 @@ int wxWindowMac::GetCharWidth() const
     return width;
 }
 
     return width;
 }
 

-void wxWindowMac::GetTextExtent(const wxString& str, int *x, int *y,
-                           int *descent, int *externalLeading, const wxFont *theFont ) const
+void wxWindowMac::DoGetTextExtent(const wxString& str,
+                                  int *x, int *y,
+                                  int *descent,
+                                  int *externalLeading,
+                                  const wxFont *theFont) const

 {
     const wxFont *fontToUse = theFont;
     wxFont tempFont;
 {
     const wxFont *fontToUse = theFont;
     wxFont tempFont;


@@ -1134,9 +1375,9 @@ void wxWindowMac::GetTextExtent(const wxString& str, int *x, int *y,
 
     wxDouble h , d , e , w;
     ctx->GetTextExtent( str, &w, &h, &d, &e );
 
     wxDouble h , d , e , w;
     ctx->GetTextExtent( str, &w, &h, &d, &e );

-    
+

     delete ctx;
     delete ctx;

-    
+

     if ( externalLeading )
         *externalLeading = (wxCoord)(e+0.5);
     if ( descent )
     if ( externalLeading )
         *externalLeading = (wxCoord)(e+0.5);
     if ( descent )


@@ -1154,32 +1395,28 @@ void wxWindowMac::GetTextExtent(const wxString& str, int *x, int *y,
 
 void wxWindowMac::Refresh(bool WXUNUSED(eraseBack), const wxRect *rect)
 {
 
 void wxWindowMac::Refresh(bool WXUNUSED(eraseBack), const wxRect *rect)
 {

-    if ( m_peer == NULL )
+    if ( GetPeer() == NULL )

         return ;
 
     if ( !IsShownOnScreen() )
         return ;
         return ;
 
     if ( !IsShownOnScreen() )
         return ;

-        
-    m_peer->SetNeedsDisplay( rect ) ;
+    
+    if ( IsFrozen() )
+        return;
+
+    GetPeer()->SetNeedsDisplay( rect ) ;

 }
 
 void wxWindowMac::DoFreeze()
 {
 }
 
 void wxWindowMac::DoFreeze()
 {

-#if wxOSX_USE_CARBON
-    if ( m_peer && m_peer->IsOk() )
-        m_peer->SetDrawingEnabled( false ) ;
-#endif
+    if ( GetPeer() && GetPeer()->IsOk() )
+        GetPeer()->SetDrawingEnabled( false ) ;

 }
 
 void wxWindowMac::DoThaw()
 {
 }
 
 void wxWindowMac::DoThaw()
 {

-#if wxOSX_USE_CARBON
-    if ( m_peer && m_peer->IsOk() )
-    {
-        m_peer->SetDrawingEnabled( true ) ;
-        m_peer->InvalidateWithChildren() ;
-    }
-#endif
+    if ( GetPeer() && GetPeer()->IsOk() )
+        GetPeer()->SetDrawingEnabled( true ) ;

 }
 
 wxWindow *wxGetActiveWindow()
 }
 
 wxWindow *wxGetActiveWindow()


@@ -1189,46 +1426,37 @@ wxWindow *wxGetActiveWindow()
 }
 
 // Coordinates relative to the window
 }
 
 // Coordinates relative to the window

-void wxWindowMac::WarpPointer(int WXUNUSED(x_pos), int WXUNUSED(y_pos))
+void wxWindowMac::WarpPointer(int x_pos, int y_pos)

 {
 {

-    // We really don't move the mouse programmatically under Mac.
-}
-
-void wxWindowMac::OnEraseBackground(wxEraseEvent& event)
-{
-    if ( MacGetTopLevelWindow() == NULL )
-        return ;
-/*
-#if TARGET_API_MAC_OSX
-    if ( !m_backgroundColour.Ok() || GetBackgroundStyle() == wxBG_STYLE_TRANSPARENT )
-    {
-    }
-    else
+#if wxOSX_USE_COCOA_OR_CARBON
+    int x = x_pos;
+    int y = y_pos;
+    DoClientToScreen(&x, &y);
+    CGPoint cgpoint = CGPointMake( x, y );
+    CGWarpMouseCursorPosition( cgpoint );
+
+    // At least GTK sends a mouse moved event after WarpMouse
+    wxMouseEvent event(wxEVT_MOTION);
+    event.m_x = x_pos;
+    event.m_y = y_pos;
+    wxMouseState mState = ::wxGetMouseState();
+
+    event.m_altDown = mState.AltDown();
+    event.m_controlDown = mState.ControlDown();
+    event.m_leftDown = mState.LeftIsDown();
+    event.m_middleDown = mState.MiddleIsDown();
+    event.m_rightDown = mState.RightIsDown();
+    event.m_metaDown = mState.MetaDown();
+    event.m_shiftDown = mState.ShiftDown();
+    event.SetId(GetId());
+    event.SetEventObject(this);
+    GetEventHandler()->ProcessEvent(event);

 #endif
 #endif

-*/
-    if ( GetBackgroundStyle() == wxBG_STYLE_COLOUR )
-    {
-        event.GetDC()->Clear() ;
-    }
-    else if ( GetBackgroundStyle() == wxBG_STYLE_CUSTOM )
-    {
-        // don't skip the event here, custom background means that the app
-        // is drawing it itself in its OnPaint(), so don't draw it at all
-        // now to avoid flicker
-    }
-    else
-    {
-        event.Skip() ;
-    }
-}
-
-void wxWindowMac::OnNcPaint( wxNcPaintEvent& event )
-{
-    event.Skip() ;

 }
 
 int wxWindowMac::GetScrollPos(int orient) const
 {
 }
 
 int wxWindowMac::GetScrollPos(int orient) const
 {

+#if wxUSE_SCROLLBAR

     if ( orient == wxHORIZONTAL )
     {
        if ( m_hScrollBar )
     if ( orient == wxHORIZONTAL )
     {
        if ( m_hScrollBar )


@@ -1239,7 +1467,7 @@ int wxWindowMac::GetScrollPos(int orient) const
        if ( m_vScrollBar )
            return m_vScrollBar->GetThumbPosition() ;
     }
        if ( m_vScrollBar )
            return m_vScrollBar->GetThumbPosition() ;
     }

-
+#endif

     return 0;
 }
 
     return 0;
 }
 


@@ -1247,6 +1475,7 @@ int wxWindowMac::GetScrollPos(int orient) const
 // of positions that we can scroll.
 int wxWindowMac::GetScrollRange(int orient) const
 {
 // of positions that we can scroll.
 int wxWindowMac::GetScrollRange(int orient) const
 {

+#if wxUSE_SCROLLBAR

     if ( orient == wxHORIZONTAL )
     {
        if ( m_hScrollBar )
     if ( orient == wxHORIZONTAL )
     {
        if ( m_hScrollBar )


@@ -1257,12 +1486,13 @@ int wxWindowMac::GetScrollRange(int orient) const
        if ( m_vScrollBar )
            return m_vScrollBar->GetRange() ;
     }
        if ( m_vScrollBar )
            return m_vScrollBar->GetRange() ;
     }

-
+#endif

     return 0;
 }
 
 int wxWindowMac::GetScrollThumb(int orient) const
 {
     return 0;
 }
 
 int wxWindowMac::GetScrollThumb(int orient) const
 {

+#if wxUSE_SCROLLBAR

     if ( orient == wxHORIZONTAL )
     {
        if ( m_hScrollBar )
     if ( orient == wxHORIZONTAL )
     {
        if ( m_hScrollBar )


@@ -1273,12 +1503,13 @@ int wxWindowMac::GetScrollThumb(int orient) const
        if ( m_vScrollBar )
            return m_vScrollBar->GetThumbSize() ;
     }
        if ( m_vScrollBar )
            return m_vScrollBar->GetThumbSize() ;
     }

-
+#endif

     return 0;
 }
 
 void wxWindowMac::SetScrollPos(int orient, int pos, bool WXUNUSED(refresh))
 {
     return 0;
 }
 
 void wxWindowMac::SetScrollPos(int orient, int pos, bool WXUNUSED(refresh))
 {

+#if wxUSE_SCROLLBAR

     if ( orient == wxHORIZONTAL )
     {
        if ( m_hScrollBar )
     if ( orient == wxHORIZONTAL )
     {
        if ( m_hScrollBar )


@@ -1289,6 +1520,7 @@ void wxWindowMac::SetScrollPos(int orient, int pos, bool WXUNUSED(refresh))
        if ( m_vScrollBar )
            m_vScrollBar->SetThumbPosition( pos ) ;
     }
        if ( m_vScrollBar )
            m_vScrollBar->SetThumbPosition( pos ) ;
     }

+#endif

 }
 
 void
 }
 
 void


@@ -1322,25 +1554,26 @@ void  wxWindowMac::MacPaintGrowBox()
     if ( IsTopLevel() )
         return ;
 
     if ( IsTopLevel() )
         return ;
 

+#if wxUSE_SCROLLBAR

     if ( MacHasScrollBarCorner() )
     {
     if ( MacHasScrollBarCorner() )
     {

+#if 0

         CGContextRef cgContext = (CGContextRef) MacGetCGContextRef() ;
         wxASSERT( cgContext ) ;
 
         int tx,ty,tw,th;
         CGContextRef cgContext = (CGContextRef) MacGetCGContextRef() ;
         wxASSERT( cgContext ) ;
 
         int tx,ty,tw,th;

-    
-        m_peer->GetSize( tw, th );
-        m_peer->GetPosition( tx, ty );
+
+        GetPeer()->GetSize( tw, th );
+        GetPeer()->GetPosition( tx, ty );

 
         Rect rect  = { ty,tx, ty+th, tx+tw };
 
 
         int size = m_hScrollBar ? m_hScrollBar->GetSize().y : ( m_vScrollBar ? m_vScrollBar->GetSize().x : MAC_SCROLLBAR_SIZE ) ;
         CGRect cgrect = CGRectMake( rect.right - size , rect.bottom - size , size , size ) ;
 
         Rect rect  = { ty,tx, ty+th, tx+tw };
 
 
         int size = m_hScrollBar ? m_hScrollBar->GetSize().y : ( m_vScrollBar ? m_vScrollBar->GetSize().x : MAC_SCROLLBAR_SIZE ) ;
         CGRect cgrect = CGRectMake( rect.right - size , rect.bottom - size , size , size ) ;

-        CGPoint cgpoint = CGPointMake( rect.right - size , rect.bottom - size ) ;

         CGContextSaveGState( cgContext );
 
         CGContextSaveGState( cgContext );
 

-        if ( m_backgroundColour.Ok() )
+        if ( m_backgroundColour.IsOk() )

         {
             CGContextSetFillColorWithColor( cgContext, m_backgroundColour.GetCGColor() );
         }
         {
             CGContextSetFillColorWithColor( cgContext, m_backgroundColour.GetCGColor() );
         }


@@ -1350,7 +1583,18 @@ void  wxWindowMac::MacPaintGrowBox()
         }
         CGContextFillRect( cgContext, cgrect );
         CGContextRestoreGState( cgContext );
         }
         CGContextFillRect( cgContext, cgrect );
         CGContextRestoreGState( cgContext );

+#else
+        if (m_growBox)
+        {
+             if ( m_backgroundColour.IsOk() )
+                 m_growBox->SetBackgroundColour(m_backgroundColour);
+             else
+                 m_growBox->SetBackgroundColour(*wxWHITE);
+        }
+#endif

     }
     }

+
+#endif

 }
 
 void wxWindowMac::MacPaintBorders( int WXUNUSED(leftOrigin) , int WXUNUSED(rightOrigin) )
 }
 
 void wxWindowMac::MacPaintBorders( int WXUNUSED(leftOrigin) , int WXUNUSED(rightOrigin) )


@@ -1358,84 +1602,69 @@ void wxWindowMac::MacPaintBorders( int WXUNUSED(leftOrigin) , int WXUNUSED(right
     if ( IsTopLevel() )
         return ;
 
     if ( IsTopLevel() )
         return ;
 

-    bool hasFocus = m_peer->NeedsFocusRect() && m_peer->HasFocus() ;
+    bool hasFocus = GetPeer()->NeedsFocusRect() && HasFocus();

 
     // back to the surrounding frame rectangle
     int tx,ty,tw,th;
 
     // back to the surrounding frame rectangle
     int tx,ty,tw,th;

-    
-    m_peer->GetSize( tw, th );
-    m_peer->GetPosition( tx, ty );

 
 

-    Rect rect  = { ty,tx, ty+th, tx+tw };
+    GetPeer()->GetSize( tw, th );
+    GetPeer()->GetPosition( tx, ty );

 
 #if wxOSX_USE_COCOA_OR_CARBON
 
 
 #if wxOSX_USE_COCOA_OR_CARBON
 

-    InsetRect( &rect, -1 , -1 ) ;
-

     {
     {

-        CGRect cgrect = CGRectMake( rect.left , rect.top , rect.right - rect.left ,
-            rect.bottom - rect.top ) ;
-
-        HIThemeFrameDrawInfo info ;
-        memset( &info, 0 , sizeof(info) ) ;
-
-        info.version = 0 ;
-        info.kind = 0 ;
-        info.state = IsEnabled() ? kThemeStateActive : kThemeStateInactive ;
-        info.isFocused = hasFocus ;
+        CGRect cgrect = CGRectMake( tx-1 , ty-1 , tw+2 ,
+            th+2 ) ;

 
         CGContextRef cgContext = (CGContextRef) GetParent()->MacGetCGContextRef() ;
         wxASSERT( cgContext ) ;
 
 
         CGContextRef cgContext = (CGContextRef) GetParent()->MacGetCGContextRef() ;
         wxASSERT( cgContext ) ;
 

-        if ( HasFlag(wxRAISED_BORDER) || HasFlag(wxSUNKEN_BORDER) || HasFlag(wxDOUBLE_BORDER) )
+        if ( GetPeer()->NeedsFrame() )

         {
         {

-            info.kind = kHIThemeFrameTextFieldSquare ;
-            HIThemeDrawFrame( &cgrect , &info , cgContext , kHIThemeOrientationNormal ) ;
-        }
-        else if ( HasFlag(wxSIMPLE_BORDER) )
-        {
-            info.kind = kHIThemeFrameListBox ;
-            HIThemeDrawFrame( &cgrect , &info , cgContext , kHIThemeOrientationNormal ) ;
+            HIThemeFrameDrawInfo info ;
+            memset( &info, 0 , sizeof(info) ) ;
+
+            info.version = 0 ;
+            info.kind = 0 ;
+            info.state = IsEnabled() ? kThemeStateActive : kThemeStateInactive ;
+            info.isFocused = hasFocus ;
+
+            if ( HasFlag(wxRAISED_BORDER) || HasFlag(wxSUNKEN_BORDER) || HasFlag(wxDOUBLE_BORDER) )
+            {
+                info.kind = kHIThemeFrameTextFieldSquare ;
+                HIThemeDrawFrame( &cgrect , &info , cgContext , kHIThemeOrientationNormal ) ;
+            }
+            else if ( HasFlag(wxSIMPLE_BORDER) )
+            {
+                info.kind = kHIThemeFrameListBox ;
+                HIThemeDrawFrame( &cgrect , &info , cgContext , kHIThemeOrientationNormal ) ;
+            }

         }
         }

-        else if ( hasFocus )
+
+        if ( hasFocus )

         {
             HIThemeDrawFocusRect( &cgrect , true , cgContext , kHIThemeOrientationNormal ) ;
         }
         {
             HIThemeDrawFocusRect( &cgrect , true , cgContext , kHIThemeOrientationNormal ) ;
         }

-#if 0 // TODO REMOVE now done in a separate call earlier in drawing the window itself
-        m_peer->GetRect( &rect ) ;
-        if ( MacHasScrollBarCorner() )
-        {
-            int variant = (m_hScrollBar == NULL ? m_vScrollBar : m_hScrollBar ) ->GetWindowVariant();
-            int size = m_hScrollBar ? m_hScrollBar->GetSize().y : ( m_vScrollBar ? m_vScrollBar->GetSize().x : MAC_SCROLLBAR_SIZE ) ;
-            CGRect cgrect = CGRectMake( rect.right - size , rect.bottom - size , size , size ) ;
-            CGPoint cgpoint = CGPointMake( rect.right - size , rect.bottom - size ) ;
-            HIThemeGrowBoxDrawInfo info ;
-            memset( &info, 0, sizeof(info) ) ;
-            info.version = 0 ;
-            info.state = IsEnabled() ? kThemeStateActive : kThemeStateInactive ;
-            info.kind = kHIThemeGrowBoxKindNone ;
-            // contrary to the docs ...SizeSmall does not work
-            info.size = kHIThemeGrowBoxSizeNormal ;
-            info.direction = 0 ;
-            HIThemeDrawGrowBox( &cgpoint , &info , cgContext , kHIThemeOrientationNormal ) ;
-        }
-#endif

     }
 #endif // wxOSX_USE_COCOA_OR_CARBON
 }
 
 void wxWindowMac::RemoveChild( wxWindowBase *child )
 {
     }
 #endif // wxOSX_USE_COCOA_OR_CARBON
 }
 
 void wxWindowMac::RemoveChild( wxWindowBase *child )
 {

+#if wxUSE_SCROLLBAR

     if ( child == m_hScrollBar )
         m_hScrollBar = NULL ;
     if ( child == m_vScrollBar )
         m_vScrollBar = NULL ;
     if ( child == m_hScrollBar )
         m_hScrollBar = NULL ;
     if ( child == m_vScrollBar )
         m_vScrollBar = NULL ;

-
+    if ( child == m_growBox )
+        m_growBox = NULL ;
+#endif

     wxWindowBase::RemoveChild( child ) ;
 }
 
 void wxWindowMac::DoUpdateScrollbarVisibility()
 {
     wxWindowBase::RemoveChild( child ) ;
 }
 
 void wxWindowMac::DoUpdateScrollbarVisibility()
 {

+#if wxUSE_SCROLLBAR

     bool triggerSizeEvent = false;
 
     if ( m_hScrollBar )
     bool triggerSizeEvent = false;
 
     if ( m_hScrollBar )


@@ -1463,22 +1692,29 @@ void wxWindowMac::DoUpdateScrollbarVisibility()
     MacRepositionScrollBars() ;
     if ( triggerSizeEvent )
     {
     MacRepositionScrollBars() ;
     if ( triggerSizeEvent )
     {

-        wxSizeEvent event(GetSize(), m_windowId);
-        event.SetEventObject(this);
-        HandleWindowEvent(event);
+        SendSizeEvent();

     }
     }

+#endif

 }
 
 // New function that will replace some of the above.
 void wxWindowMac::SetScrollbar(int orient, int pos, int thumb,
                                int range, bool refresh)
 {
 }
 
 // New function that will replace some of the above.
 void wxWindowMac::SetScrollbar(int orient, int pos, int thumb,
                                int range, bool refresh)
 {

+#if wxUSE_SCROLLBAR
+    // Updating scrollbars when window is being deleted is useless and
+    // currently results in asserts in client-to-screen coordinates conversion
+    // code which is used by DoUpdateScrollbarVisibility() so just skip it.
+    if ( m_isBeingDeleted )
+        return;
+

     if ( orient == wxHORIZONTAL && m_hScrollBar )
         m_hScrollBar->SetScrollbar(pos, thumb, range, thumb, refresh);
     else if ( orient == wxVERTICAL && m_vScrollBar )
         m_vScrollBar->SetScrollbar(pos, thumb, range, thumb, refresh);
 
     DoUpdateScrollbarVisibility();
     if ( orient == wxHORIZONTAL && m_hScrollBar )
         m_hScrollBar->SetScrollbar(pos, thumb, range, thumb, refresh);
     else if ( orient == wxVERTICAL && m_vScrollBar )
         m_vScrollBar->SetScrollbar(pos, thumb, range, thumb, refresh);
 
     DoUpdateScrollbarVisibility();

+#endif

 }
 
 // Does a physical scroll
 }
 
 // Does a physical scroll


@@ -1497,7 +1733,7 @@ void wxWindowMac::ScrollWindow(int dx, int dy, const wxRect *rect)
         // as the native control might be not a 0/0 wx window coordinates, we have to offset
         scrollrect.Offset( -MacGetLeftBorderSize() , -MacGetTopBorderSize() ) ;
 
         // as the native control might be not a 0/0 wx window coordinates, we have to offset
         scrollrect.Offset( -MacGetLeftBorderSize() , -MacGetTopBorderSize() ) ;
 

-        m_peer->ScrollRect( &scrollrect, dx, dy );
+        GetPeer()->ScrollRect( &scrollrect, dx, dy );

     }
 
     wxWindowMac *child;
     }
 
     wxWindowMac *child;


@@ -1507,13 +1743,13 @@ void wxWindowMac::ScrollWindow(int dx, int dy, const wxRect *rect)
         child = node->GetData();
         if (child == NULL)
             continue;
         child = node->GetData();
         if (child == NULL)
             continue;

-        if (child == m_vScrollBar)
-            continue;
-        if (child == m_hScrollBar)
-            continue;
+

         if (child->IsTopLevel())
             continue;
 
         if (child->IsTopLevel())
             continue;
 

+        if ( !IsClientAreaChild(child) )
+            continue;
+

         child->GetPosition( &x, &y );
         child->GetSize( &w, &h );
         if (rect)
         child->GetPosition( &x, &y );
         child->GetSize( &w, &h );
         if (rect)


@@ -1531,6 +1767,7 @@ void wxWindowMac::ScrollWindow(int dx, int dy, const wxRect *rect)
 
 void wxWindowMac::MacOnScroll( wxScrollEvent &event )
 {
 
 void wxWindowMac::MacOnScroll( wxScrollEvent &event )
 {

+#if wxUSE_SCROLLBAR

     if ( event.GetEventObject() == m_vScrollBar || event.GetEventObject() == m_hScrollBar )
     {
         wxScrollWinEvent wevent;
     if ( event.GetEventObject() == m_vScrollBar || event.GetEventObject() == m_hScrollBar )
     {
         wxScrollWinEvent wevent;


@@ -1557,38 +1794,24 @@ void wxWindowMac::MacOnScroll( wxScrollEvent &event )
 
         HandleWindowEvent(wevent);
     }
 
         HandleWindowEvent(wevent);
     }

-}
-
-// Get the window with the focus
-wxWindow *wxWindowBase::DoFindFocus()
-{
-#if wxOSX_USE_CARBON
-    ControlRef control ;
-    GetKeyboardFocus( GetUserFocusWindow() , &control ) ;
-    return wxFindWindowFromWXWidget( (WXWidget) control ) ;
-#else
-    return NULL;

 #endif
 }
 
 #endif
 }
 

-void wxWindowMac::OnInternalIdle()
+wxWindow *wxWindowBase::DoFindFocus()

 {
 {

-    // This calls the UI-update mechanism (querying windows for
-    // menu/toolbar/control state information)
-    if (wxUpdateUIEvent::CanUpdate(this) && IsShownOnScreen())
-        UpdateWindowUI(wxUPDATE_UI_FROMIDLE);
+    return wxFindWindowFromWXWidget(wxWidgetImpl::FindFocus());

 }
 
 // Raise the window to the top of the Z order
 void wxWindowMac::Raise()
 {
 }
 
 // Raise the window to the top of the Z order
 void wxWindowMac::Raise()
 {

-    m_peer->Raise();
+    GetPeer()->Raise();

 }
 
 // Lower the window to the bottom of the Z order
 void wxWindowMac::Lower()
 {
 }
 
 // Lower the window to the bottom of the Z order
 void wxWindowMac::Lower()
 {

-    m_peer->Lower();
+    GetPeer()->Lower();

 }
 
 // static wxWindow *gs_lastWhich = NULL;
 }
 
 // static wxWindow *gs_lastWhich = NULL;


@@ -1603,6 +1826,8 @@ bool wxWindowMac::MacSetupCursor( const wxPoint& pt )
     if ( wxRect2DInt( clientorigin.x , clientorigin.y , clientsize.x , clientsize.y ).Contains( wxPoint2DInt( pt ) ) )
     {
         wxSetCursorEvent event( pt.x , pt.y );
     if ( wxRect2DInt( clientorigin.x , clientorigin.y , clientsize.x , clientsize.y ).Contains( wxPoint2DInt( pt ) ) )
     {
         wxSetCursorEvent event( pt.x , pt.y );

+        event.SetId(GetId());
+        event.SetEventObject(this);

 
         bool processedEvtSetCursor = HandleWindowEvent(event);
         if ( processedEvtSetCursor && event.HasCursor() )
 
         bool processedEvtSetCursor = HandleWindowEvent(event);
         if ( processedEvtSetCursor && event.HasCursor() )


@@ -1615,18 +1840,18 @@ bool wxWindowMac::MacSetupCursor( const wxPoint& pt )
             // if the user code caught EVT_SET_CURSOR() and returned nothing from
             // it - this is a way to say that our cursor shouldn't be used for this
             // point
             // if the user code caught EVT_SET_CURSOR() and returned nothing from
             // it - this is a way to say that our cursor shouldn't be used for this
             // point

-            if ( !processedEvtSetCursor && m_cursor.Ok() )
+            if ( !processedEvtSetCursor && m_cursor.IsOk() )

                 cursor = m_cursor ;
 
             if ( !wxIsBusy() && !GetParent() )
                 cursor = *wxSTANDARD_CURSOR ;
         }
 
                 cursor = m_cursor ;
 
             if ( !wxIsBusy() && !GetParent() )
                 cursor = *wxSTANDARD_CURSOR ;
         }
 

-        if ( cursor.Ok() )
+        if ( cursor.IsOk() )

             cursor.MacInstall() ;
     }
 
             cursor.MacInstall() ;
     }
 

-    return cursor.Ok() ;
+    return cursor.IsOk() ;

 }
 
 wxString wxWindowMac::MacGetToolTipString( wxPoint &WXUNUSED(pt) )
 }
 
 wxString wxWindowMac::MacGetToolTipString( wxPoint &WXUNUSED(pt) )


@@ -1728,9 +1953,9 @@ void wxWindowMac::MacUpdateClippedRects() const
     Rect rIncludingOuterStructures ;
 
     int tx,ty,tw,th;
     Rect rIncludingOuterStructures ;
 
     int tx,ty,tw,th;

-    
-    m_peer->GetSize( tw, th );
-    m_peer->GetPosition( tx, ty );
+
+    GetPeer()->GetSize( tw, th );
+    GetPeer()->GetPosition( tx, ty );

 
     Rect r  = { ty,tx, ty+th, tx+tw };
 
 
     Rect r  = { ty,tx, ty+th, tx+tw };
 


@@ -1812,115 +2037,144 @@ void wxWindowMac::MacUpdateClippedRects() const
 /*
     This function must not change the updatergn !
  */
 /*
     This function must not change the updatergn !
  */

-bool wxWindowMac::MacDoRedraw( void* updatergnr , long time )
+bool wxWindowMac::MacDoRedraw( long time )

 {
     bool handled = false ;
 {
     bool handled = false ;

-#if wxOSX_USE_CARBON
-    Rect updatebounds ;
-    RgnHandle updatergn = (RgnHandle) updatergnr ;
-    GetRegionBounds( updatergn , &updatebounds ) ;

 
 

-    // wxLogDebug(wxT("update for %s bounds %d, %d, %d, %d"), wxString(GetClassInfo()->GetClassName()).c_str(), updatebounds.left, updatebounds.top , updatebounds.right , updatebounds.bottom ) ;
+    wxRegion formerUpdateRgn = m_updateRegion;
+    wxRegion clientUpdateRgn = formerUpdateRgn;

 
 

-    if ( !EmptyRgn(updatergn) )
+    const wxRect clientRect = GetClientRect();
+
+    clientUpdateRgn.Intersect(clientRect);
+
+    // first send an erase event to the entire update area
+    const wxBackgroundStyle bgStyle = GetBackgroundStyle();
+    switch ( bgStyle )

     {
     {

-        RgnHandle newupdate = NewRgn() ;
-        wxSize point = GetClientSize() ;
-        wxPoint origin = GetClientAreaOrigin() ;
-        SetRectRgn( newupdate , origin.x , origin.y , origin.x + point.x , origin.y + point.y ) ;
-        SectRgn( newupdate , updatergn , newupdate ) ;
+        case wxBG_STYLE_ERASE:
+        case wxBG_STYLE_SYSTEM:
+        case wxBG_STYLE_COLOUR:
+            {
+                // for the toplevel window this really is the entire area for
+                // all the others only their client area, otherwise they might
+                // be drawing with full alpha and eg put blue into the grow-box
+                // area of a scrolled window (scroll sample)
+                wxWindowDC dc(this);
+                if ( IsTopLevel() )
+                    dc.SetDeviceClippingRegion(formerUpdateRgn);
+                else
+                    dc.SetDeviceClippingRegion(clientUpdateRgn);

 
 

-        // first send an erase event to the entire update area
-        {
-            // for the toplevel window this really is the entire area
-            // for all the others only their client area, otherwise they
-            // might be drawing with full alpha and eg put blue into
-            // the grow-box area of a scrolled window (scroll sample)
-            wxDC* dc = new wxWindowDC(this);
-            if ( IsTopLevel() )
-                dc->SetDeviceClippingRegion(wxRegion(HIShapeCreateWithQDRgn(updatergn)));
-            else
-                dc->SetDeviceClippingRegion(wxRegion(HIShapeCreateWithQDRgn(newupdate)));
+                if ( bgStyle == wxBG_STYLE_ERASE )
+                {
+                    wxEraseEvent eevent( GetId(), &dc );
+                    eevent.SetEventObject( this );
+                    if ( ProcessWindowEvent( eevent ) )
+                        break;
+                }

 
 

-            wxEraseEvent eevent( GetId(), dc );
-            eevent.SetEventObject( this );
-            HandleWindowEvent( eevent );
-            delete dc ;
-        }
+                if ( UseBgCol() )
+                {
+                    dc.SetBackground(GetBackgroundColour());
+                    dc.Clear();
+                }
+            }
+            break;

 
 

-        MacPaintGrowBox();
+        case wxBG_STYLE_PAINT:
+        case wxBG_STYLE_TRANSPARENT:
+            // nothing to do, user-defined EVT_PAINT handler will overwrite the
+            // entire window client area
+            break;

 
 

-        // calculate a client-origin version of the update rgn and set m_updateRegion to that
-        OffsetRgn( newupdate , -origin.x , -origin.y ) ;
-        m_updateRegion = wxRegion(HIShapeCreateWithQDRgn(newupdate)) ;
-        DisposeRgn( newupdate ) ;
+        default:
+            wxFAIL_MSG( "unsupported background style" );
+    }

 
 

-        if ( !m_updateRegion.Empty() )
-        {
-            // paint the window itself
+    // as this is a full window, shouldn't be necessary anymore
+    // MacPaintGrowBox();

 
 

-            wxPaintEvent event;
-            event.SetTimestamp(time);
-            event.SetEventObject(this);
-            HandleWindowEvent(event);
-            handled = true ;
-        }
+    // calculate a client-origin version of the update rgn and set
+    // m_updateRegion to that
+    clientUpdateRgn.Offset(-clientRect.GetPosition());
+    m_updateRegion = clientUpdateRgn ;

 
 

-        // now we cannot rely on having its borders drawn by a window itself, as it does not
-        // get the updateRgn wide enough to always do so, so we do it from the parent
-        // this would also be the place to draw any custom backgrounds for native controls
-        // in Composited windowing
-        wxPoint clientOrigin = GetClientAreaOrigin() ;
+    if ( !m_updateRegion.Empty() )
+    {
+        // paint the window itself
+
+        wxPaintEvent event(GetId());
+        event.SetTimestamp(time);
+        event.SetEventObject(this);
+        handled = HandleWindowEvent(event);
+    }
+
+    m_updateRegion = formerUpdateRgn;
+
+    wxNonOwnedWindow* top = MacGetTopLevelWindow();
+    if (top)
+        top->WindowWasPainted() ;
+    
+    return handled;
+}
+
+void wxWindowMac::MacPaintChildrenBorders()
+{
+    // now we cannot rely on having its borders drawn by a window itself, as it does not
+    // get the updateRgn wide enough to always do so, so we do it from the parent
+    // this would also be the place to draw any custom backgrounds for native controls
+    // in Composited windowing
+    wxPoint clientOrigin = GetClientAreaOrigin() ;

 
 

-        wxWindowMac *child;
-        int x, y, w, h;
-        for (wxWindowList::compatibility_iterator node = GetChildren().GetFirst(); node; node = node->GetNext())
+    wxWindowMac *child;
+    int x, y, w, h;
+    for (wxWindowList::compatibility_iterator node = GetChildren().GetFirst(); node; node = node->GetNext())
+    {
+        child = node->GetData();
+        if (child == NULL)
+            continue;
+#if wxUSE_SCROLLBAR
+        if (child == m_vScrollBar)
+            continue;
+        if (child == m_hScrollBar)
+            continue;
+         if (child == m_growBox)
+             continue;
+#endif
+        if (child->IsTopLevel())
+            continue;
+        if (!child->IsShown())
+            continue;
+
+        // only draw those in the update region (add a safety margin of 10 pixels for shadow effects
+
+        child->GetPosition( &x, &y );
+        child->GetSize( &w, &h );
+
+        if ( m_updateRegion.Contains(clientOrigin.x+x-10, clientOrigin.y+y-10, w+20, h+20) )

         {
         {

-            child = node->GetData();
-            if (child == NULL)
-                continue;
-            if (child == m_vScrollBar)
-                continue;
-            if (child == m_hScrollBar)
-                continue;
-            if (child->IsTopLevel())
-                continue;
-            if (!child->IsShown())
-                continue;
-
-            // only draw those in the update region (add a safety margin of 10 pixels for shadow effects
-
-            child->GetPosition( &x, &y );
-            child->GetSize( &w, &h );
-            Rect childRect = { y , x , y + h , x + w } ;
-            OffsetRect( &childRect , clientOrigin.x , clientOrigin.y ) ;
-            InsetRect( &childRect , -10 , -10) ;
-
-            if ( RectInRgn( &childRect , updatergn ) )
+            // paint custom borders
+            wxNcPaintEvent eventNc( child->GetId() );
+            eventNc.SetEventObject( child );
+            if ( !child->HandleWindowEvent( eventNc ) )

             {
             {

-                // paint custom borders
-                wxNcPaintEvent eventNc( child->GetId() );
-                eventNc.SetEventObject( child );
-                if ( !child->HandleWindowEvent( eventNc ) )
-                {
-                    child->MacPaintBorders(0, 0) ;
-                }
+                child->MacPaintBorders(0, 0) ;

             }
         }
     }
             }
         }
     }

-#endif
-    return handled ;

 }
 
 
 WXWindow wxWindowMac::MacGetTopLevelWindowRef() const
 {
 }
 
 
 WXWindow wxWindowMac::MacGetTopLevelWindowRef() const
 {

-    wxNonOwnedWindow* tlw = MacGetTopLevelWindow(); 
+    wxNonOwnedWindow* tlw = MacGetTopLevelWindow();

     return tlw ? tlw->GetWXWindow() : NULL ;
 }
 
 bool wxWindowMac::MacHasScrollBarCorner() const
 {
     return tlw ? tlw->GetWXWindow() : NULL ;
 }
 
 bool wxWindowMac::MacHasScrollBarCorner() const
 {

+#if wxUSE_SCROLLBAR

     /* Returns whether the scroll bars in a wxScrolledWindow should be
      * shortened. Scroll bars should be shortened if either:
      *
     /* Returns whether the scroll bars in a wxScrolledWindow should be
      * shortened. Scroll bars should be shortened if either:
      *


@@ -1949,7 +2203,8 @@ bool wxWindowMac::MacHasScrollBarCorner() const
             const wxFrame *frame = wxDynamicCast( win, wxFrame ) ;
             if ( frame )
             {
             const wxFrame *frame = wxDynamicCast( win, wxFrame ) ;
             if ( frame )
             {

-                if ( frame->GetWindowStyleFlag() & wxRESIZE_BORDER )
+                // starting from 10.7 there are no resize indicators anymore
+                if ( (frame->GetWindowStyleFlag() & wxRESIZE_BORDER) && UMAGetSystemVersion() < 0x1070)

                 {
                     // Parent frame has resize handle
                     wxPoint frameBottomRight = frame->GetScreenRect().GetBottomRight();
                 {
                     // Parent frame has resize handle
                     wxPoint frameBottomRight = frame->GetScreenRect().GetBottomRight();


@@ -1981,10 +2236,14 @@ bool wxWindowMac::MacHasScrollBarCorner() const
         // No parent frame found
         return false ;
     }
         // No parent frame found
         return false ;
     }

+#else
+    return false;
+#endif

 }
 
 void wxWindowMac::MacCreateScrollBars( long style )
 {
 }
 
 void wxWindowMac::MacCreateScrollBars( long style )
 {

+#if wxUSE_SCROLLBAR

     wxASSERT_MSG( m_vScrollBar == NULL && m_hScrollBar == NULL , wxT("attempt to create window twice") ) ;
 
     if ( style & ( wxVSCROLL | wxHSCROLL ) )
     wxASSERT_MSG( m_vScrollBar == NULL && m_hScrollBar == NULL , wxT("attempt to create window twice") ) ;
 
     if ( style & ( wxVSCROLL | wxHSCROLL ) )


@@ -2016,22 +2275,32 @@ void wxWindowMac::MacCreateScrollBars( long style )
             m_hScrollBar = new wxScrollBar((wxWindow*)this, wxID_ANY, hPoint, hSize , wxHORIZONTAL);
             m_hScrollBar->SetMinSize( wxDefaultSize );
         }
             m_hScrollBar = new wxScrollBar((wxWindow*)this, wxID_ANY, hPoint, hSize , wxHORIZONTAL);
             m_hScrollBar->SetMinSize( wxDefaultSize );
         }

+
+        wxPoint gPoint(width - scrlsize, height - scrlsize);
+        wxSize gSize(scrlsize, scrlsize);
+        m_growBox = new wxBlindPlateWindow((wxWindow *)this, wxID_ANY, gPoint, gSize, 0);

     }
 
     // because the create does not take into account the client area origin
     // we might have a real position shift
     MacRepositionScrollBars() ;
     }
 
     // because the create does not take into account the client area origin
     // we might have a real position shift
     MacRepositionScrollBars() ;

+#endif

 }
 
 bool wxWindowMac::MacIsChildOfClientArea( const wxWindow* child ) const
 {
 }
 
 bool wxWindowMac::MacIsChildOfClientArea( const wxWindow* child ) const
 {

-    bool result = ((child == NULL) || ((child != m_hScrollBar) && (child != m_vScrollBar)));
+    bool result = ((child == NULL)
+#if wxUSE_SCROLLBAR
+      || ((child != m_hScrollBar) && (child != m_vScrollBar) && (child != m_growBox))
+#endif
+     );

 
     return result ;
 }
 
 void wxWindowMac::MacRepositionScrollBars()
 {
 
     return result ;
 }
 
 void wxWindowMac::MacRepositionScrollBars()
 {

+#if wxUSE_SCROLLBAR

     if ( !m_hScrollBar && !m_vScrollBar )
         return ;
 
     if ( !m_hScrollBar && !m_vScrollBar )
         return ;
 


@@ -2054,11 +2323,29 @@ void wxWindowMac::MacRepositionScrollBars()
         m_vScrollBar->SetSize( vPoint.x , vPoint.y, vSize.x, vSize.y , wxSIZE_ALLOW_MINUS_ONE );
     if ( m_hScrollBar )
         m_hScrollBar->SetSize( hPoint.x , hPoint.y, hSize.x, hSize.y, wxSIZE_ALLOW_MINUS_ONE );
         m_vScrollBar->SetSize( vPoint.x , vPoint.y, vSize.x, vSize.y , wxSIZE_ALLOW_MINUS_ONE );
     if ( m_hScrollBar )
         m_hScrollBar->SetSize( hPoint.x , hPoint.y, hSize.x, hSize.y, wxSIZE_ALLOW_MINUS_ONE );

+    if ( m_growBox )
+    {
+        if ( MacHasScrollBarCorner() )
+        {
+            m_growBox->SetSize( width - scrlsize, height - scrlsize, wxDefaultCoord, wxDefaultCoord, wxSIZE_USE_EXISTING );
+            if ( !m_growBox->IsShown() )
+                m_growBox->Show();
+        }
+        else
+        {
+            if ( m_growBox->IsShown() )
+                m_growBox->Hide();
+        }
+    }
+#endif

 }
 
 bool wxWindowMac::AcceptsFocus() const
 {
 }
 
 bool wxWindowMac::AcceptsFocus() const
 {

-    return m_peer->CanFocus() && wxWindowBase::AcceptsFocus();
+    if ( GetPeer() == NULL || GetPeer()->IsUserPane() )
+        return wxWindowBase::AcceptsFocus();
+    else
+        return GetPeer()->CanFocus();

 }
 
 void wxWindowMac::MacSuperChangedPosition()
 }
 
 void wxWindowMac::MacSuperChangedPosition()


@@ -2093,53 +2380,99 @@ void wxWindowMac::MacTopLevelWindowChangedPosition()
     }
 }
 
     }
 }
 

-long wxWindowMac::MacGetLeftBorderSize() const
+long wxWindowMac::MacGetWXBorderSize() const

 {
     if ( IsTopLevel() )
         return 0 ;
 
     SInt32 border = 0 ;
 
 {
     if ( IsTopLevel() )
         return 0 ;
 
     SInt32 border = 0 ;
 

-    if (HasFlag(wxRAISED_BORDER) || HasFlag( wxSUNKEN_BORDER) || HasFlag(wxDOUBLE_BORDER))
+    if ( GetPeer() && GetPeer()->NeedsFrame() )

     {
     {

+        if (HasFlag(wxRAISED_BORDER) || HasFlag( wxSUNKEN_BORDER) || HasFlag(wxDOUBLE_BORDER))
+        {

 #if wxOSX_USE_COCOA_OR_CARBON
 #if wxOSX_USE_COCOA_OR_CARBON

-        // this metric is only the 'outset' outside the simple frame rect
-        GetThemeMetric( kThemeMetricEditTextFrameOutset , &border ) ;
-        border += 1;
+            // this metric is only the 'outset' outside the simple frame rect
+            GetThemeMetric( kThemeMetricEditTextFrameOutset , &border ) ;
+            border += 1;

 #else
 #else

-        border += 2;
+            border += 2;

 #endif
 #endif

-    }
-    else if (HasFlag(wxSIMPLE_BORDER))
-    {
+        }
+        else if (HasFlag(wxSIMPLE_BORDER))
+        {

 #if wxOSX_USE_COCOA_OR_CARBON
 #if wxOSX_USE_COCOA_OR_CARBON

-        // this metric is only the 'outset' outside the simple frame rect
-        GetThemeMetric( kThemeMetricListBoxFrameOutset , &border ) ;
-        border += 1;
+            // this metric is only the 'outset' outside the simple frame rect
+            GetThemeMetric( kThemeMetricListBoxFrameOutset , &border ) ;
+            border += 1;

 #else
 #else

-        border += 1;
+            border += 1;

 #endif
 #endif

+        }

     }
 
     return border ;
 }
 
     }
 
     return border ;
 }
 

+long wxWindowMac::MacGetLeftBorderSize() const
+{
+    // the wx borders are all symmetric in mac themes
+    long border = MacGetWXBorderSize() ;
+ 
+    if ( GetPeer() )
+    {
+        int left, top, right, bottom;
+        GetPeer()->GetLayoutInset( left, top, right, bottom );
+        border -= left;
+    }
+    
+    return border;
+}
+
+

 long wxWindowMac::MacGetRightBorderSize() const
 {
 long wxWindowMac::MacGetRightBorderSize() const
 {

-    // they are all symmetric in mac themes
-    return MacGetLeftBorderSize() ;
+    // the wx borders are all symmetric in mac themes
+    long border = MacGetWXBorderSize() ;
+    
+    if ( GetPeer() )
+    {
+        int left, top, right, bottom;
+        GetPeer()->GetLayoutInset( left, top, right, bottom );
+        border -= right;
+    }
+    
+    return border;

 }
 
 long wxWindowMac::MacGetTopBorderSize() const
 {
 }
 
 long wxWindowMac::MacGetTopBorderSize() const
 {

-    // they are all symmetric in mac themes
-    return MacGetLeftBorderSize() ;
+    // the wx borders are all symmetric in mac themes
+    long border = MacGetWXBorderSize() ;
+    
+    if ( GetPeer() )
+    {
+        int left, top, right, bottom;
+        GetPeer()->GetLayoutInset( left, top, right, bottom );
+        border -= top;
+    }
+    
+    return border;

 }
 
 long wxWindowMac::MacGetBottomBorderSize() const
 {
 }
 
 long wxWindowMac::MacGetBottomBorderSize() const
 {

-    // they are all symmetric in mac themes
-    return MacGetLeftBorderSize() ;
+    // the wx borders are all symmetric in mac themes
+    long border = MacGetWXBorderSize() ;
+    
+    if ( GetPeer() )
+    {
+        int left, top, right, bottom;
+        GetPeer()->GetLayoutInset( left, top, right, bottom );
+        border -= bottom;
+    }
+    
+    return border;

 }
 
 long wxWindowMac::MacRemoveBordersFromStyle( long style )
 }
 
 long wxWindowMac::MacRemoveBordersFromStyle( long style )


@@ -2193,21 +2526,6 @@ void wxWindowMac::OnMouseEvent( wxMouseEvent &event )
     }
 }
 
     }
 }
 

-void wxWindowMac::OnPaint( wxPaintEvent & WXUNUSED(event) )
-{
-#if wxOSX_USE_COCOA_OR_CARBON
-    // for native controls: call their native paint method
-    if ( !MacIsUserPane() || ( IsTopLevel() && GetBackgroundStyle() == wxBG_STYLE_SYSTEM ) )
-    {
-        if ( wxTheApp->MacGetCurrentEvent() != NULL && wxTheApp->MacGetCurrentEventHandlerCallRef() != NULL
-             && GetBackgroundStyle() != wxBG_STYLE_TRANSPARENT )
-            CallNextEventHandler(
-                (EventHandlerCallRef)wxTheApp->MacGetCurrentEventHandlerCallRef() ,
-                (EventRef) wxTheApp->MacGetCurrentEvent() ) ;
-    }
-#endif
-}
-

 void wxWindowMac::TriggerScrollEvent( wxEventType WXUNUSED(scrollEvent) )
 {
 }
 void wxWindowMac::TriggerScrollEvent( wxEventType WXUNUSED(scrollEvent) )
 {
 }


@@ -2217,22 +2535,27 @@ Rect wxMacGetBoundsForControl( wxWindowMac* window , const wxPoint& pos , const
     int x, y, w, h ;
 
     window->MacGetBoundsForControl( pos , size , x , y, w, h , adjustForOrigin ) ;
     int x, y, w, h ;
 
     window->MacGetBoundsForControl( pos , size , x , y, w, h , adjustForOrigin ) ;

-    Rect bounds = { y, x, y + h, x + w };
+    Rect bounds = { static_cast<short>(y), static_cast<short>(x), static_cast<short>(y + h), static_cast<short>(x + w) };

 
     return bounds ;
 }
 
 
     return bounds ;
 }
 

-bool wxWindowMac::HandleClicked( double timestampsec )
+bool wxWindowMac::OSXHandleClicked( double WXUNUSED(timestampsec) )

 {
     return false;
 }
 
 {
     return false;
 }
 

+void *wxWindowMac::OSXGetViewOrWindow() const
+{
+    return GetHandle();
+}
+

 wxInt32 wxWindowMac::MacControlHit(WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTREF event )
 {
 #if wxOSX_USE_COCOA_OR_CARBON
 wxInt32 wxWindowMac::MacControlHit(WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTREF event )
 {
 #if wxOSX_USE_COCOA_OR_CARBON

-    if ( HandleClicked( GetEventTime((EventRef)event) ) )
+    if ( OSXHandleClicked( GetEventTime((EventRef)event) ) )

         return noErr;
         return noErr;

-        
+

     return eventNotHandledErr ;
 #else
     return 0;
     return eventNotHandledErr ;
 #else
     return 0;


@@ -2245,8 +2568,10 @@ bool wxWindowMac::Reparent(wxWindowBase *newParentBase)
     if ( !wxWindowBase::Reparent(newParent) )
         return false;
 
     if ( !wxWindowBase::Reparent(newParent) )
         return false;
 

-    m_peer->RemoveFromParent();
-    m_peer->Embed( GetParent()->GetPeer() );
+    GetPeer()->RemoveFromParent();
+    GetPeer()->Embed( GetParent()->GetPeer() );
+
+    MacChildAdded();

     return true;
 }
 
     return true;
 }
 


@@ -2275,9 +2600,9 @@ wxByte wxWindowMac::GetTransparent() const
 
 bool wxWindowMac::IsShownOnScreen() const
 {
 
 bool wxWindowMac::IsShownOnScreen() const
 {

-    if ( m_peer && m_peer->IsOk() )
+    if ( GetPeer() && GetPeer()->IsOk() )

     {
     {

-        bool peerVis = m_peer->IsVisible();
+        bool peerVis = GetPeer()->IsVisible();

         bool wxVis = wxWindowBase::IsShownOnScreen();
         if( peerVis != wxVis )
         {
         bool wxVis = wxWindowBase::IsShownOnScreen();
         if( peerVis != wxVis )
         {


@@ -2291,16 +2616,137 @@ bool wxWindowMac::IsShownOnScreen() const
             return wxVis;
         }
 
             return wxVis;
         }
 

-        return m_peer->IsVisible();
+        return GetPeer()->IsVisible();

     }
     return wxWindowBase::IsShownOnScreen();
 }
 
     }
     return wxWindowBase::IsShownOnScreen();
 }
 

-bool wxWindowMac::HandleKeyEvent( wxKeyEvent& event )
+#if wxUSE_HOTKEY && wxOSX_USE_COCOA_OR_CARBON
+
+OSStatus
+wxHotKeyHandler(EventHandlerCallRef WXUNUSED(nextHandler),
+                EventRef event,
+                void* WXUNUSED(userData))
+{
+    EventHotKeyID hotKeyId;
+
+    GetEventParameter( event, kEventParamDirectObject, typeEventHotKeyID, NULL, sizeof(hotKeyId), NULL, &hotKeyId);
+
+    for ( unsigned i = 0; i < s_hotkeys.size(); ++i )
+    {
+        if ( s_hotkeys[i].keyId == static_cast<int>(hotKeyId.id) )
+        {
+            unsigned char charCode ;
+            UInt32 keyCode ;
+            UInt32 modifiers ;
+            UInt32 when = EventTimeToTicks( GetEventTime( event ) ) ;
+
+            GetEventParameter( event, kEventParamKeyMacCharCodes, typeChar, NULL, 1, NULL, &charCode );
+            GetEventParameter( event, kEventParamKeyCode, typeUInt32, NULL, sizeof(UInt32), NULL, &keyCode );
+            GetEventParameter( event, kEventParamKeyModifiers, typeUInt32, NULL, sizeof(UInt32), NULL, &modifiers );
+            
+            UInt32 keymessage = (keyCode << 8) + charCode;
+            
+            wxKeyEvent wxevent(wxEVT_HOTKEY);
+            wxevent.SetId(hotKeyId.id);
+            wxTheApp->MacCreateKeyEvent( wxevent, s_hotkeys[i].window , keymessage , 
+                                        modifiers , when , 0 ) ;
+            
+            s_hotkeys[i].window->HandleWindowEvent(wxevent);
+        }
+    }
+    
+    return noErr;
+}
+
+bool wxWindowMac::RegisterHotKey(int hotkeyId, int modifiers, int keycode)
+{
+    for ( unsigned i = 0; i < s_hotkeys.size(); ++i )
+    {
+        if ( s_hotkeys[i].keyId == hotkeyId )
+        {
+            wxLogLastError(wxT("hotkeyId already registered"));
+                
+            return false;
+        }
+    }
+    
+    static bool installed = false;
+    if ( !installed )
+    {
+        EventTypeSpec eventType;
+        eventType.eventClass=kEventClassKeyboard;
+        eventType.eventKind=kEventHotKeyPressed;
+
+        InstallApplicationEventHandler(&wxHotKeyHandler, 1, &eventType, NULL, NULL);
+        installed = true;
+    }
+    
+    UInt32 mac_modifiers=0;
+    if ( modifiers & wxMOD_ALT )
+        mac_modifiers |= optionKey;
+    if ( modifiers & wxMOD_SHIFT )
+        mac_modifiers |= shiftKey;
+    if ( modifiers & wxMOD_RAW_CONTROL )
+        mac_modifiers |= controlKey;
+    if ( modifiers & wxMOD_CONTROL )
+        mac_modifiers |= cmdKey;
+    
+    EventHotKeyRef hotKeyRef;
+    EventHotKeyID hotKeyIDmac;
+    
+    hotKeyIDmac.signature = 'WXMC';
+    hotKeyIDmac.id = hotkeyId;
+    
+    if ( RegisterEventHotKey(wxCharCodeWXToOSX((wxKeyCode)keycode), mac_modifiers, hotKeyIDmac,
+                        GetApplicationEventTarget(), 0, &hotKeyRef) != noErr )
+    {
+        wxLogLastError(wxT("RegisterHotKey"));
+        
+        return false;
+    }
+    else
+    {
+        wxHotKeyRec v;
+        v.ref = hotKeyRef;
+        v.keyId = hotkeyId;
+        v.window = this;
+        
+        s_hotkeys.push_back(v);
+    }
+    
+    return true;
+}
+
+bool wxWindowMac::UnregisterHotKey(int hotkeyId)

 {
 {

-    bool handled = HandleWindowEvent( event ) ;
-    if ( handled && event.GetSkipped() )
-        handled = false ;
+    for ( int i = ((int)s_hotkeys.size())-1; i>=0; -- i )
+    {
+        if ( s_hotkeys[i].keyId == hotkeyId )
+        {
+            EventHotKeyRef ref = s_hotkeys[i].ref;
+            s_hotkeys.erase(s_hotkeys.begin() + i);
+            if ( UnregisterEventHotKey(ref) != noErr )
+            {
+                wxLogLastError(wxT("UnregisterHotKey"));
+                
+                return false;
+            }
+            else 
+                return true;
+        }
+    }
+    
+    return false;
+}
+
+#endif // wxUSE_HOTKEY
+
+bool wxWindowMac::OSXHandleKeyEvent( wxKeyEvent& event )
+{
+    bool handled = false;
+    
+    // moved the ordinary key event sending AFTER the accel evaluation

 
 #if wxUSE_ACCEL
     if ( !handled && event.GetEventType() == wxEVT_KEY_DOWN)
 
 #if wxUSE_ACCEL
     if ( !handled && event.GetEventType() == wxEVT_KEY_DOWN)


@@ -2313,13 +2759,13 @@ bool wxWindowMac::HandleKeyEvent( wxKeyEvent& event )
             {
                 wxEvtHandler * const handler = ancestor->GetEventHandler();
 
             {
                 wxEvtHandler * const handler = ancestor->GetEventHandler();
 

-                wxCommandEvent command_event( wxEVT_COMMAND_MENU_SELECTED, command );
+                wxCommandEvent command_event( wxEVT_MENU, command );

                 handled = handler->ProcessEvent( command_event );
 
                 if ( !handled )
                 {
                     // accelerators can also be used with buttons, try them too
                 handled = handler->ProcessEvent( command_event );
 
                 if ( !handled )
                 {
                     // accelerators can also be used with buttons, try them too

-                    command_event.SetEventType(wxEVT_COMMAND_BUTTON_CLICKED);
+                    command_event.SetEventType(wxEVT_BUTTON);

                     handled = handler->ProcessEvent( command_event );
                 }
 
                     handled = handler->ProcessEvent( command_event );
                 }
 


@@ -2333,14 +2779,25 @@ bool wxWindowMac::HandleKeyEvent( wxKeyEvent& event )
         }
     }
 #endif // wxUSE_ACCEL
         }
     }
 #endif // wxUSE_ACCEL

+    
+    if ( !handled )
+    {
+        handled = HandleWindowEvent( event ) ;
+        if ( handled && event.GetSkipped() )
+            handled = false ;
+    }

 
     return handled ;
 }
 
 //
 
     return handled ;
 }
 
 //

-// wxWidgetImpl 
+// wxWidgetImpl

 //
 
 //
 

+// we are maintaining a n:1 map from native controls (ControlRef / NSView*) to their wxWidgetImpl
+// n:1 because we might have an embedded view eg within a scrollview, both being part of the same impl
+// the impl is calling Associate with its newly created native control(s), e.g. in InstallHandler
+

 WX_DECLARE_HASH_MAP(WXWidget, wxWidgetImpl*, wxPointerHash, wxPointerEqual, MacControlMap);
 
 static MacControlMap wxWinMacControlList;
 WX_DECLARE_HASH_MAP(WXWidget, wxWidgetImpl*, wxPointerHash, wxPointerEqual, MacControlMap);
 
 static MacControlMap wxWinMacControlList;


@@ -2350,7 +2807,7 @@ wxWindowMac *wxFindWindowFromWXWidget(WXWidget inControl )
     wxWidgetImpl* impl = wxWidgetImpl::FindFromWXWidget( inControl );
     if ( impl )
         return impl->GetWXPeer();
     wxWidgetImpl* impl = wxWidgetImpl::FindFromWXWidget( inControl );
     if ( impl )
         return impl->GetWXPeer();

-    
+

     return NULL;
 }
 
     return NULL;
 }
 


@@ -2395,11 +2852,13 @@ void wxWidgetImpl::RemoveAssociations(wxWidgetImpl* impl)
 
 IMPLEMENT_ABSTRACT_CLASS( wxWidgetImpl , wxObject )
 
 
 IMPLEMENT_ABSTRACT_CLASS( wxWidgetImpl , wxObject )
 

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

 {
     Init();
     m_isRootControl = isRootControl;
 {
     Init();
     m_isRootControl = isRootControl;

+    m_isUserPane = isUserPane;

     m_wxPeer = peer;
     m_wxPeer = peer;

+    m_shouldSendEvents = true;

 }
 
 wxWidgetImpl::wxWidgetImpl()
 }
 
 wxWidgetImpl::wxWidgetImpl()


@@ -2416,6 +2875,7 @@ void wxWidgetImpl::Init()
     m_isRootControl = false;
     m_wxPeer = NULL;
     m_needsFocusRect = false;
     m_isRootControl = false;
     m_wxPeer = NULL;
     m_needsFocusRect = false;

+    m_needsFrame = true;

 }
 
 void wxWidgetImpl::SetNeedsFocusRect( bool needs )
 }
 
 void wxWidgetImpl::SetNeedsFocusRect( bool needs )


@@ -2428,3 +2888,16 @@ bool wxWidgetImpl::NeedsFocusRect() const
     return m_needsFocusRect;
 }
 
     return m_needsFocusRect;
 }
 

+void wxWidgetImpl::SetNeedsFrame( bool needs )
+{
+    m_needsFrame = needs;
+}
+
+bool wxWidgetImpl::NeedsFrame() const
+{
+    return m_needsFrame;
+}
+
+void wxWidgetImpl::SetDrawingEnabled(bool WXUNUSED(enabled))
+{
+}