Corrected XML conversion in style names and face names

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

diff --git a/src/osx/window_osx.cpp b/src/osx/window_osx.cpp
index ec1375142eb95edd61d9a98d58daac1d9380617f..c24fb9b151ee3eff5418610e765f4184e8357faa 100644 (file)
--- a/src/osx/window_osx.cpp
+++ b/src/osx/window_osx.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     wxWindowMac
 // Author:      Stefan Csomor
 // Modified by:
 // Purpose:     wxWindowMac
 // Author:      Stefan Csomor
 // Modified by:


@@ -76,8 +76,6 @@
 
 #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)


@@ -89,6 +87,8 @@ END_EVENT_TABLE()
 #define wxMAC_DEBUG_REDRAW 0
 #endif
 
 #define wxMAC_DEBUG_REDRAW 0
 #endif
 

+wxWidgetImplType* kOSXNoWidgetImpl = (wxWidgetImplType*) -1L;
+

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


@@ -204,7 +204,6 @@ void wxWindowMac::Init()
     m_vScrollBarAlwaysShown = false;
     m_growBox = NULL ;
 
     m_vScrollBarAlwaysShown = false;
     m_growBox = NULL ;
 

-    m_macIsUserPane = true;

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


@@ -260,16 +259,91 @@ wxWindowMac::~wxWindowMac()
     wxDELETE(m_dropTarget);
 #endif
 
     wxDELETE(m_dropTarget);
 #endif
 

-    delete m_peer ;
+    delete GetPeer() ;

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

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

     return NULL;
 }
 
     return NULL;
 }
 

+wxOSXWidgetImpl* wxWindowMac::GetPeer() const 
+{ 
+    return m_peer == kOSXNoWidgetImpl ? NULL : m_peer ; 
+}
+
+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
+        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
 // ---------------------------------------------------------------------------


@@ -306,9 +380,9 @@ bool wxWindowMac::Create(wxWindowMac *parent,
 
     m_windowVariant = parent->GetWindowVariant() ;
 
 
     m_windowVariant = parent->GetWindowVariant() ;
 

-    if ( m_macIsUserPane )
+    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) ;
     }
 
         MacPostControlCreate(pos, size) ;
     }
 


@@ -345,39 +419,43 @@ void wxWindowMac::MacChildAdded()
 
 void wxWindowMac::MacPostControlCreate(const wxPoint& WXUNUSED(pos), const wxSize& size)
 {
 
 void wxWindowMac::MacPostControlCreate(const wxPoint& WXUNUSED(pos), const wxSize& 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()->Ok() ) ;

 
     m_windowVariant = variant ;
 
 
     m_windowVariant = variant ;
 

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

         return;
 
         return;
 

-    m_peer->SetControlSize( variant );
+    GetPeer()->SetControlSize( variant );

 #if wxOSX_USE_CARBON
     ControlSize size ;
 
 #if wxOSX_USE_CARBON
     ControlSize size ;
 


@@ -408,7 +486,7 @@ void wxWindowMac::DoSetWindowVariant( wxWindowVariant variant )
             wxFAIL_MSG(wxT("unexpected window variant"));
             break ;
     }
             wxFAIL_MSG(wxT("unexpected window variant"));
             break ;
     }

-    m_peer->SetData<ControlSize>(kControlEntireControl, kControlSizeTag, &size ) ;
+    GetPeer()->SetData<ControlSize>(kControlEntireControl, kControlSizeTag, &size ) ;

 #endif
 
 
 #endif
 
 


@@ -442,8 +520,8 @@ void wxWindowMac::DoSetWindowVariant( wxWindowVariant variant )
 
 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() )


@@ -474,8 +552,8 @@ bool wxWindowMac::SetBackgroundStyle(wxBackgroundStyle style)
     if ( !wxWindowBase::SetBackgroundStyle(style) )
         return false;
 
     if ( !wxWindowBase::SetBackgroundStyle(style) )
         return false;
 

-    if ( m_peer )
-        m_peer->SetBackgroundStyle(style);
+    if ( GetPeer() )
+        GetPeer()->SetBackgroundStyle(style);

     return true;
 }
 
     return true;
 }
 


@@ -492,8 +570,8 @@ bool wxWindowMac::SetBackgroundColour(const wxColour& col )
     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 ;
 }


@@ -521,13 +599,13 @@ void wxWindowMac::SetFocus()
     if ( former == this )
         return ;
 
     if ( former == this )
         return ;
 

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

 }
 
 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()


