X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/42327c33878dca983e3b7fffda9bf612aea7689a..7c60222510bc5e197b12f153c4bf05db66cb0f4a:/src/osx/iphone/glcanvas.mm diff --git a/src/osx/iphone/glcanvas.mm b/src/osx/iphone/glcanvas.mm index 98e97dcc79..0c7d8418be 100644 --- a/src/osx/iphone/glcanvas.mm +++ b/src/osx/iphone/glcanvas.mm @@ -4,7 +4,7 @@ // Author: Stefan Csomor // Modified by: // Created: 1998-01-01 -// RCS-ID: $Id: glcanvas.cpp 54129 2008-06-11 19:30:52Z SC $ +// RCS-ID: $Id$ // Copyright: (c) Stefan Csomor // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -46,6 +46,7 @@ @interface wxUICustomOpenGLView : UIView { + CGRect oldRect; EAGLContext* context; /* The pixel dimensions of the backbuffer */ @@ -61,6 +62,7 @@ - (BOOL) createFramebuffer; - (void) destroyFramebuffer; +- (id) initWithFrame:(CGRect) rect; @end @@ -80,6 +82,15 @@ } } +- (id) initWithFrame:(CGRect)rect +{ + if ( !(self=[super initWithFrame:rect]) ) + return nil; + + oldRect = rect; + return self; +} + - (BOOL)isOpaque { return YES; @@ -131,8 +142,13 @@ - (void) setContext:(EAGLContext*) ctx { context = ctx; [EAGLContext setCurrentContext:ctx]; - [self destroyFramebuffer]; - [self createFramebuffer]; + + if ( viewFramebuffer == 0 ) + { + [self destroyFramebuffer]; + [self createFramebuffer]; + } + glBindFramebufferOES(GL_FRAMEBUFFER_OES, viewFramebuffer); } @@ -141,6 +157,12 @@ [context presentRenderbuffer:GL_RENDERBUFFER_OES]; } +- (void)layoutSubviews { + [EAGLContext setCurrentContext:context]; + [self destroyFramebuffer]; + [self createFramebuffer]; +} + @end @@ -358,7 +380,7 @@ bool wxGLCanvas::Create(wxWindow *parent, return false; */ #if USE_SEPARATE_VIEW - m_macIsUserPane = false ; + DontCreatePeer(); #endif if ( !wxWindow::Create(parent, id, pos, size, style, name) ) @@ -373,7 +395,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 @@ -391,7 +413,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; }