Include wx/gauge.h according to precompiled headers of wx/wx.h (with other minor...

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

diff --git a/src/gtk/colour.cpp b/src/gtk/colour.cpp
index 3e2386a84073926599f9517ce69b1804ce2a9d8b..bc76dbfe65f7e13c8b8e637953fd6efd2c1c8597 100644 (file)
--- a/src/gtk/colour.cpp
+++ b/src/gtk/colour.cpp
@@ -11,12 +11,10 @@
 #include "wx/wxprec.h"
 
 #include "wx/colour.h"
-#include "wx/gdicmn.h"
+
 #include "wx/gtk/private.h"
 
 #include <gdk/gdk.h>
-#include <gdk/gdkx.h>
-#include <gdk/gdkprivate.h>
 
 //-----------------------------------------------------------------------------
 // wxColour
@@ -31,7 +29,7 @@ public:
         m_color.green = 0;
         m_color.blue = 0;
         m_color.pixel = 0;
-        m_colormap = (GdkColormap *) NULL;
+        m_colormap = NULL;
         m_hasPixel = false;
     }
 
@@ -48,59 +46,19 @@ public:
         FreeColour();
     }
 
-    bool operator == (const wxColourRefData& data) const
-    {
-        return (m_colormap == data.m_colormap &&
-                m_hasPixel == data.m_hasPixel &&
-                m_color.red == data.m_color.red &&
-                m_color.green == data.m_color.green &&
-                m_color.blue == data.m_color.blue &&
-                m_color.pixel == data.m_color.pixel);
-    }
-
     void FreeColour();
     void AllocColour( GdkColormap* cmap );
 
     GdkColor     m_color;
     GdkColormap *m_colormap;
     bool         m_hasPixel;
-
-    friend class wxColour;
-
-    // reference counter for systems with <= 8-Bit display
-    static gushort 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,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
 };
 
 void wxColourRefData::FreeColour()
 {
-    if (m_colormap)
+    if (m_hasPixel)
     {
-        if ((m_colormap->visual->type == GDK_VISUAL_GRAYSCALE) ||
-            (m_colormap->visual->type == GDK_VISUAL_PSEUDO_COLOR))
-        {
-            int idx = m_color.pixel;
-            colMapAllocCounter[ idx ] = colMapAllocCounter[ idx ] - 1;
-
-            if (colMapAllocCounter[ idx ] == 0)
-                gdk_colormap_free_colors( m_colormap, &m_color, 1 );
-        }
+        gdk_colormap_free_colors(m_colormap, &m_color, 1);
     }
 }
 
@@ -111,79 +69,19 @@ void wxColourRefData::AllocColour( GdkColormap *cmap )
 
     FreeColour();
 
-    if ( (cmap->visual->type == GDK_VISUAL_GRAYSCALE) ||
-         (cmap->visual->type == GDK_VISUAL_PSEUDO_COLOR) )
-    {
-        m_hasPixel = gdk_colormap_alloc_color( cmap, &m_color, FALSE, TRUE );
-        int idx = m_color.pixel;
-        colMapAllocCounter[ idx ] = colMapAllocCounter[ idx ] + 1;
-    }
-    else
-    {
-        m_hasPixel = gdk_color_alloc( cmap, &m_color );
-    }
+    m_hasPixel = gdk_colormap_alloc_color(cmap, &m_color, FALSE, TRUE);
     m_colormap = cmap;
 }
 
 //-----------------------------------------------------------------------------
 
-#define M_COLDATA ((wxColourRefData *)m_refData)
+#define M_COLDATA wx_static_cast(wxColourRefData*, m_refData)
 
 // GDK's values are in 0..65535 range, our are in 0..255
 #define SHIFT  8
 
 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;
-}
-
-/* static */
-wxColour wxColour::CreateByName(const wxString& name)
-{
-    wxColour col;
-
-    GdkColor colGDK;
-    if ( gdk_color_parse( wxGTK_CONV( name ), &colGDK ) )
-    {
-        wxColourRefData *refData = new wxColourRefData;
-        refData->m_color = colGDK;
-        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()
 {
 }
@@ -196,11 +94,11 @@ bool wxColour::operator == ( const wxColour& col ) const
     if (!m_refData || !col.m_refData)
         return false;
 
-    GdkColor *own = &(((wxColourRefData*)m_refData)->m_color);
-    GdkColor *other = &(((wxColourRefData*)col.m_refData)->m_color);
-    return own->red == other->red &&
-                own->blue == other->blue &&
-                     own->green == other->green;
+    const GdkColor& own = M_COLDATA->m_color;
+    const GdkColor& other = wx_static_cast(wxColourRefData*, col.m_refData)->m_color;
+    return own.red == other.red &&
+           own.blue == other.blue &&
+           own.green == other.green;
 }
 
 wxObjectRefData *wxColour::CreateRefData() const
@@ -213,7 +111,7 @@ wxObjectRefData *wxColour::CloneRefData(const wxObjectRefData *data) const
     return new wxColourRefData(*(wxColourRefData *)data);
 }
 
-void wxColour::Set( unsigned char red, unsigned char green, unsigned char blue )
+void wxColour::InitWith( unsigned char red, unsigned char green, unsigned char blue )
 {
     AllocExclusive();
 
@@ -222,7 +120,7 @@ void wxColour::Set( unsigned char red, unsigned char green, unsigned char blue )
     M_COLDATA->m_color.blue = ((unsigned short)blue) << SHIFT;
     M_COLDATA->m_color.pixel = 0;
 
-    M_COLDATA->m_colormap = (GdkColormap*) NULL;
+    M_COLDATA->m_colormap = NULL;
     M_COLDATA->m_hasPixel = false;
 }
 
@@ -263,7 +161,22 @@ int wxColour::GetPixel() const
 
 GdkColor *wxColour::GetColor() const
 {
-    wxCHECK_MSG( Ok(), (GdkColor *) NULL, wxT("invalid colour") );
+    wxCHECK_MSG( Ok(), NULL, wxT("invalid colour") );
 
     return &M_COLDATA->m_color;
 }
+
+bool wxColour::FromString(const wxChar *str)
+{
+    GdkColor colGDK;
+    if ( gdk_color_parse( wxGTK_CONV_SYS( str ), &colGDK ) )
+    {
+        UnRef();
+
+        m_refData = new wxColourRefData;
+        M_COLDATA->m_color = colGDK;
+        return true;
+    }
+
+    return wxColourBase::FromString(str);
+}