@@ -539,7 +617,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


@@ -600,7 +678,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() ;


@@ -613,7 +691,7 @@ void wxWindowMac::DoGetPosition(int *x, int *y) const
 {
     int x1, y1;
 
 {
     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() ;


@@ -698,7 +776,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() ) ;

         }
     }
 
         }
     }
 


@@ -722,7 +800,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() ;
         }


@@ -742,8 +820,8 @@ wxSize wxWindowMac::DoGetSizeFromClientSize( const wxSize & size )  const
     int left, top;
     int outerwidth, outerheight;
 
     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;


@@ -761,7 +839,7 @@ void wxWindowMac::DoGetClientSize( int *x, int *y ) const
 
     int left, top;
 
 
     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 wxUSE_SCROLLBAR
     if (m_hScrollBar  && m_hScrollBar->IsShown() )
         hh -= m_hScrollBar->GetSize().y ;


@@ -839,15 +917,15 @@ void wxWindowMac::DoSetToolTip(wxToolTip *tooltip)
     if ( m_tooltip )
         m_tooltip->SetWindow(this);
 
     if ( m_tooltip )
         m_tooltip->SetWindow(this);
 

-    if (m_peer)
-        m_peer->SetToolTip(tooltip);
+    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() ;


@@ -856,7 +934,7 @@ void wxWindowMac::MacInvalidateBorders()
 
     int outerBorder = MacGetLeftBorderSize() ;
 
 
     int outerBorder = MacGetLeftBorderSize() ;
 

-    if ( m_peer->NeedsFocusRect() )
+    if ( GetPeer()->NeedsFocusRect() )

         outerBorder += 4 ;
 
     if ( outerBorder == 0 )
         outerBorder += 4 ;
 
     if ( outerBorder == 0 )


@@ -866,8 +944,8 @@ void wxWindowMac::MacInvalidateBorders()
 
     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 leftupdate( tx-outerBorder,ty,outerBorder,th );
     wxRect rightupdate( tx+tw, ty, outerBorder, th );


@@ -875,10 +953,10 @@ void wxWindowMac::MacInvalidateBorders()
     wxRect bottomupdate( tx-outerBorder, ty + th, tw + 2 * outerBorder, outerBorder );
 
     if (GetParent()) {
     wxRect bottomupdate( tx-outerBorder, ty + th, tw + 2 * outerBorder, outerBorder );
 
     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);

     }
 }
 
     }
 }
 


@@ -941,7 +1019,7 @@ void wxWindowMac::DoMoveWindow(int x, int y, int width, int height)
 
         m_cachedClippedRectValid = false ;
 
 
         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
 


