Always use XPMs in this sample

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

diff --git a/src/mac/carbon/glcanvas.cpp b/src/mac/carbon/glcanvas.cpp
index aca2b5be13ec45b924385f45939a9cbe27a7691d..e208531ff41307375decf7fa64b0e0e0c56e7094 100644 (file)
--- a/src/mac/carbon/glcanvas.cpp
+++ b/src/mac/carbon/glcanvas.cpp
@@ -33,6 +33,10 @@
 #include "wx/glcanvas.h"
 #include "wx/mac/uma.h"
 
 #include "wx/glcanvas.h"
 #include "wx/mac/uma.h"
 

+// DLL options compatibility check:
+#include "wx/build.h"
+WX_CHECK_BUILD_OPTIONS("wxGL")
+

 /*
 * GLContext implementation
 */
 /*
 * GLContext implementation
 */


@@ -91,17 +95,14 @@ void wxGLContext::Update()
     }
 }
 
     }
 }
 

-void wxGLContext::SetColour(const char *colour)
+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);
     }
 }
         glColor3f( r, g, b);
     }
 }


@@ -309,7 +310,7 @@ void wxGLCanvas::SetCurrent()
     }
 }
 
     }
 }
 

-void wxGLCanvas::SetColour(const char *colour)
+void wxGLCanvas::SetColour(const wxChar *colour)

 {
     if (m_glContext)
         m_glContext->SetColour(colour);
 {
     if (m_glContext)
         m_glContext->SetColour(colour);