going private with userpane info

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67243 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-19 08:36:23 +00:00
parent 0a761908f2
commit d15694e8ca
35 changed files with 264 additions and 182 deletions
--- a/src/osx/window_osx.cpp
+++ b/src/osx/window_osx.cpp
@@ -87,6 +87,8 @@ END_EVENT_TABLE()
 #define wxMAC_DEBUG_REDRAW 0
 #endif

+wxWidgetImplType* kOSXNoWidgetImpl = (wxWidgetImplType*) -1L;
+
 // ===========================================================================
 // implementation
 // ===========================================================================
@@ -202,7 +204,6 @@ void wxWindowMac::Init()
    m_vScrollBarAlwaysShown = false;
    m_growBox = NULL ;

-    m_macIsUserPane = true;
    m_clipChildren = false ;
    m_cachedClippedRectValid = false ;
    m_isNativeWindowWrapper = false;
@@ -258,21 +259,88 @@ wxWindowMac::~wxWindowMac()
    wxDELETE(m_dropTarget);
 #endif

-    delete m_peer ;
+    delete GetPeer() ;
 }

 WXWidget wxWindowMac::GetHandle() const
 {
-    if ( m_peer )
-        return (WXWidget) m_peer->GetWXWidget() ;
+    if ( GetPeer() )
+        return (WXWidget) GetPeer()->GetWXWidget() ;
    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)
 {
-    wxDELETE(m_peer);
-    // todo event check handlers
+    if ( GetPeer() )
+    {
+        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(); 
 }

 // ---------------------------------------------------------------------------
@@ -311,9 +379,9 @@ bool wxWindowMac::Create(wxWindowMac *parent,

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

@@ -350,39 +418,43 @@ void wxWindowMac::MacChildAdded()

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

-    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 )
-    if ( !m_macIsUserPane )
+    if ( !GetPeer()->IsUserPane() )
        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
-    // wxASSERT( m_peer->Ok() ) ;
+    // wxASSERT( GetPeer()->Ok() ) ;

    m_windowVariant = variant ;

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

-    m_peer->SetControlSize( variant );
+    GetPeer()->SetControlSize( variant );
 #if wxOSX_USE_CARBON
    ControlSize size ;

@@ -413,7 +485,7 @@ void wxWindowMac::DoSetWindowVariant( wxWindowVariant variant )
            wxFAIL_MSG(wxT("unexpected window variant"));
            break ;
    }
-    m_peer->SetData<ControlSize>(kControlEntireControl, kControlSizeTag, &size ) ;
+    GetPeer()->SetData<ControlSize>(kControlEntireControl, kControlSizeTag, &size ) ;
 #endif


@@ -447,8 +519,8 @@ void wxWindowMac::DoSetWindowVariant( wxWindowVariant variant )

 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() )
@@ -479,8 +551,8 @@ bool wxWindowMac::SetBackgroundStyle(wxBackgroundStyle style)
    if ( !wxWindowBase::SetBackgroundStyle(style) )
        return false;

-    if ( m_peer )
-        m_peer->SetBackgroundStyle(style);
+    if ( GetPeer() )
+        GetPeer()->SetBackgroundStyle(style);
    return true;
 }

@@ -497,8 +569,8 @@ bool wxWindowMac::SetBackgroundColour(const wxColour& col )
    if ( !wxWindowBase::SetBackgroundColour(col) && m_hasBgCol )
        return false ;

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

    return true ;
 }
@@ -526,13 +598,13 @@ void wxWindowMac::SetFocus()
    if ( former == this )
        return ;

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

 void wxWindowMac::DoCaptureMouse()
 {
    wxApp::s_captureWindow = (wxWindow*) this ;
-    m_peer->CaptureMouse() ;
+    GetPeer()->CaptureMouse() ;
 }

 wxWindow * wxWindowBase::GetCapture()
@@ -544,7 +616,7 @@ void wxWindowMac::DoReleaseMouse()
 {
    wxApp::s_captureWindow = NULL ;

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

 #if wxUSE_DRAG_AND_DROP
@@ -605,7 +677,7 @@ bool wxWindowMac::MacGetBoundsForControl(
 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() ;
@@ -618,7 +690,7 @@ 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() ;
@@ -703,7 +775,7 @@ void wxWindowMac::MacWindowToRootWindow( int *x , int *y ) const
        {
            pt.x -= MacGetLeftBorderSize() ;
            pt.y -= MacGetTopBorderSize() ;
-            wxWidgetImpl::Convert( &pt , m_peer , top->m_peer ) ;
+            wxWidgetImpl::Convert( &pt , GetPeer() , top->GetPeer() ) ;
        }
    }

@@ -727,7 +799,7 @@ void wxWindowMac::MacRootWindowToWindow( int *x , int *y ) const
        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() ;
        }
