missing commit

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

diff --git a/src/gtk1/colour.cpp b/src/gtk1/colour.cpp
index 1b82a30b01a39f2cfce2d81c7b5ea25b7aa70792..2057133fe5a211e983fbd425500ca60e4a1f1ecd 100644 (file)
--- a/src/gtk1/colour.cpp
+++ b/src/gtk1/colour.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$


@@ -7,12 +7,16 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

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

 
 

-#ifdef __GNUG__
-#pragma implementation "colour.h"
+#include "wx/colour.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/gdicmn.h"

 #endif
 
 #endif
 

-#include "wx/gdicmn.h"
+#include "wx/gtk1/private.h"

 
 #include <gdk/gdk.h>
 #include <gdk/gdkx.h>
 
 #include <gdk/gdk.h>
 #include <gdk/gdkx.h>


@@ -22,7 +26,7 @@
 // wxColour
 //-----------------------------------------------------------------------------
 
 // wxColour
 //-----------------------------------------------------------------------------
 

-class wxColourRefData: public wxObjectRefData
+class wxColourRefData : public wxGDIRefData

 {
 public:
     wxColourRefData()
 {
 public:
     wxColourRefData()


@@ -31,10 +35,10 @@ public:
         m_color.green = 0;
         m_color.blue = 0;
         m_color.pixel = 0;
         m_color.green = 0;
         m_color.blue = 0;
         m_color.pixel = 0;

-        m_colormap = (GdkColormap *) NULL;
-        m_hasPixel = FALSE;
+        m_colormap = NULL;
+        m_hasPixel = false;

     }
     }

-    
+

     wxColourRefData(const wxColourRefData& data)
     {
         m_color = data.m_color;
     wxColourRefData(const wxColourRefData& data)
     {
         m_color = data.m_color;


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

-    ~wxColourRefData()
+    virtual ~wxColourRefData()

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


@@ -56,7 +60,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( GdkColormap* cmap );
 
     void FreeColour();
     void AllocColour( GdkColormap* cmap );
 


@@ -70,8 +74,8 @@ public:
     static gushort colMapAllocCounter[ 256 ];
 };
 
     static gushort colMapAllocCounter[ 256 ];
 };
 

