bracketing opengl code that doesn't work on OpenGL ES

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

diff --git a/include/wx/glcanvas.h b/include/wx/glcanvas.h
index 4722a99a9483ae9b6b3effd7288e4b719c576865..8b82b78c3a5f8d4f4822997172629d2edc3eb9d4 100644 (file)
--- a/include/wx/glcanvas.h
+++ b/include/wx/glcanvas.h
@@ -118,10 +118,11 @@ public:
     // miscellaneous helper functions
     // ------------------------------
 
+#ifndef wxHAS_OPENGL_ES 
     // call glcolor() for the colour with the given name, return false if
     // colour not found
     bool SetColour(const wxString& colour);
-
+#endif
 
     // return true if the extension with given name is supported
     //

diff --git a/src/common/glcmn.cpp b/src/common/glcmn.cpp
index 4f5f9c60253197d53e5a0a7efbc1c18a764d8d05..ff3aa286018eae093fbdf27b2c2ac62cb66b6ee9 100644 (file)
--- a/src/common/glcmn.cpp
+++ b/src/common/glcmn.cpp
@@ -62,6 +62,7 @@ bool wxGLCanvasBase::SetCurrent(const wxGLContext& context) const
     return context.SetCurrent(*static_cast<const wxGLCanvas *>(this));
 }
 
+#ifndef wxHAS_OPENGL_ES 
 bool wxGLCanvasBase::SetColour(const wxString& colour)
 {
     wxColour col = wxTheColourDatabase->Find(colour);
@@ -88,6 +89,7 @@ bool wxGLCanvasBase::SetColour(const wxString& colour)
 
     return true;
 }
+#endif
 
 wxGLCanvasBase::~wxGLCanvasBase()
 {