@@ -969,7 +1047,7 @@ void wxWindowMac::DoMoveWindow(int x, int y, int width, int height)
 
 wxSize wxWindowMac::DoGetBestSize() const
 {
 
 wxSize wxWindowMac::DoGetBestSize() const
 {

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

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


@@ -977,7 +1055,7 @@ wxSize wxWindowMac::DoGetBestSize() const
     {
         wxRect r ;
 
     {
         wxRect r ;
 

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

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


@@ -1098,7 +1176,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() );
 }
 


@@ -1117,6 +1195,11 @@ void wxWindowMac::DoSetClientSize(int clientwidth, int clientheight)
     }
 }
 
     }
 }
 

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

 void wxWindowMac::SetLabel(const wxString& title)
 {
     if ( title == m_label )
 void wxWindowMac::SetLabel(const wxString& title)
 {
     if ( title == m_label )


@@ -1126,8 +1209,8 @@ void wxWindowMac::SetLabel(const wxString& title)
 
     InvalidateBestSize();
 
 
     InvalidateBestSize();
 

-    if ( m_peer && m_peer->IsOk() )
-        m_peer->SetLabel( wxStripMenuCodes(m_label, wxStrip_Mnemonics), GetFont().GetEncoding() ) ;
+    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() )


@@ -1144,8 +1227,8 @@ bool wxWindowMac::Show(bool show)
     if ( !wxWindowBase::Show(show) )
         return false;
 
     if ( !wxWindowBase::Show(show) )
         return false;
 

-    if ( m_peer )
-        m_peer->SetVisibility( show ) ;
+    if ( GetPeer() )
+        GetPeer()->SetVisibility( show ) ;

 
 #ifdef __WXOSX_IPHONE__
     // only when there's no native event support
 
 #ifdef __WXOSX_IPHONE__
     // only when there's no native event support


@@ -1166,7 +1249,7 @@ bool wxWindowMac::OSXShowWithEffect(bool show,
                                     unsigned timeout)
 {
     if ( effect == wxSHOW_EFFECT_NONE ||
                                     unsigned timeout)
 {
     if ( effect == wxSHOW_EFFECT_NONE ||

-            !m_peer || !m_peer->ShowWithEffect(show, effect, timeout) )
+            !GetPeer() || !GetPeer()->ShowWithEffect(show, effect, timeout) )

         return Show(show);
 
     return true;
         return Show(show);
 
     return true;


@@ -1174,7 +1257,7 @@ bool wxWindowMac::OSXShowWithEffect(bool show,
 
 void wxWindowMac::DoEnable(bool enable)
 {
 
 void wxWindowMac::DoEnable(bool enable)
 {

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

     MacInvalidateBorders();
 }
 
     MacInvalidateBorders();
 }
 


@@ -1192,7 +1275,7 @@ void wxWindowMac::MacHiliteChanged()
 
 void wxWindowMac::MacEnabledStateChanged()
 {
 
 void wxWindowMac::MacEnabledStateChanged()
 {

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

 }
 
 //
 }
 
 //


@@ -1201,13 +1284,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


@@ -1268,30 +1351,30 @@ void wxWindowMac::DoGetTextExtent(const wxString& str,
 
 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 ) ;
+    GetPeer()->SetNeedsDisplay( rect ) ;

 }
 
 void wxWindowMac::DoFreeze()
 {
 #if wxOSX_USE_CARBON
 }
 
 void wxWindowMac::DoFreeze()
 {
 #if wxOSX_USE_CARBON

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

 #endif
 }
 
 void wxWindowMac::DoThaw()
 {
 #if wxOSX_USE_CARBON
 #endif
 }
 
 void wxWindowMac::DoThaw()
 {
 #if wxOSX_USE_CARBON

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

     {
     {

-        m_peer->SetDrawingEnabled( true ) ;
-        m_peer->InvalidateWithChildren() ;
+        GetPeer()->SetDrawingEnabled( true ) ;
+        GetPeer()->InvalidateWithChildren() ;

     }
 #endif
 }
     }
 #endif
 }


@@ -1440,8 +1523,8 @@ void  wxWindowMac::MacPaintGrowBox()
 
         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 );

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


@@ -1479,13 +1562,13 @@ 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 );
+    GetPeer()->GetSize( tw, th );
+    GetPeer()->GetPosition( tx, ty );

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


