Set brush origin for hatch brushes too.

[wxWidgets.git] / src / common / glcmn.cpp

diff --git a/src/common/glcmn.cpp b/src/common/glcmn.cpp
index b3e1f5750257a95473011e84655ca0acd8edc65b..e7dc25865cf6ca00664d53daf8b6b2219853eacc 100644 (file)
--- a/src/common/glcmn.cpp
+++ b/src/common/glcmn.cpp
@@ -57,11 +57,12 @@ bool wxGLCanvasBase::SetCurrent(const wxGLContext& context) const
     // although on MSW it works even if the window is still hidden, it doesn't
     // work in other ports (notably X11-based ones) and documentation mentions
     // that SetCurrent() can only be called for a shown window, so check for it
-    wxASSERT_MSG( IsShownOnScreen(), _T("can't make hidden GL canvas current") );
+    wxASSERT_MSG( IsShownOnScreen(), wxT("can't make hidden GL canvas current") );
 
     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()
 {
@@ -118,6 +120,9 @@ void wxGLCanvasBase::OnSize(wxSizeEvent& WXUNUSED(event))
 /* static */
 bool wxGLCanvasBase::IsExtensionInList(const char *list, const char *extension)
 {
+    if ( !list )
+        return false;
+
     for ( const char *p = list; *p; p++ )
     {
         // advance up to the next possible match