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
This commit is contained in:
@@ -32,7 +32,7 @@ wxSize wxButton::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 )
|
||||||
{
|
{
|
||||||
|
@@ -397,7 +397,7 @@ bool wxGLCanvas::Create(wxWindow *parent,
|
|||||||
[NSNumber numberWithBool:NO], kEAGLDrawablePropertyRetainedBacking,
|
[NSNumber numberWithBool:NO], kEAGLDrawablePropertyRetainedBacking,
|
||||||
kEAGLColorFormatRGBA8, kEAGLDrawablePropertyColorFormat, nil];
|
kEAGLColorFormatRGBA8, kEAGLDrawablePropertyColorFormat, nil];
|
||||||
|
|
||||||
m_peer = new wxWidgetIPhoneImpl( this, v );
|
SetPeer(new wxWidgetIPhoneImpl( this, v ));
|
||||||
|
|
||||||
MacPostControlCreate(pos, size) ;
|
MacPostControlCreate(pos, size) ;
|
||||||
#endif
|
#endif
|
||||||
@@ -415,7 +415,7 @@ bool wxGLCanvas::SwapBuffers()
|
|||||||
WXGLContext context = WXGLGetCurrentContext();
|
WXGLContext context = WXGLGetCurrentContext();
|
||||||
wxCHECK_MSG(context, false, wxT("should have current context"));
|
wxCHECK_MSG(context, false, wxT("should have current context"));
|
||||||
|
|
||||||
wxUICustomOpenGLView* v = (wxUICustomOpenGLView*) m_peer->GetWXWidget();
|
wxUICustomOpenGLView* v = (wxUICustomOpenGLView*) GetPeer()->GetWXWidget();
|
||||||
[v swapBuffers];
|
[v swapBuffers];
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
@@ -247,7 +247,7 @@ bool wxToolBar::Create(
|
|||||||
}
|
}
|
||||||
m_macToolbar = toolbar;
|
m_macToolbar = toolbar;
|
||||||
|
|
||||||
m_peer = new wxWidgetIPhoneImpl( this, toolbar );
|
SetPeer(new wxWidgetIPhoneImpl( this, toolbar ));
|
||||||
MacPostControlCreate(pos, size) ;
|
MacPostControlCreate(pos, size) ;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user