The reinit of the stock objects shoudl not happen when wxPython is

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

diff --git a/src/x11/colour.cpp b/src/x11/colour.cpp
index 28bb7c7ddab94244c2cc53718eeeeee673b11c2c..b334a9b931d4e41aa879903634a204052b3d4163 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
 
 #pragma implementation "colour.h"
 #endif
 


@@ -33,7 +33,7 @@ public:
         m_color.blue = 0;
         m_color.pixel = 0;
         m_colormap = (WXColormap *) NULL;
         m_color.blue = 0;
         m_color.pixel = 0;
         m_colormap = (WXColormap *) NULL;

-        m_hasPixel = FALSE;
+        m_hasPixel = false;

     }
     wxColourRefData(const wxColourRefData& data):
         wxObjectRefData()
     }
     wxColourRefData(const wxColourRefData& data):
         wxObjectRefData()


@@ -42,7 +42,7 @@ public:
         m_colormap = data.m_colormap;
         m_hasPixel = data.m_hasPixel;
     }
         m_colormap = data.m_colormap;
         m_hasPixel = data.m_hasPixel;
     }

-    
+

     ~wxColourRefData()
     {
         FreeColour();
     ~wxColourRefData()
     {
         FreeColour();


@@ -57,7 +57,7 @@ public:
                 m_color.blue == data.m_color.blue &&
                 m_color.pixel == data.m_color.pixel);
     }
                 m_color.blue == data.m_color.blue &&
                 m_color.pixel == data.m_color.pixel);
     }

-    
+

     void FreeColour();
     void AllocColour( WXColormap cmap );
 
     void FreeColour();
     void AllocColour( WXColormap cmap );
 


@@ -71,8 +71,8 @@ public:
     static unsigned short colMapAllocCounter[ 256 ];
 };
 
     static unsigned short colMapAllocCounter[ 256 ];
 };
 

-unsigned short wxColourRefData::colMapAllocCounter[ 256 ] = 
-{  
+unsigned short wxColourRefData::colMapAllocCounter[ 256 ] =
+{

   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,


@@ -92,13 +92,13 @@ void wxColourRefData::FreeColour()
 {
     if (!m_colormap)
         return;
 {
     if (!m_colormap)
         return;

-#if !wxUSE_NANOX        
+#if !wxUSE_NANOX

     if ((wxTheApp->m_visualInfo->m_visualType == GrayScale) ||
         (wxTheApp->m_visualInfo->m_visualType == PseudoColor))
     {
         int idx = m_color.pixel;
         colMapAllocCounter[ idx ] = colMapAllocCounter[ idx ] - 1;
     if ((wxTheApp->m_visualInfo->m_visualType == GrayScale) ||
         (wxTheApp->m_visualInfo->m_visualType == PseudoColor))
     {
         int idx = m_color.pixel;
         colMapAllocCounter[ idx ] = colMapAllocCounter[ idx ] - 1;

-        
+

         if (colMapAllocCounter[ idx ] == 0)
         {
             unsigned long pixel = m_color.pixel;
         if (colMapAllocCounter[ idx ] == 0)
         {
             unsigned long pixel = m_color.pixel;


@@ -128,7 +128,7 @@ void wxColourRefData::AllocColour( WXColormap cmap )
     {
         m_hasPixel = XAllocColor( wxGlobalDisplay(), (Colormap) cmap, &m_color );
     }
     {
         m_hasPixel = XAllocColor( wxGlobalDisplay(), (Colormap) cmap, &m_color );
     }

-    
+

     m_colormap = cmap;
 }
 
     m_colormap = cmap;
 }
 


@@ -147,7 +147,7 @@ wxColour::wxColour( unsigned char red, unsigned char green, unsigned char blue )
     M_COLDATA->m_color.red = ((unsigned short)red) ;
     M_COLDATA->m_color.green = ((unsigned short)green) ;
     M_COLDATA->m_color.blue = ((unsigned short)blue) ;
     M_COLDATA->m_color.red = ((unsigned short)red) ;
     M_COLDATA->m_color.green = ((unsigned short)green) ;
     M_COLDATA->m_color.blue = ((unsigned short)blue) ;

-#else    
+#else

     M_COLDATA->m_color.red = ((unsigned short)red) << SHIFT;
     M_COLDATA->m_color.green = ((unsigned short)green) << SHIFT;
     M_COLDATA->m_color.blue = ((unsigned short)blue) << SHIFT;
     M_COLDATA->m_color.red = ((unsigned short)red) << SHIFT;
     M_COLDATA->m_color.green = ((unsigned short)green) << SHIFT;
     M_COLDATA->m_color.blue = ((unsigned short)blue) << SHIFT;


@@ -155,34 +155,46 @@ wxColour::wxColour( unsigned char red, unsigned char green, unsigned char blue )
     M_COLDATA->m_color.pixel = 0;
 }
 
     M_COLDATA->m_color.pixel = 0;
 }
 

-void wxColour::InitFromName( const wxString &colourName )
+/* static */
+wxColour wxColour::CreateByName(const wxString& name)

 {
 {

-    wxColour* col;
-    if ( (wxTheColourDatabase) && (col = wxTheColourDatabase->FindColourNoAdd(colourName)) )
+    wxColour col;
+
+    Display *dpy = wxGlobalDisplay();
+    WXColormap colormap = wxTheApp->GetMainColormap( dpy );
+    XColor xcol;
+    if ( XParseColor( dpy, (Colormap)colormap, name.mb_str(), &xcol ) )

     {
     {

-        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") );

     }
 }
 
     }
 }
 


@@ -192,17 +204,17 @@ wxColour::~wxColour()
 
 bool wxColour::operator == ( const wxColour& col ) const
 {
 
 bool wxColour::operator == ( const wxColour& col ) const
 {

-    if (m_refData == col.m_refData) return TRUE;
+    if (m_refData == col.m_refData) return true;

 
 

-    if (!m_refData || !col.m_refData) return FALSE;
+    if (!m_refData || !col.m_refData) return false;

 
     XColor *own = &(((wxColourRefData*)m_refData)->m_color);
     XColor *other = &(((wxColourRefData*)col.m_refData)->m_color);
 
     XColor *own = &(((wxColourRefData*)m_refData)->m_color);
     XColor *other = &(((wxColourRefData*)col.m_refData)->m_color);

-    if (own->red != other->red) return FALSE;
-    if (own->blue != other->blue) return FALSE;
-    if (own->green != other->green) return FALSE;

 
 

-    return TRUE;
+    return (own->red == other->red)
+        && (own->green == other->green)
+        && (own->blue == other->blue) ;
+

 }
 
 wxObjectRefData *wxColour::CreateRefData() const
 }
 
 wxObjectRefData *wxColour::CreateRefData() const


@@ -218,7 +230,7 @@ wxObjectRefData *wxColour::CloneRefData(const wxObjectRefData *data) const
 void wxColour::Set( unsigned char red, unsigned char green, unsigned char blue )
 {
     AllocExclusive();
 void wxColour::Set( unsigned char red, unsigned char green, unsigned char blue )
 {
     AllocExclusive();

-    
+

     m_refData = new wxColourRefData();
 #if wxUSE_NANOX
     M_COLDATA->m_color.red = ((unsigned short)red) ;
     m_refData = new wxColourRefData();
 #if wxUSE_NANOX
     M_COLDATA->m_color.red = ((unsigned short)red) ;