X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ac7f6cf0a9cff648a98e3cecea1f99626a5cd74a..0a9c5e3564ed35162bb8cab5af62a98405364fb8:/src/x11/colour.cpp?ds=sidebyside

diff --git a/src/x11/colour.cpp b/src/x11/colour.cpp
index 9ce03f2d5b..53ceebfce9 100644
--- 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
-// 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"
 
@@ -23,7 +25,7 @@
 // wxColour
 //-----------------------------------------------------------------------------
 
-class wxColourRefData: public wxObjectRefData
+class wxColourRefData : public wxGDIRefData
 {
 public:
     wxColourRefData()
@@ -32,23 +34,23 @@ public:
         m_color.green = 0;
         m_color.blue = 0;
         m_color.pixel = 0;
-        m_colormap = (WXColormap *) NULL;
+        m_colormap = NULL;
         m_hasPixel = false;
     }
-    wxColourRefData(const wxColourRefData& data):
-        wxObjectRefData()
+
+    wxColourRefData(const wxColourRefData& data)
     {
         m_color = data.m_color;
         m_colormap = data.m_colormap;
         m_hasPixel = data.m_hasPixel;
     }
 
-    ~wxColourRefData()
+    virtual ~wxColourRefData()
     {
         FreeColour();
     }
 
-    bool operator == (const wxColourRefData& data) const
+    bool operator==(const wxColourRefData& data) const
     {
         return (m_colormap == data.m_colormap &&
                 m_hasPixel == data.m_hasPixel &&
@@ -141,64 +143,6 @@ void wxColourRefData::AllocColour( WXColormap cmap )
 
 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()
 {
 }
@@ -218,21 +162,21 @@ bool wxColour::operator == ( const wxColour& col ) const
 
 }
 
-wxObjectRefData *wxColour::CreateRefData() const
+wxGDIRefData *wxColour::CreateGDIRefData() const
 {
     return new wxColourRefData;
 }
 
-wxObjectRefData *wxColour::CloneRefData(const wxObjectRefData *data) const
+wxGDIRefData *wxColour::CloneGDIRefData(const wxGDIRefData *data) const
 {
     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();
 
-    m_refData = new wxColourRefData();
 #if wxUSE_NANOX
     M_COLDATA->m_color.red = ((unsigned short)red) ;
     M_COLDATA->m_color.green = ((unsigned short)green) ;
@@ -296,7 +240,25 @@ unsigned long wxColour::GetPixel() const
 
 WXColor *wxColour::GetColor() const
 {
-    wxCHECK_MSG( Ok(), (WXColor *) NULL, wxT("invalid colour") );
+    wxCHECK_MSG( Ok(), NULL, wxT("invalid colour") );
 
     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);
+}