@@ -747,8 +819,8 @@ wxSize wxWindowMac::DoGetSizeFromClientSize( const wxSize & size )  const
    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;
@@ -766,7 +838,7 @@ void wxWindowMac::DoGetClientSize( int *x, int *y ) const

    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 ;
@@ -844,15 +916,15 @@ void wxWindowMac::DoSetToolTip(wxToolTip *tooltip)
    if ( m_tooltip )
        m_tooltip->SetWindow(this);

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

 #endif

 void wxWindowMac::MacInvalidateBorders()
 {
-    if ( m_peer == NULL )
+    if ( GetPeer() == NULL )
        return ;

    bool vis = IsShownOnScreen() ;
@@ -861,7 +933,7 @@ void wxWindowMac::MacInvalidateBorders()

    int outerBorder = MacGetLeftBorderSize() ;

-    if ( m_peer->NeedsFocusRect() )
+    if ( GetPeer()->NeedsFocusRect() )
        outerBorder += 4 ;

    if ( outerBorder == 0 )
@@ -871,8 +943,8 @@ void wxWindowMac::MacInvalidateBorders()

    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 );
@@ -880,10 +952,10 @@ void wxWindowMac::MacInvalidateBorders()
    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);
    }
 }

@@ -946,7 +1018,7 @@ void wxWindowMac::DoMoveWindow(int x, int y, int width, int height)

        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

@@ -974,7 +1046,7 @@ void wxWindowMac::DoMoveWindow(int x, int y, int width, int height)

 wxSize wxWindowMac::DoGetBestSize() const
 {
-    if ( m_macIsUserPane || IsTopLevel() )
+    if ( GetPeer() == NULL || GetPeer()->IsUserPane() || IsTopLevel() )
    {
        return wxWindowBase::DoGetBestSize() ;
    }
@@ -982,7 +1054,7 @@ wxSize wxWindowMac::DoGetBestSize() const
    {
        wxRect r ;

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

        if ( r.GetWidth() == 0 && r.GetHeight() == 0 )
        {
@@ -1103,7 +1175,7 @@ void wxWindowMac::DoSetSize(int x, int y, int width, int height, int sizeFlags)
 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() );
 }

@@ -1124,7 +1196,7 @@ void wxWindowMac::DoSetClientSize(int clientwidth, int clientheight)

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

 void wxWindowMac::SetLabel(const wxString& title)
@@ -1136,8 +1208,8 @@ void wxWindowMac::SetLabel(const wxString& title)

    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() )
@@ -1154,8 +1226,8 @@ bool wxWindowMac::Show(bool show)
    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
