fix the definition of many static functions marked as 'const' or functions which...

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

diff --git a/src/common/glcmn.cpp b/src/common/glcmn.cpp
index 6b68538dc4204253227e84124b630b5760e463d8..4f5f9c60253197d53e5a0a7efbc1c18a764d8d05 100644 (file)
--- a/src/common/glcmn.cpp
+++ b/src/common/glcmn.cpp
@@ -59,7 +59,7 @@ bool wxGLCanvasBase::SetCurrent(const wxGLContext& context) const
     // 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") );
 
     // 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") );
 

-    return context.SetCurrent(*wx_static_cast(const wxGLCanvas *, this));
+    return context.SetCurrent(*static_cast<const wxGLCanvas *>(this));

 }
 
 bool wxGLCanvasBase::SetColour(const wxString& colour)
 }
 
 bool wxGLCanvasBase::SetColour(const wxString& colour)


@@ -118,6 +118,9 @@ void wxGLCanvasBase::OnSize(wxSizeEvent& WXUNUSED(event))
 /* static */
 bool wxGLCanvasBase::IsExtensionInList(const char *list, const char *extension)
 {
 /* 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
     for ( const char *p = list; *p; p++ )
     {
         // advance up to the next possible match