reset the tooltip text before changing it, this apparently prevents a spurious redraw...

[wxWidgets.git] / src / osx / glcanvas_osx.cpp

diff --git a/src/osx/glcanvas_osx.cpp b/src/osx/glcanvas_osx.cpp
index 5811ff545d442d3304b616e8116e5fa5d309b6f9..5d2c0cd9ed1c2766b838c540553dbd00326cf187 100644 (file)
--- a/src/osx/glcanvas_osx.cpp
+++ b/src/osx/glcanvas_osx.cpp
@@ -60,7 +60,9 @@ wxGLContext::~wxGLContext()
 IMPLEMENT_CLASS(wxGLCanvas, wxWindow)
 
 BEGIN_EVENT_TABLE(wxGLCanvas, wxWindow)
 IMPLEMENT_CLASS(wxGLCanvas, wxWindow)
 
 BEGIN_EVENT_TABLE(wxGLCanvas, wxWindow)

+#if wxOSX_USE_CARBON

     EVT_SIZE(wxGLCanvas::OnSize)
     EVT_SIZE(wxGLCanvas::OnSize)

+#endif

 END_EVENT_TABLE()
 
 wxGLCanvas::wxGLCanvas(wxWindow *parent,
 END_EVENT_TABLE()
 
 wxGLCanvas::wxGLCanvas(wxWindow *parent,


@@ -165,7 +167,7 @@ bool wxGLCanvasBase::IsExtensionSupported(const char *extension)
     WXGLDestroyPixelFormat(fmt);
     WXGLDestroyContext(ctx);
 
     WXGLDestroyPixelFormat(fmt);
     WXGLDestroyContext(ctx);
 

-    return IsExtensionInList(extensions, extension);
+    return IsExtensionInList(extensions.ToAscii(), extension);

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------