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
This commit is contained in:
@@ -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
|
||||
//
|
||||
|
@@ -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()
|
||||
{
|
||||
|
Reference in New Issue
Block a user