update mac gl, after rev 50900

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50912 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/mac/carbon/glcanvas.h b/include/wx/mac/carbon/glcanvas.h
index 4daedf6dc6dbf91cca70f6de08ddb242b45ac68e..79069995d10b492fe3c48d340fbc88426dc169ff 100644 (file)
--- a/include/wx/mac/carbon/glcanvas.h
+++ b/include/wx/mac/carbon/glcanvas.h
@@ -26,7 +26,7 @@ public:
     wxGLContext(wxGLCanvas *win, const wxGLContext *other = NULL);
     virtual ~wxGLContext();
 
     wxGLContext(wxGLCanvas *win, const wxGLContext *other = NULL);
     virtual ~wxGLContext();
 

-    virtual void SetCurrent(const wxGLCanvas& win) const;
+    virtual bool SetCurrent(const wxGLCanvas& win) const;

 
     // Mac-specific
     AGLContext GetAGLContext() const { return m_aglContext; }
 
     // Mac-specific
     AGLContext GetAGLContext() const { return m_aglContext; }


@@ -61,7 +61,7 @@ public:
     virtual ~wxGLCanvas();
 
     // implement wxGLCanvasBase methods
     virtual ~wxGLCanvas();
 
     // implement wxGLCanvasBase methods

-    virtual void SwapBuffers();
+    virtual bool SwapBuffers();

 
 
     // Mac-specific functions
 
 
     // Mac-specific functions

diff --git a/src/mac/carbon/glcanvas.cpp b/src/mac/carbon/glcanvas.cpp
index a65fbe680ac96cca4d6b83654ffcd9ff1de82d1a..b3a2a81245e557c7ebc9dac55e05e17db71ae795 100644 (file)
--- a/src/mac/carbon/glcanvas.cpp
+++ b/src/mac/carbon/glcanvas.cpp
@@ -75,20 +75,27 @@ wxGLContext::~wxGLContext()
     }
 }
 
     }
 }
 

-void wxGLContext::SetCurrent(const wxGLCanvas& win) const
+bool wxGLContext::SetCurrent(const wxGLCanvas& win) const

 {
     if ( !m_aglContext )
 {
     if ( !m_aglContext )

-        return;
+        return false;

 
     AGLDrawable drawable = (AGLDrawable)GetWindowPort(
                                 MAC_WXHWND(win.MacGetTopLevelWindowRef()));
     if ( !aglSetDrawable(m_aglContext, drawable) )
 
     AGLDrawable drawable = (AGLDrawable)GetWindowPort(
                                 MAC_WXHWND(win.MacGetTopLevelWindowRef()));
     if ( !aglSetDrawable(m_aglContext, drawable) )

+    {

         wxLogAGLError("aglSetDrawable");
         wxLogAGLError("aglSetDrawable");

+        return false;
+    }

 
     if ( !aglSetCurrentContext(m_aglContext) )
 
     if ( !aglSetCurrentContext(m_aglContext) )

+    {

         wxLogAGLError("aglSetCurrentContext");
         wxLogAGLError("aglSetCurrentContext");

+        return false;
+    }

 
     wx_const_cast(wxGLCanvas&, win).SetViewport();
 
     wx_const_cast(wxGLCanvas&, win).SetViewport();

+    return true;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -305,12 +312,13 @@ wxGLCanvas::~wxGLCanvas()
         aglDestroyPixelFormat(m_aglFormat);
 }
 
         aglDestroyPixelFormat(m_aglFormat);
 }
 

-void wxGLCanvas::SwapBuffers()
+bool wxGLCanvas::SwapBuffers()

 {
     AGLContext context = aglGetCurrentContext();
 {
     AGLContext context = aglGetCurrentContext();

-    wxCHECK_RET( context, _T("should have current context") );
+    wxCHECK_MSG(context, false, _T("should have current context"));

 
     aglSwapBuffers(context);
 
     aglSwapBuffers(context);

+    return true;

 }
 
 void wxGLCanvas::SetViewport()
 }
 
 void wxGLCanvas::SetViewport()