Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bracketing opengl code that doesn't work on OpenGL ES

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59913 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2009-03-29 17:13:27 +00:00
parent f33427816c
commit 04ce16a870
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/wx/glcanvas.h
View File

@@ -118,10 +118,11 @@ public:
// miscellaneous helper functions // miscellaneous helper functions
// ------------------------------ // ------------------------------
#ifndef wxHAS_OPENGL_ES
// call glcolor() for the colour with the given name, return false if // call glcolor() for the colour with the given name, return false if
// colour not found // colour not found
bool SetColour(const wxString& colour); bool SetColour(const wxString& colour);
#endif
// return true if the extension with given name is supported // return true if the extension with given name is supported
// //

2
src/common/glcmn.cpp
View File

@@ -62,6 +62,7 @@ bool wxGLCanvasBase::SetCurrent(const wxGLContext& context) const
return context.SetCurrent(*static_cast<const wxGLCanvas *>(this)); return context.SetCurrent(*static_cast<const wxGLCanvas *>(this));
} }
#ifndef wxHAS_OPENGL_ES
bool wxGLCanvasBase::SetColour(const wxString& colour) bool wxGLCanvasBase::SetColour(const wxString& colour)
{ {
wxColour col = wxTheColourDatabase->Find(colour); wxColour col = wxTheColourDatabase->Find(colour);
@@ -88,6 +89,7 @@ bool wxGLCanvasBase::SetColour(const wxString& colour)
return true; return true;
} }
#endif
wxGLCanvasBase::~wxGLCanvasBase() wxGLCanvasBase::~wxGLCanvasBase()
{ {