add wxUSE_MINIFRAME wrapper

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

diff --git a/src/x11/colour.cpp b/src/x11/colour.cpp
index 95b0c786e700590e38a71176a6297274618ffc45..26dfeded955864d434a1c0af8d95db4d3b44b02a 100644 (file)
--- a/src/x11/colour.cpp
+++ b/src/x11/colour.cpp
@@ -1,21 +1,23 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        colour.cpp
+// Name:        src/x11/colour.cpp

 // Purpose:     wxColour class
 // Author:      Julian Smart, Robert Roebling
 // Modified by:
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart, Robert Roebling
 // Purpose:     wxColour class
 // Author:      Julian Smart, Robert Roebling
 // Modified by:
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart, Robert Roebling

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"

 
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "colour.h"
-#endif
+#include "wx/colour.h"

 
 

-#include "wx/gdicmn.h"
-#include "wx/app.h"
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+    #include "wx/gdicmn.h"
+#endif

 
 #include "wx/x11/private.h"
 
 
 #include "wx/x11/private.h"
 


@@ -33,7 +35,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,8 +44,8 @@ public:
         m_colormap = data.m_colormap;
         m_hasPixel = data.m_hasPixel;
     }
         m_colormap = data.m_colormap;
         m_hasPixel = data.m_hasPixel;
     }

-    
-    ~wxColourRefData()
+
+    virtual ~wxColourRefData()

     {
         FreeColour();
     }
     {
         FreeColour();
     }


@@ -57,7 +59,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 +73,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 +94,14 @@ void wxColourRefData::FreeColour()
 {
     if (!m_colormap)
         return;
 {
     if (!m_colormap)
         return;

-#if !wxUSE_NANOX        
-    if ((wxTheApp->m_visualInfo->m_visualType == GrayScale) ||
-        (wxTheApp->m_visualInfo->m_visualType == PseudoColor))
+#if !wxUSE_NANOX
+    if ( wxTheApp &&
+         (wxTheApp->m_visualInfo->m_visualType == GrayScale ||
+          wxTheApp->m_visualInfo->m_visualType == PseudoColor) )

     {
         int idx = m_color.pixel;
         colMapAllocCounter[ idx ] = colMapAllocCounter[ idx ] - 1;
     {
         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 +131,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;
 }
 


@@ -140,81 +143,23 @@ void wxColourRefData::AllocColour( WXColormap cmap )
 
 IMPLEMENT_DYNAMIC_CLASS(wxColour,wxGDIObject)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxColour,wxGDIObject)
 

-wxColour::wxColour( unsigned char red, unsigned char green, unsigned char blue )
-{
-    m_refData = new wxColourRefData();
-#if wxUSE_NANOX
-    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    
-    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;
-#endif
-    M_COLDATA->m_color.pixel = 0;
-}
-
-/* static */
-wxColour wxColour::CreateByName(const wxString& name)
-{
-    wxColour col;
-
-    Display *dpy = wxGlobalDisplay();
-    WXColormap colormap = wxTheApp->GetMainColormap( dpy );
-    XColor xcol;
-    if ( XParseColor( dpy, (Colormap)colormap, name.mb_str(), &xcol ) )
-    {
-        wxColourRefData *refData = new wxColourRefData;
-        refData->m_colormap = colormap;
-        refData->m_color = xcol;
-        col.m_refData = refData;
-    }
-
-    return col;
-}
-
-void wxColour::InitFromName( const wxString &colourName )
-{
-    // check the cache first
-    wxColour col;
-    if ( wxTheColourDatabase )
-    {
-        col = wxTheColourDatabase->Find(colourName);
-    }
-
-    if ( !col.Ok() )
-    {
-        col = CreateByName(colourName);
-    }
-
-    if ( col.Ok() )
-    {
-        *this = col;
-    }
-    else
-    {
-        wxFAIL_MSG( wxT("wxColour: couldn't find colour") );
-    }
-}
-

 wxColour::~wxColour()
 {
 }
 
 bool wxColour::operator == ( const wxColour& col ) const
 {
 wxColour::~wxColour()
 {
 }
 
 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


@@ -227,11 +172,11 @@ wxObjectRefData *wxColour::CloneRefData(const wxObjectRefData *data) const
     return new wxColourRefData(*(wxColourRefData *)data);
 }
 
     return new wxColourRefData(*(wxColourRefData *)data);
 }
 

-void wxColour::Set( unsigned char red, unsigned char green, unsigned char blue )
+void wxColour::InitRGBA(unsigned char red, unsigned char green, unsigned char blue,
+                        unsigned char WXUNUSED(alpha))

 {
     AllocExclusive();
 {
     AllocExclusive();

-    
-    m_refData = new wxColourRefData();
+

 #if wxUSE_NANOX
     M_COLDATA->m_color.red = ((unsigned short)red) ;
     M_COLDATA->m_color.green = ((unsigned short)green) ;
 #if wxUSE_NANOX
     M_COLDATA->m_color.red = ((unsigned short)red) ;
     M_COLDATA->m_color.green = ((unsigned short)green) ;


@@ -299,3 +244,21 @@ WXColor *wxColour::GetColor() const
 
     return (WXColor*) &M_COLDATA->m_color;
 }
 
     return (WXColor*) &M_COLDATA->m_color;
 }

+
+bool wxColour::FromString(const wxString& name)
+{
+    Display *dpy = wxGlobalDisplay();
+    WXColormap colormap = wxTheApp->GetMainColormap( dpy );
+    XColor xcol;
+    if ( XParseColor( dpy, (Colormap)colormap, name.mbc_str(), &xcol ) )
+    {
+        UnRef();
+
+        m_refData = new wxColourRefData;
+        M_COLDATA->m_colormap = colormap;
+        M_COLDATA->m_color = xcol;
+        return true;
+    }
+
+    return wxColourBase::FromString(name);
+}