From 8606ee50771053a38554c7d38b765a8142a1a96c Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Fri, 18 Mar 2011 14:33:57 +0000 Subject: [PATCH] going private for m_peer to give a foundation for better encapsulation git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67231 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/osx/iphone/button.mm | 2 +- src/osx/iphone/glcanvas.mm | 4 ++-- src/osx/iphone/toolbar.mm | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/osx/iphone/button.mm b/src/osx/iphone/button.mm index 275128f191..cfc67b6349 100644 --- a/src/osx/iphone/button.mm +++ b/src/osx/iphone/button.mm @@ -32,7 +32,7 @@ wxSize wxButton::DoGetBestSize() const wxRect r ; - m_peer->GetBestRect(&r); + GetPeer()->GetBestRect(&r); if ( r.GetWidth() == 0 && r.GetHeight() == 0 ) { diff --git a/src/osx/iphone/glcanvas.mm b/src/osx/iphone/glcanvas.mm index ca71c5bda3..432cde233b 100644 --- a/src/osx/iphone/glcanvas.mm +++ b/src/osx/iphone/glcanvas.mm @@ -397,7 +397,7 @@ bool wxGLCanvas::Create(wxWindow *parent, [NSNumber numberWithBool:NO], kEAGLDrawablePropertyRetainedBacking, kEAGLColorFormatRGBA8, kEAGLDrawablePropertyColorFormat, nil]; - m_peer = new wxWidgetIPhoneImpl( this, v ); + SetPeer(new wxWidgetIPhoneImpl( this, v )); MacPostControlCreate(pos, size) ; #endif @@ -415,7 +415,7 @@ bool wxGLCanvas::SwapBuffers() WXGLContext context = WXGLGetCurrentContext(); wxCHECK_MSG(context, false, wxT("should have current context")); - wxUICustomOpenGLView* v = (wxUICustomOpenGLView*) m_peer->GetWXWidget(); + wxUICustomOpenGLView* v = (wxUICustomOpenGLView*) GetPeer()->GetWXWidget(); [v swapBuffers]; return true; } diff --git a/src/osx/iphone/toolbar.mm b/src/osx/iphone/toolbar.mm index c65ee34d66..64facb5d55 100644 --- a/src/osx/iphone/toolbar.mm +++ b/src/osx/iphone/toolbar.mm @@ -247,7 +247,7 @@ bool wxToolBar::Create( } m_macToolbar = toolbar; - m_peer = new wxWidgetIPhoneImpl( this, toolbar ); + SetPeer(new wxWidgetIPhoneImpl( this, toolbar )); MacPostControlCreate(pos, size) ; } -- 2.45.2