Updated Makefiles for all but Motif; there is either a lock or a CVS problem.

[wxWidgets.git] / src / mac / glcanvas.cpp

diff --git a/src/mac/glcanvas.cpp b/src/mac/glcanvas.cpp
index ae60210ef3466d9f79ab9b4f088fbb39d568e429..16e47d4c79ad0685a24ecca6adb156e8360775da 100644 (file)
--- a/src/mac/glcanvas.cpp
+++ b/src/mac/glcanvas.cpp
@@ -45,7 +45,7 @@ wxGLContext::wxGLContext(
 {
     m_window = win;
 
 {
     m_window = win;
 

-    m_drawable = (AGLDrawable) UMAGetWindowPort(win->MacGetRootWindow());
+    m_drawable = (AGLDrawable) UMAGetWindowPort(MAC_WXHWND(win->MacGetRootWindow()));

 
     m_glContext = aglCreateContext(fmt, other ? other->m_glContext : NULL);
     wxCHECK_RET( m_glContext, wxT("Couldn't create OpenGl context") );
 
     m_glContext = aglCreateContext(fmt, other ? other->m_glContext : NULL);
     wxCHECK_RET( m_glContext, wxT("Couldn't create OpenGl context") );


@@ -141,8 +141,10 @@ wxGLCanvas::wxGLCanvas( wxWindow *parent, const wxGLCanvas *shared, wxWindowID i
 
 wxGLCanvas::~wxGLCanvas()
 {
 
 wxGLCanvas::~wxGLCanvas()
 {

-  if (m_glContext)
-    delete m_glContext;
+    if (m_glContext != NULL) {
+        delete m_glContext;
+        m_glContext = NULL;
+    }

 }
 
 static AGLPixelFormat ChoosePixelFormat(const int *attribList)
 }
 
 static AGLPixelFormat ChoosePixelFormat(const int *attribList)


@@ -251,7 +253,7 @@ void wxGLCanvas::SetViewport()
     int width, height;
     GetClientSize(& width, & height);
     Rect bounds ;
     int width, height;
     GetClientSize(& width, & height);
     Rect bounds ;

-    GetWindowPortBounds( MacGetRootWindow() , &bounds ) ;
+    GetWindowPortBounds( MAC_WXHWND(MacGetRootWindow()) , &bounds ) ;

     GLint parms[4] ;
     parms[0] = x ;
     parms[1] = bounds.bottom - bounds.top - ( y + height ) ;
     GLint parms[4] ;
     parms[0] = x ;
     parms[1] = bounds.bottom - bounds.top - ( y + height ) ;