don't give error messages if ws2_32.dll is not available in wxGetHostName()

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

diff --git a/src/x11/glcanvas.cpp b/src/x11/glcanvas.cpp
index 5b619202a0d358ee33158654e7b21c27e7f013d1..0059ab89cf9b459ac510fc17d6c1f947c574515e 100644 (file)
--- a/src/x11/glcanvas.cpp
+++ b/src/x11/glcanvas.cpp
@@ -138,28 +138,32 @@ void wxGLContext::SetCurrent()
 
 void wxGLContext::SetColour(const wxChar *colour)
 {
 
 void wxGLContext::SetColour(const wxChar *colour)
 {

-    wxColour *the_colour = wxTheColourDatabase->FindColour(colour);
-    if(the_colour) {
-       GLboolean b;
-       glGetBooleanv(GL_RGBA_MODE, &b);
-       if(b) {
-           glColor3ub(the_colour->Red(),
-                      the_colour->Green(),
-                      the_colour->Blue());
-       } else {
+    wxColour the_colour = wxTheColourDatabase->Find(colour);
+    if(the_colour.Ok())
+    {
+        GLboolean b;
+        glGetBooleanv(GL_RGBA_MODE, &b);
+        if(b)
+        {
+            glColor3ub(the_colour.Red(),
+                    the_colour.Green(),
+                    the_colour.Blue());
+        }
+        else
+        {

 #ifdef __WXMOTIF__
 #ifdef __WXMOTIF__

-            the_colour->AllocColour(m_window->GetXDisplay());
+            the_colour.AllocColour(m_window->GetXDisplay());

 #else
 #else

-            the_colour->CalcPixel(wxTheApp->GetMainColormap(wxGetDisplay()));
+            the_colour.CalcPixel(wxTheApp->GetMainColormap(wxGetDisplay()));

 #endif
 #endif

-           GLint pix = (GLint)the_colour->GetPixel();
-           if(pix == -1)
+            GLint pix = (GLint)the_colour.GetPixel();
+            if(pix == -1)

             {
                 wxLogError(wxT("wxGLCanvas: cannot allocate color\n"));
             {
                 wxLogError(wxT("wxGLCanvas: cannot allocate color\n"));

-               return;
+                return;

             }
             }

-           glIndexi(pix);
-       }
+            glIndexi(pix);
+        }

     }
 }
 
     }
 }