projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
leave i386 compiler to default
[wxWidgets.git]
/
src
/
osx
/
iphone
/
glcanvas.mm
diff --git
a/src/osx/iphone/glcanvas.mm
b/src/osx/iphone/glcanvas.mm
index bfe0ce8bc640775f1147cfb39300283a4e95e795..9883f9f0e3e205e4b7782b6ecc09bfb49cfa3116 100644
(file)
--- a/
src/osx/iphone/glcanvas.mm
+++ b/
src/osx/iphone/glcanvas.mm
@@
-4,7
+4,6
@@
// Author: Stefan Csomor
// Modified by:
// Created: 1998-01-01
// Author: Stefan Csomor
// Modified by:
// Created: 1998-01-01
-// RCS-ID: $Id$
// Copyright: (c) Stefan Csomor
// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
// Copyright: (c) Stefan Csomor
// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
@@
-142,15
+141,13
@@
- (void) setContext:(EAGLContext*) ctx {
context = ctx;
[EAGLContext setCurrentContext:ctx];
- (void) setContext:(EAGLContext*) ctx {
context = ctx;
[EAGLContext setCurrentContext:ctx];
-#if 0
- CGRect newRect = [self frame];
- if ( /* (CGRectEqualToRect(newRect, oldRect) == NO && ![self isHidden] && newRect.size.width > 0 && newRect.size.height > 0 )
- || */ viewFramebuffer == 0 )
+
+ if ( viewFramebuffer == 0 )
{
[self destroyFramebuffer];
[self createFramebuffer];
}
{
[self destroyFramebuffer];
[self createFramebuffer];
}
-#endif
+
glBindFramebufferOES(GL_FRAMEBUFFER_OES, viewFramebuffer);
}
glBindFramebufferOES(GL_FRAMEBUFFER_OES, viewFramebuffer);
}