Resolve ambiguity between GetClientXXX() methods in wxOSX wxComboBox.

[wxWidgets.git] / interface / wx / glcanvas.h

diff --git a/interface/wx/glcanvas.h b/interface/wx/glcanvas.h
index aee4e0410e6b552b01c37cc8e677d42d694fd87f..49a38c958e6fbf110b96c892e9e4885b2bd0f4f0 100644 (file)
--- a/interface/wx/glcanvas.h
+++ b/interface/wx/glcanvas.h
@@ -3,7 +3,7 @@
 // Purpose:     interface of wxGLContext and wxGLCanvas
 // Author:      wxWidgets team
 // RCS-ID:      $Id$
 // Purpose:     interface of wxGLContext and wxGLCanvas
 // Author:      wxWidgets team
 // RCS-ID:      $Id$

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /**
 /////////////////////////////////////////////////////////////////////////////
 
 /**


@@ -32,6 +32,9 @@
     best to check your native platform's glcanvas header (on windows
     include/wx/msw/glcanvas.h) to see what features your native platform
     provides.
     best to check your native platform's glcanvas header (on windows
     include/wx/msw/glcanvas.h) to see what features your native platform
     provides.

+    
+    wxHAS_OPENGL_ES is defined on platforms that only have this implementation
+    available (eg the iPhone) und don't support the full specification.

 
     @library{wxgl}
     @category{gl}
 
     @library{wxgl}
     @category{gl}


@@ -134,7 +137,7 @@ enum
     /// 1 for multisampling support (antialiasing)
     WX_GL_SAMPLE_BUFFERS,
 
     /// 1 for multisampling support (antialiasing)
     WX_GL_SAMPLE_BUFFERS,
 

-    /// 4 for 2x2 antialising supersampling on most graphics cards
+    /// 4 for 2x2 antialiasing supersampling on most graphics cards

     WX_GL_SAMPLES
 
 };
     WX_GL_SAMPLES
 
 };


@@ -212,7 +215,7 @@ public:
             constants. If a constant should be followed by a value, put it in
             the next array position. For example, WX_GL_DEPTH_SIZE should be
             followed by the value that indicates the number of bits for the
             constants. If a constant should be followed by a value, put it in
             the next array position. For example, WX_GL_DEPTH_SIZE should be
             followed by the value that indicates the number of bits for the

-            depth buffer, e.g:
+            depth buffer, e.g.:

             @code
             attribList[n++] = WX_GL_DEPTH_SIZE;
             attribList[n++] = 32;
             @code
             attribList[n++] = WX_GL_DEPTH_SIZE;
             attribList[n++] = 32;


@@ -243,7 +246,7 @@ public:
 
         @return @true if attributes are supported.
     */
 
         @return @true if attributes are supported.
     */

-    static bool IsDisplaySupported(const int* attribList = NULL);
+    static bool IsDisplaySupported(const int* attribList);

 
     /**
         Returns true if the extension with given name is supported
 
     /**
         Returns true if the extension with given name is supported