From ebfa01338b4e86f8767319a83e94a23ec3706a28 Mon Sep 17 00:00:00 2001 From: Francesco Montorsi Date: Sun, 14 Dec 2008 14:03:48 +0000 Subject: [PATCH] fix note about OpenGL-enabling git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57329 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- interface/wx/glcanvas.h | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/interface/wx/glcanvas.h b/interface/wx/glcanvas.h index 9f0ab531f0..a1cba0957a 100644 --- a/interface/wx/glcanvas.h +++ b/interface/wx/glcanvas.h @@ -154,7 +154,7 @@ enum context to the canvas, and then finally call SwapBuffers() to swap the buffers of the OpenGL canvas and thus show your current output. - Notice that previous versions of wxWidgets used to implicitly create a + Notice that versions of wxWidgets previous to 2.9 used to implicitly create a wxGLContext inside wxGLCanvas itself. This is still supported in the current version but is deprecated now and will be removed in the future, please update your code to create the rendering contexts explicitly. @@ -164,11 +164,14 @@ enum the correct values of the @e attribList parameter. The values that should be set up and their meanings will be described below. - @note OpenGL is not enabled by default. To switch it on, you need to edit - setup.h under Windows and set @c wxUSE_GLCANVAS to 1 (you may also - need to have to add @c opengl32.lib and @c glu32.lib to the list of - libraries your program is linked with). On Unix, pass - @c --with-opengl to configure. + @note + On those platforms which use a configure script (e.g. Linux and Mac OS) + OpenGL support is automatically enabled if the relative headers and + libraries are found. + To switch it on under the other platforms (e.g. Windows), you need to edit + the @c setup.h file and set @c wxUSE_GLCANVAS to @c 1 and then also pass + @c USE_OPENGL=1 to the make utility. You may also need to add @c opengl32.lib + and @c glu32.lib to the list of the libraries your program is linked with. @library{wxgl} @category{gl} -- 2.45.2