avoid setting initial position if it was not specified, broken in r70734

[wxWidgets.git] / src / osx / iphone / glcanvas.mm

diff --git a/src/osx/iphone/glcanvas.mm b/src/osx/iphone/glcanvas.mm
index ca71c5bda33fd6db03f3a7f1b9d971d2fb793c6d..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: glcanvas.cpp 54129 2008-06-11 19:30:52Z SC $

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


@@ -382,7 +379,7 @@ bool wxGLCanvas::Create(wxWindow *parent,
         return false;
 */
 #if USE_SEPARATE_VIEW
         return false;
 */
 #if USE_SEPARATE_VIEW

-    m_macIsUserPane = false ;
+    DontCreatePeer();

 #endif
 
     if ( !wxWindow::Create(parent, id, pos, size, style, name) )
 #endif
 
     if ( !wxWindow::Create(parent, id, pos, size, style, name) )


@@ -397,7 +394,7 @@ bool wxGLCanvas::Create(wxWindow *parent,
             [NSNumber numberWithBool:NO], kEAGLDrawablePropertyRetainedBacking, 
             kEAGLColorFormatRGBA8, kEAGLDrawablePropertyColorFormat, nil];
             
             [NSNumber numberWithBool:NO], kEAGLDrawablePropertyRetainedBacking, 
             kEAGLColorFormatRGBA8, kEAGLDrawablePropertyColorFormat, nil];
             

-    m_peer = new wxWidgetIPhoneImpl( this, v );
+    SetPeer(new wxWidgetIPhoneImpl( this, v ));

 
     MacPostControlCreate(pos, size) ;
 #endif
 
     MacPostControlCreate(pos, size) ;
 #endif


@@ -415,7 +412,7 @@ bool wxGLCanvas::SwapBuffers()
     WXGLContext context = WXGLGetCurrentContext();
     wxCHECK_MSG(context, false, wxT("should have current context"));
 
     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;
 }
     [v swapBuffers];
     return true;
 }