document disabled bitmap parameter of AddTool()

[wxWidgets.git] / docs / latex / wx / glcanvas.tex

diff --git a/docs/latex/wx/glcanvas.tex b/docs/latex/wx/glcanvas.tex
index 600da61d06f685d79813de8a62f6be0810232c92..8c5b4d66e147e337ecf9077f39f3544f8ce38dce 100644 (file)
--- a/docs/latex/wx/glcanvas.tex
+++ b/docs/latex/wx/glcanvas.tex
@@ -57,6 +57,10 @@ alpha channel, and accum buffer. Other implementations may support them.
 \twocolitem{\windowstyle{WX\_GL\_MIN\_ACCUM\_ALPHA}}{Use blue buffer with most bits (> MIN\_ACCUM\_ALPHA bits)}
 \end{twocollist}
 
 \twocolitem{\windowstyle{WX\_GL\_MIN\_ACCUM\_ALPHA}}{Use blue buffer with most bits (> MIN\_ACCUM\_ALPHA bits)}
 \end{twocollist}
 

+\wxheading{See also}
+
+\helpref{wxGLContext}{wxglcontext}
+

 \latexignore{\rtfignore{\wxheading{Members}}}
 
 \membersection{wxGLCanvas::wxGLCanvas}\label{wxglcanvasconstr}
 \latexignore{\rtfignore{\wxheading{Members}}}
 
 \membersection{wxGLCanvas::wxGLCanvas}\label{wxglcanvasconstr}


@@ -77,12 +81,14 @@ Constructor.
 
 \docparam{parent}{Pointer to a parent window.}
 
 
 \docparam{parent}{Pointer to a parent window.}
 

+\docparam{sharedcontext}{Context to share object resources with.}
+

 \docparam{id}{Window identifier. If -1, will automatically create an identifier.}
 
 \docparam{id}{Window identifier. If -1, will automatically create an identifier.}
 

-\docparam{pos}{Window position. wxDefaultPosition is (-1, -1) which indicates that wxWindows
+\docparam{pos}{Window position. wxDefaultPosition is (-1, -1) which indicates that wxWidgets

 should generate a default position for the window.}
 
 should generate a default position for the window.}
 

-\docparam{size}{Window size. wxDefaultSize is (-1, -1) which indicates that wxWindows should
+\docparam{size}{Window size. wxDefaultSize is (-1, -1) which indicates that wxWidgets should

 generate a default size for the window. If no suitable size can be found, the window will be sized to 20x20 pixels so that the window is visible but obviously not correctly sized.}
 
 \docparam{style}{Window style.}
 generate a default size for the window. If no suitable size can be found, the window will be sized to 20x20 pixels so that the window is visible but obviously not correctly sized.}
 
 \docparam{style}{Window style.}


@@ -104,12 +110,18 @@ and so on.
 \docparam{palette}{If the window has the palette, it should by pass this value.
 Note: palette and WX\_GL\_RGBA are mutually exclusive.}
 
 \docparam{palette}{If the window has the palette, it should by pass this value.
 Note: palette and WX\_GL\_RGBA are mutually exclusive.}
 

+\membersection{wxGLCanvas::GetContext}\label{wxglcanvasgetcontext}
+
+\func{wxGLContext*}{GetContext}{\void}
+
+Obtains the context that is associated with this canvas.
+

 \membersection{wxGLCanvas::SetCurrent}\label{wxglcanvassetcurrent}
 
 \func{void}{SetCurrent}{\void}
 
 Sets this canvas as the current recipient of OpenGL calls.
 \membersection{wxGLCanvas::SetCurrent}\label{wxglcanvassetcurrent}
 
 \func{void}{SetCurrent}{\void}
 
 Sets this canvas as the current recipient of OpenGL calls.

-Each canvas contain an OpenGL device context that has been created during
+Each canvas contains an OpenGL device context that has been created during

 the creation of this window. So this call sets the current device context
 as the target device context for OpenGL operations.
 
 the creation of this window. So this call sets the current device context
 as the target device context for OpenGL operations.
 


@@ -117,7 +129,7 @@ as the target device context for OpenGL operations.
 
 \func{void}{SetColour}{\param{const char*}{ colour}}
 
 
 \func{void}{SetColour}{\param{const char*}{ colour}}
 

-Sets the current colour for this window, using the wxWindows colour database to find a named colour.
+Sets the current colour for this window, using the wxWidgets colour database to find a named colour.

 
 \membersection{wxGLCanvas::SwapBuffers}\label{wxglcanvasswapbuffers}
 
 
 \membersection{wxGLCanvas::SwapBuffers}\label{wxglcanvasswapbuffers}