@@ -1176,7 +1248,7 @@ bool wxWindowMac::OSXShowWithEffect(bool show,
                                    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;
@@ -1184,7 +1256,7 @@ bool wxWindowMac::OSXShowWithEffect(bool show,

 void wxWindowMac::DoEnable(bool enable)
 {
-    m_peer->Enable( enable ) ;
+    GetPeer()->Enable( enable ) ;
    MacInvalidateBorders();
 }

@@ -1202,7 +1274,7 @@ void wxWindowMac::MacHiliteChanged()

 void wxWindowMac::MacEnabledStateChanged()
 {
-    OnEnabled( m_peer->IsEnabled() );
+    OnEnabled( GetPeer()->IsEnabled() );
 }

 //
@@ -1211,13 +1283,13 @@ void wxWindowMac::MacEnabledStateChanged()

 bool wxWindowMac::MacIsReallyEnabled()
 {
-    return m_peer->IsEnabled() ;
+    return GetPeer()->IsEnabled() ;
 }

 bool wxWindowMac::MacIsReallyHilited()
 {
 #if wxOSX_USE_CARBON
-    return m_peer->IsActive();
+    return GetPeer()->IsActive();
 #else
    return true; // TODO
 #endif
@@ -1278,30 +1350,30 @@ void wxWindowMac::DoGetTextExtent(const wxString& str,

 void wxWindowMac::Refresh(bool WXUNUSED(eraseBack), const wxRect *rect)
 {
-    if ( m_peer == NULL )
+    if ( GetPeer() == NULL )
        return ;

    if ( !IsShownOnScreen() )
        return ;

-    m_peer->SetNeedsDisplay( rect ) ;
+    GetPeer()->SetNeedsDisplay( rect ) ;
 }

 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
-    if ( m_peer && m_peer->IsOk() )
+    if ( GetPeer() && GetPeer()->IsOk() )
    {
-        m_peer->SetDrawingEnabled( true ) ;
-        m_peer->InvalidateWithChildren() ;
+        GetPeer()->SetDrawingEnabled( true ) ;
+        GetPeer()->InvalidateWithChildren() ;
    }
 #endif
 }
@@ -1450,8 +1522,8 @@ void  wxWindowMac::MacPaintGrowBox()

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

@@ -1489,13 +1561,13 @@ void wxWindowMac::MacPaintBorders( int WXUNUSED(leftOrigin) , int WXUNUSED(right
    if ( IsTopLevel() )
        return ;

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

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

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

-        if ( m_peer->NeedsFrame() )
+        if ( GetPeer()->NeedsFrame() )
        {
            HIThemeFrameDrawInfo info ;
            memset( &info, 0 , sizeof(info) ) ;
@@ -1626,7 +1698,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() ) ;

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

    wxWindowMac *child;
@@ -1698,13 +1770,13 @@ wxWindow *wxWindowBase::DoFindFocus()
 // 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()
 {
-    m_peer->Lower();
+    GetPeer()->Lower();
 }

 // static wxWindow *gs_lastWhich = NULL;
@@ -1845,8 +1917,8 @@ void wxWindowMac::MacUpdateClippedRects() const

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

@@ -2227,10 +2299,10 @@ void wxWindowMac::MacRepositionScrollBars()

 bool wxWindowMac::AcceptsFocus() const
 {
-    if ( MacIsUserPane() )
+    if ( GetPeer() == NULL || GetPeer()->IsUserPane() )
        return wxWindowBase::AcceptsFocus();
    else
-        return m_peer->CanFocus();
+        return GetPeer()->CanFocus();
 }

 void wxWindowMac::MacSuperChangedPosition()
@@ -2272,7 +2344,7 @@ long wxWindowMac::MacGetWXBorderSize() const

    SInt32 border = 0 ;

-    if ( m_peer && m_peer->NeedsFrame() )
+    if ( GetPeer() && GetPeer()->NeedsFrame() )
    {
        if (HasFlag(wxRAISED_BORDER) || HasFlag( wxSUNKEN_BORDER) || HasFlag(wxDOUBLE_BORDER))
        {
@@ -2304,10 +2376,10 @@ long wxWindowMac::MacGetLeftBorderSize() const
    // the wx borders are all symmetric in mac themes
    long border = MacGetWXBorderSize() ;
 
-    if ( m_peer )
+    if ( GetPeer() )
    {
        int left, top, right, bottom;
-        m_peer->GetLayoutInset( left, top, right, bottom );
+        GetPeer()->GetLayoutInset( left, top, right, bottom );
        border -= left;
    }
    
@@ -2320,10 +2392,10 @@ long wxWindowMac::MacGetRightBorderSize() const
    // the wx borders are all symmetric in mac themes
    long border = MacGetWXBorderSize() ;
    
-    if ( m_peer )
+    if ( GetPeer() )
    {
        int left, top, right, bottom;
-        m_peer->GetLayoutInset( left, top, right, bottom );
+        GetPeer()->GetLayoutInset( left, top, right, bottom );
        border -= right;
    }
    
@@ -2335,10 +2407,10 @@ long wxWindowMac::MacGetTopBorderSize() const
    // the wx borders are all symmetric in mac themes
    long border = MacGetWXBorderSize() ;
    
-    if ( m_peer )
+    if ( GetPeer() )
    {
        int left, top, right, bottom;
-        m_peer->GetLayoutInset( left, top, right, bottom );
+        GetPeer()->GetLayoutInset( left, top, right, bottom );
        border -= top;
    }
    
@@ -2350,10 +2422,10 @@ long wxWindowMac::MacGetBottomBorderSize() const
    // the wx borders are all symmetric in mac themes
    long border = MacGetWXBorderSize() ;
    
-    if ( m_peer )
+    if ( GetPeer() )
    {
        int left, top, right, bottom;
-        m_peer->GetLayoutInset( left, top, right, bottom );
+        GetPeer()->GetLayoutInset( left, top, right, bottom );
        border -= bottom;
    }
    
@@ -2448,8 +2520,8 @@ bool wxWindowMac::Reparent(wxWindowBase *newParentBase)
    if ( !wxWindowBase::Reparent(newParent) )
        return false;

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

    MacChildAdded();
    return true;
@@ -2480,9 +2552,9 @@ wxByte wxWindowMac::GetTransparent() 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 )
        {
@@ -2496,7 +2568,7 @@ bool wxWindowMac::IsShownOnScreen() const
            return wxVis;
        }

-        return m_peer->IsVisible();
+        return GetPeer()->IsVisible();
    }
    return wxWindowBase::IsShownOnScreen();
 }