Merged GSOC Ribbon work from SOC2009_RIBBON branch into trunk.

[wxWidgets.git] / include / wx / osx / glcanvas.h

diff --git a/include/wx/osx/glcanvas.h b/include/wx/osx/glcanvas.h
index 9f2d2ca9ff21bf3238102bc351a28643381b45c4..ff97bdf0eff8576305b445ec284286fd6da94cfd 100644 (file)
--- a/include/wx/osx/glcanvas.h
+++ b/include/wx/osx/glcanvas.h
@@ -12,14 +12,23 @@
 #ifndef _WX_GLCANVAS_H_
 #define _WX_GLCANVAS_H_
 
+#ifdef __WXOSX_IPHONE__
+#import <OpenGLES/ES1/gl.h>
+#import <OpenGLES/ES1/glext.h>
+#define wxUSE_OPENGL_EMULATION 1
+#else
 #include <OpenGL/gl.h>
+#endif
+
+#include "wx/vector.h"
 
 // low level calls
 
 WXDLLIMPEXP_GL WXGLContext WXGLCreateContext( WXGLPixelFormat pixelFormat, WXGLContext shareContext );
 WXDLLIMPEXP_GL void WXGLDestroyContext( WXGLContext context );
+
 WXDLLIMPEXP_GL WXGLContext WXGLGetCurrentContext();
-WXDLLIMPEXP_GL void WXGLSwapBuffers( WXGLContext context );
+WXDLLIMPEXP_GL bool WXGLSetCurrentContext(WXGLContext context);
 
 WXDLLIMPEXP_GL WXGLPixelFormat WXGLChoosePixelFormat(const int *attribList);
 WXDLLIMPEXP_GL void WXGLDestroyPixelFormat( WXGLPixelFormat pixelFormat );
@@ -34,7 +43,7 @@ public:
 
     // Mac-specific
     WXGLContext GetWXGLContext() const { return m_glContext; }
-    
+
 private:
     WXGLContext m_glContext;
 
@@ -133,7 +142,7 @@ public:
     virtual void MacVisibilityChanged();
 
     void MacUpdateView();
-    
+
     GLint GetAglBufferName() const { return m_bufferName; }
 #endif