reSWIGged

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

diff --git a/src/x11/colour.cpp b/src/x11/colour.cpp
index fa4909495c5da6c83296a4fe6bc034ef8e51db9f..95b0c786e700590e38a71176a6297274618ffc45 100644 (file)
--- a/src/x11/colour.cpp
+++ b/src/x11/colour.cpp
@@ -10,7 +10,7 @@
 /////////////////////////////////////////////////////////////////////////////
 
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "colour.h"
 #endif
 
@@ -93,8 +93,8 @@ void wxColourRefData::FreeColour()
     if (!m_colormap)
         return;
 #if !wxUSE_NANOX        
-    if ((wxTheApp->m_visualType == GrayScale) ||
-        (wxTheApp->m_visualType == PseudoColor))
+    if ((wxTheApp->m_visualInfo->m_visualType == GrayScale) ||
+        (wxTheApp->m_visualInfo->m_visualType == PseudoColor))
     {
         int idx = m_color.pixel;
         colMapAllocCounter[ idx ] = colMapAllocCounter[ idx ] - 1;
@@ -116,8 +116,8 @@ void wxColourRefData::AllocColour( WXColormap cmap )
     FreeColour();
 
 #if !wxUSE_NANOX
-    if ((wxTheApp->m_visualType == GrayScale) ||
-        (wxTheApp->m_visualType == PseudoColor))
+    if ((wxTheApp->m_visualInfo->m_visualType == GrayScale) ||
+        (wxTheApp->m_visualInfo->m_visualType == PseudoColor))
     {
         m_hasPixel = XAllocColor( wxGlobalDisplay(), (Colormap) cmap, &m_color );
         int idx = m_color.pixel;
@@ -155,35 +155,46 @@ wxColour::wxColour( unsigned char red, unsigned char green, unsigned char blue )
     M_COLDATA->m_color.pixel = 0;
 }
 
-void wxColour::InitFromName( const wxString &colourName )
+/* static */
+wxColour wxColour::CreateByName(const wxString& name)
 {
-    wxNode *node = (wxNode *) NULL;
-    if ( (wxTheColourDatabase) && (node = wxTheColourDatabase->Find(colourName)) )
+    wxColour col;
+
+    Display *dpy = wxGlobalDisplay();
+    WXColormap colormap = wxTheApp->GetMainColormap( dpy );
+    XColor xcol;
+    if ( XParseColor( dpy, (Colormap)colormap, name.mb_str(), &xcol ) )
     {
-        wxColour *col = (wxColour*)node->GetData();
-        UnRef();
-        if (col) Ref( *col );
+        wxColourRefData *refData = new wxColourRefData;
+        refData->m_colormap = colormap;
+        refData->m_color = xcol;
+        col.m_refData = refData;
     }
-    else
+
+    return col;
+}
+
+void wxColour::InitFromName( const wxString &colourName )
+{
+    // check the cache first
+    wxColour col;
+    if ( wxTheColourDatabase )
     {
-        m_refData = new wxColourRefData();
-        
-        M_COLDATA->m_colormap = wxTheApp->GetMainColormap( wxGlobalDisplay() );
-        
-        if (!XParseColor( wxGlobalDisplay(), (Colormap) M_COLDATA->m_colormap, colourName.mb_str(), &M_COLDATA->m_color ))
-        {
-            // VZ: asserts are good in general but this one is triggered by
-            //     calling wxColourDatabase::FindColour() with an
-            //     unrecognized colour name and this can't be avoided from the
-            //     user code, so don't give it here
-            //
-            //     a better solution would be to changed code in FindColour()
+        col = wxTheColourDatabase->Find(colourName);
+    }
 
-            //wxFAIL_MSG( wxT("wxColour: couldn't find colour") );
+    if ( !col.Ok() )
+    {
+        col = CreateByName(colourName);
+    }
 
-            delete m_refData;
-            m_refData = (wxObjectRefData *) NULL;
-        }
+    if ( col.Ok() )
+    {
+        *this = col;
+    }
+    else
+    {
+        wxFAIL_MSG( wxT("wxColour: couldn't find colour") );
     }
 }