Always use XPMs in this sample

[wxWidgets.git] / src / mac / glcanvas.cpp

diff --git a/src/mac/glcanvas.cpp b/src/mac/glcanvas.cpp
index 44215b6b75824b9678a9a68717f3131d14498dea..e208531ff41307375decf7fa64b0e0e0c56e7094 100644 (file)
--- a/src/mac/glcanvas.cpp
+++ b/src/mac/glcanvas.cpp
@@ -97,15 +97,12 @@ void wxGLContext::Update()
 
 void wxGLContext::SetColour(const wxChar *colour)
 {
-    float r = 0.0;
-    float g = 0.0;
-    float b = 0.0;
-    wxColour *col = wxTheColourDatabase->FindColour(colour);
-    if (col)
+    wxColour col = wxTheColourDatabase->Find(colour);
+    if (col.Ok())
     {
-        r = (float)(col->Red()/256.0);
-        g = (float)(col->Green()/256.0);
-        b = (float)(col->Blue()/256.0);
+        float r = (float)(col.Red()/256.0);
+        float g = (float)(col.Green()/256.0);
+        float b = (float)(col.Blue()/256.0);
         glColor3f( r, g, b);
     }
 }