implement wxEventLoop::DispatchTimeout() for wxGTK (thanks Paul) and rewrote it to...

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

diff --git a/src/osx/cocoa/glcanvas.mm b/src/osx/cocoa/glcanvas.mm
index b00ff4a23507c805013b19f026a92426bc525350..0952fc18f3477cd9de4d72aeaa9b9615143b34a6 100644 (file)
--- a/src/osx/cocoa/glcanvas.mm
+++ b/src/osx/cocoa/glcanvas.mm
@@ -77,6 +77,10 @@ WXGLPixelFormat WXGLChoosePixelFormat(const int *attribList)
     const NSOpenGLPixelFormatAttribute defaultAttribs[] =
     {
         NSOpenGLPFADoubleBuffer,
+        NSOpenGLPFAMinimumPolicy,
+        NSOpenGLPFAColorSize,8,
+        NSOpenGLPFAAlphaSize,0,
+        NSOpenGLPFADepthSize,8,
         (NSOpenGLPixelFormatAttribute)nil
     };
 
@@ -217,6 +221,7 @@ bool wxGLContext::SetCurrent(const wxGLCanvas& win) const
         return false;  
 
     [m_glContext setView: win.GetHandle() ];
+    [m_glContext update];
     
     [m_glContext makeCurrentContext];
     
@@ -280,23 +285,27 @@ bool wxGLCanvas::Create(wxWindow *parent,
     if ( !m_glFormat )
         return false;
 
-    m_macIsUserPane = false ;
+   // m_macIsUserPane = false ;
 
     if ( !wxWindow::Create(parent, id, pos, size, style, name) )
         return false;
 
-
-    NSView* sv = (parent->GetHandle() );
-    
+/*
     NSRect r = wxOSXGetFrameForControl( this, pos , size ) ;
     wxNSCustomOpenGLView* v = [[wxNSCustomOpenGLView alloc] initWithFrame:r];
-    [sv addSubview:v];
     m_peer = new wxWidgetCocoaImpl( this, v );
     [v setImplementation:m_peer];
 
     MacPostControlCreate(pos, size) ;
-
+*/
     return true;
 }
 
+wxGLCanvas::~wxGLCanvas()
+{
+    if ( m_glFormat )
+        WXGLDestroyPixelFormat(m_glFormat);
+}
+
+
 #endif // wxUSE_GLCANVAS