-gushort wxColourRefData::colMapAllocCounter[ 256 ] = 
-{  
+gushort 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,


@@ -91,20 +95,15 @@ void wxColourRefData::FreeColour()
 {
     if (m_colormap)
     {
 {
     if (m_colormap)
     {

-#ifdef __WXGTK20__
-        if ((m_colormap->visual->type == GDK_VISUAL_GRAYSCALE) ||
-            (m_colormap->visual->type == GDK_VISUAL_PSEUDO_COLOR))
-#else

         GdkColormapPrivate *private_colormap = (GdkColormapPrivate*) m_colormap;
         if ((private_colormap->visual->type == GDK_VISUAL_GRAYSCALE) ||
             (private_colormap->visual->type == GDK_VISUAL_PSEUDO_COLOR))
         GdkColormapPrivate *private_colormap = (GdkColormapPrivate*) m_colormap;
         if ((private_colormap->visual->type == GDK_VISUAL_GRAYSCALE) ||
             (private_colormap->visual->type == GDK_VISUAL_PSEUDO_COLOR))

-#endif

         {
             int idx = m_color.pixel;
             colMapAllocCounter[ idx ] = colMapAllocCounter[ idx ] - 1;
         {
             int idx = m_color.pixel;
             colMapAllocCounter[ idx ] = colMapAllocCounter[ idx ] - 1;

-        
+

             if (colMapAllocCounter[ idx ] == 0)
             if (colMapAllocCounter[ idx ] == 0)

-            gdk_colormap_free_colors( m_colormap, &m_color, 1 );
+                gdk_colormap_free_colors( m_colormap, &m_color, 1 );

         }
     }
 }
         }
     }
 }


@@ -115,15 +114,10 @@ void wxColourRefData::AllocColour( GdkColormap *cmap )
         return;
 
     FreeColour();
         return;
 
     FreeColour();

-    
-#ifdef __WXGTK20__
-    if ( (cmap->visual->type == GDK_VISUAL_GRAYSCALE) ||
-            (cmap->visual->type == GDK_VISUAL_PSEUDO_COLOR) )
-#else
+

     GdkColormapPrivate *private_colormap = (GdkColormapPrivate*) cmap;
     if ((private_colormap->visual->type == GDK_VISUAL_GRAYSCALE) ||
         (private_colormap->visual->type == GDK_VISUAL_PSEUDO_COLOR))
     GdkColormapPrivate *private_colormap = (GdkColormapPrivate*) cmap;
     if ((private_colormap->visual->type == GDK_VISUAL_GRAYSCALE) ||
         (private_colormap->visual->type == GDK_VISUAL_PSEUDO_COLOR))

-#endif

     {
         m_hasPixel = gdk_colormap_alloc_color( cmap, &m_color, FALSE, TRUE );
         int idx = m_color.pixel;
     {
         m_hasPixel = gdk_colormap_alloc_color( cmap, &m_color, FALSE, TRUE );
         int idx = m_color.pixel;


@@ -140,48 +134,8 @@ void wxColourRefData::AllocColour( GdkColormap *cmap )
 
 #define M_COLDATA ((wxColourRefData *)m_refData)
 
 
 #define M_COLDATA ((wxColourRefData *)m_refData)
 

-#define SHIFT (8*(sizeof(short int)-sizeof(char)))
-
-IMPLEMENT_DYNAMIC_CLASS(wxColour,wxGDIObject)
-
-wxColour::wxColour( unsigned char red, unsigned char green, unsigned char blue )
-{
-    m_refData = new wxColourRefData();
-    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.pixel = 0;
-}
-
-void wxColour::InitFromName( const wxString &colourName )
-{
-    wxNode *node = (wxNode *) NULL;
-    if ( (wxTheColourDatabase) && (node = wxTheColourDatabase->Find(colourName)) )
-    {
-        wxColour *col = (wxColour*)node->Data();
-        UnRef();
-        if (col) Ref( *col );
-    }
-    else
-    {
-        m_refData = new wxColourRefData();
-        
-        if (!gdk_color_parse( 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()
-
-            //wxFAIL_MSG( wxT("wxColour: couldn't find colour") );
-
-            delete m_refData;
-            m_refData = (wxObjectRefData *) NULL;
-        }
-    }
-}
+// GDK's values are in 0..65535 range, our are in 0..255
+#define SHIFT  8

 
 wxColour::~wxColour()
 {
 
 wxColour::~wxColour()
 {


@@ -189,80 +143,96 @@ 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;

 
     GdkColor *own = &(((wxColourRefData*)m_refData)->m_color);
     GdkColor *other = &(((wxColourRefData*)col.m_refData)->m_color);
 
     GdkColor *own = &(((wxColourRefData*)m_refData)->m_color);
     GdkColor *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->blue == other->blue &&
+                     own->green == other->green;

 }
 
 }
 

-wxObjectRefData *wxColour::CreateRefData() const
+wxGDIRefData *wxColour::CreateGDIRefData() const

 {
     return new wxColourRefData;
 }
 
 {
     return new wxColourRefData;
 }
 

-wxObjectRefData *wxColour::CloneRefData(const wxObjectRefData *data) const
+wxGDIRefData *wxColour::CloneGDIRefData(const wxGDIRefData *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();
+

     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.pixel = 0;
     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.pixel = 0;

+
+    M_COLDATA->m_colormap = NULL;
+    M_COLDATA->m_hasPixel = false;

 }
 
 unsigned char wxColour::Red() const
 {
 }
 
 unsigned char wxColour::Red() const
 {

-    wxCHECK_MSG( Ok(), 0, wxT("invalid colour") );
+    wxCHECK_MSG( IsOk(), 0, wxT("invalid colour") );

 
     return (unsigned char)(M_COLDATA->m_color.red >> SHIFT);
 }
 
 unsigned char wxColour::Green() const
 {
 
     return (unsigned char)(M_COLDATA->m_color.red >> SHIFT);
 }
 
 unsigned char wxColour::Green() const
 {

-    wxCHECK_MSG( Ok(), 0, wxT("invalid colour") );
+    wxCHECK_MSG( IsOk(), 0, wxT("invalid colour") );

 
     return (unsigned char)(M_COLDATA->m_color.green >> SHIFT);
 }
 
 unsigned char wxColour::Blue() const
 {
 
     return (unsigned char)(M_COLDATA->m_color.green >> SHIFT);
 }
 
 unsigned char wxColour::Blue() const
 {

-    wxCHECK_MSG( Ok(), 0, wxT("invalid colour") );
+    wxCHECK_MSG( IsOk(), 0, wxT("invalid colour") );

 
     return (unsigned char)(M_COLDATA->m_color.blue >> SHIFT);
 }
 
 void wxColour::CalcPixel( GdkColormap *cmap )
 {
 
     return (unsigned char)(M_COLDATA->m_color.blue >> SHIFT);
 }
 
 void wxColour::CalcPixel( GdkColormap *cmap )
 {

-    if (!Ok()) return;
+    if (!IsOk()) return;

 
     M_COLDATA->AllocColour( cmap );
 }
 
 int wxColour::GetPixel() const
 {
 
     M_COLDATA->AllocColour( cmap );
 }
 
 int wxColour::GetPixel() const
 {

-    wxCHECK_MSG( Ok(), 0, wxT("invalid colour") );
+    wxCHECK_MSG( IsOk(), 0, wxT("invalid colour") );

 
     return M_COLDATA->m_color.pixel;
 }
 
 GdkColor *wxColour::GetColor() const
 {
 
     return M_COLDATA->m_color.pixel;
 }
 
 GdkColor *wxColour::GetColor() const
 {

-    wxCHECK_MSG( Ok(), (GdkColor *) NULL, wxT("invalid colour") );
+    wxCHECK_MSG( IsOk(), NULL, wxT("invalid colour") );

 
     return &M_COLDATA->m_color;
 }
 
 
     return &M_COLDATA->m_color;
 }
 

+bool wxColour::FromString(const wxString& str)
+{
+    GdkColor colGDK;
+    if ( gdk_color_parse( wxGTK_CONV(str), &colGDK ) )
+    {
+        UnRef();
+
+        m_refData = new wxColourRefData;
+        M_COLDATA->m_color = colGDK;
+        return true;
+    }

 
 

+    return wxColourBase::FromString(str);
+}