@@ -1500,7 +1583,7 @@ void wxWindowMac::MacPaintBorders( int WXUNUSED(leftOrigin) , int WXUNUSED(right
         CGContextRef cgContext = (CGContextRef) GetParent()->MacGetCGContextRef() ;
         wxASSERT( cgContext ) ;
 
         CGContextRef cgContext = (CGContextRef) GetParent()->MacGetCGContextRef() ;
         wxASSERT( cgContext ) ;
 

-        if ( m_peer->NeedsFrame() )
+        if ( GetPeer()->NeedsFrame() )

         {
             HIThemeFrameDrawInfo info ;
             memset( &info, 0 , sizeof(info) ) ;
         {
             HIThemeFrameDrawInfo info ;
             memset( &info, 0 , sizeof(info) ) ;


@@ -1616,7 +1699,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;


@@ -1685,24 +1768,16 @@ wxWindow *wxWindowBase::DoFindFocus()
     return wxFindWindowFromWXWidget(wxWidgetImpl::FindFocus());
 }
 
     return wxFindWindowFromWXWidget(wxWidgetImpl::FindFocus());
 }
 

-void wxWindowMac::OnInternalIdle()
-{
-    // This calls the UI-update mechanism (querying windows for
-    // menu/toolbar/control state information)
-    if (wxUpdateUIEvent::CanUpdate(this) && IsShownOnScreen())
-        UpdateWindowUI(wxUPDATE_UI_FROMIDLE);
-}
-

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


@@ -1843,8 +1918,8 @@ void wxWindowMac::MacUpdateClippedRects() const
 
     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 );

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


@@ -2225,10 +2300,10 @@ void wxWindowMac::MacRepositionScrollBars()
 
 bool wxWindowMac::AcceptsFocus() const
 {
 
 bool wxWindowMac::AcceptsFocus() const
 {

-    if ( MacIsUserPane() )
+    if ( GetPeer() == NULL || GetPeer()->IsUserPane() )

         return wxWindowBase::AcceptsFocus();
     else
         return wxWindowBase::AcceptsFocus();
     else

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

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


@@ -2270,7 +2345,7 @@ long wxWindowMac::MacGetWXBorderSize() const
 
     SInt32 border = 0 ;
 
 
     SInt32 border = 0 ;
 

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

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


@@ -2302,10 +2377,10 @@ long wxWindowMac::MacGetLeftBorderSize() const
     // the wx borders are all symmetric in mac themes
     long border = MacGetWXBorderSize() ;
  
     // the wx borders are all symmetric in mac themes
     long border = MacGetWXBorderSize() ;
  

-    if ( m_peer )
+    if ( GetPeer() )

     {
         int left, top, right, bottom;
     {
         int left, top, right, bottom;

-        m_peer->GetLayoutInset( left, top, right, bottom );
+        GetPeer()->GetLayoutInset( left, top, right, bottom );

         border -= left;
     }
     
         border -= left;
     }
     


@@ -2318,10 +2393,10 @@ long wxWindowMac::MacGetRightBorderSize() const
     // the wx borders are all symmetric in mac themes
     long border = MacGetWXBorderSize() ;
     
     // the wx borders are all symmetric in mac themes
     long border = MacGetWXBorderSize() ;
     

-    if ( m_peer )
+    if ( GetPeer() )

     {
         int left, top, right, bottom;
     {
         int left, top, right, bottom;

-        m_peer->GetLayoutInset( left, top, right, bottom );
+        GetPeer()->GetLayoutInset( left, top, right, bottom );

         border -= right;
     }
     
         border -= right;
     }
     


@@ -2333,10 +2408,10 @@ long wxWindowMac::MacGetTopBorderSize() const
     // the wx borders are all symmetric in mac themes
     long border = MacGetWXBorderSize() ;
     
     // the wx borders are all symmetric in mac themes
     long border = MacGetWXBorderSize() ;
     

-    if ( m_peer )
+    if ( GetPeer() )

     {
         int left, top, right, bottom;
     {
         int left, top, right, bottom;

-        m_peer->GetLayoutInset( left, top, right, bottom );
+        GetPeer()->GetLayoutInset( left, top, right, bottom );

         border -= top;
     }
     
         border -= top;
     }
     


@@ -2348,10 +2423,10 @@ long wxWindowMac::MacGetBottomBorderSize() const
     // the wx borders are all symmetric in mac themes
     long border = MacGetWXBorderSize() ;
     
     // the wx borders are all symmetric in mac themes
     long border = MacGetWXBorderSize() ;
     

-    if ( m_peer )
+    if ( GetPeer() )

     {
         int left, top, right, bottom;
     {
         int left, top, right, bottom;

-        m_peer->GetLayoutInset( left, top, right, bottom );
+        GetPeer()->GetLayoutInset( left, top, right, bottom );

         border -= bottom;
     }
     
         border -= bottom;
     }
     


@@ -2446,8 +2521,8 @@ 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;
 
     MacChildAdded();
     return true;


@@ -2478,9 +2553,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 )
         {


@@ -2494,16 +2569,16 @@ bool wxWindowMac::IsShownOnScreen() const
             return wxVis;
         }
 
             return wxVis;
         }
 

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

     }
     return wxWindowBase::IsShownOnScreen();
 }
 
 bool wxWindowMac::OSXHandleKeyEvent( wxKeyEvent& event )
 {
     }
     return wxWindowBase::IsShownOnScreen();
 }
 
 bool wxWindowMac::OSXHandleKeyEvent( wxKeyEvent& event )
 {

-    bool handled = HandleWindowEvent( event ) ;
-    if ( handled && event.GetSkipped() )
-        handled = false ;
+    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)


@@ -2536,6 +2611,13 @@ bool wxWindowMac::OSXHandleKeyEvent( wxKeyEvent& event )
         }
     }
 #endif // wxUSE_ACCEL
         }
     }
 #endif // wxUSE_ACCEL

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

 
     return handled ;
 }
 
     return handled ;
 }


@@ -2598,10 +2680,11 @@ 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_shouldSendEvents = true;
 }
     m_wxPeer = peer;
     m_shouldSendEvents = true;
 }