Merge in from trunk r64802 - r68625

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

diff --git a/src/x11/colour.cpp b/src/x11/colour.cpp
index 84a183959b2c68459f1c80729aebe243656d476c..bd3b94f578622e394dac126cf26f4fb347a0395a 100644 (file)
--- a/src/x11/colour.cpp
+++ b/src/x11/colour.cpp
@@ -25,7 +25,7 @@
 // wxColour
 //-----------------------------------------------------------------------------
 
 // wxColour
 //-----------------------------------------------------------------------------
 

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

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


@@ -34,11 +34,11 @@ 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 = (WXColormap *) NULL;
+        m_colormap = NULL;

         m_hasPixel = false;
     }
         m_hasPixel = false;
     }

-    wxColourRefData(const wxColourRefData& data):
-        wxObjectRefData()
+
+    wxColourRefData(const wxColourRefData& data)

     {
         m_color = data.m_color;
         m_colormap = data.m_colormap;
     {
         m_color = data.m_color;
         m_colormap = data.m_colormap;


@@ -50,7 +50,7 @@ public:
         FreeColour();
     }
 
         FreeColour();
     }
 

-    bool operator == (const wxColourRefData& data) const
+    bool operator==(const wxColourRefData& data) const

     {
         return (m_colormap == data.m_colormap &&
                 m_hasPixel == data.m_hasPixel &&
     {
         return (m_colormap == data.m_colormap &&
                 m_hasPixel == data.m_hasPixel &&


@@ -141,8 +141,6 @@ void wxColourRefData::AllocColour( WXColormap cmap )
 
 #define SHIFT (8*(sizeof(short int)-sizeof(char)))
 
 
 #define SHIFT (8*(sizeof(short int)-sizeof(char)))
 

-IMPLEMENT_DYNAMIC_CLASS(wxColour,wxGDIObject)
-

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


@@ -162,17 +160,18 @@ bool wxColour::operator == ( const wxColour& col ) const
 
 }
 
 
 }
 

-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::InitWith( 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();
 


@@ -190,7 +189,7 @@ void wxColour::InitWith( unsigned char red, unsigned char green, unsigned char b
 
 unsigned char wxColour::Red() const
 {
 
 unsigned char wxColour::Red() const
 {

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

 
 #if wxUSE_NANOX
     return (unsigned char) M_COLDATA->m_color.red ;
 
 #if wxUSE_NANOX
     return (unsigned char) M_COLDATA->m_color.red ;


@@ -201,7 +200,7 @@ unsigned char wxColour::Red() const
 
 unsigned char wxColour::Green() const
 {
 
 unsigned char wxColour::Green() const
 {

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

 
 #if wxUSE_NANOX
     return (unsigned char) M_COLDATA->m_color.green ;
 
 #if wxUSE_NANOX
     return (unsigned char) M_COLDATA->m_color.green ;


@@ -212,7 +211,7 @@ unsigned char wxColour::Green() const
 
 unsigned char wxColour::Blue() const
 {
 
 unsigned char wxColour::Blue() const
 {

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

 
 #if wxUSE_NANOX
     return (unsigned char) M_COLDATA->m_color.blue ;
 
 #if wxUSE_NANOX
     return (unsigned char) M_COLDATA->m_color.blue ;


@@ -223,7 +222,7 @@ unsigned char wxColour::Blue() const
 
 void wxColour::CalcPixel( WXColormap cmap )
 {
 
 void wxColour::CalcPixel( WXColormap cmap )
 {

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

 
     wxCHECK_RET( cmap, wxT("invalid colormap") );
 
 
     wxCHECK_RET( cmap, wxT("invalid colormap") );
 


@@ -232,24 +231,24 @@ void wxColour::CalcPixel( WXColormap cmap )
 
 unsigned long wxColour::GetPixel() const
 {
 
 unsigned long wxColour::GetPixel() const
 {

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

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

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

 
     return (WXColor*) &M_COLDATA->m_color;
 }
 
 
     return (WXColor*) &M_COLDATA->m_color;
 }
 

-bool wxColour::FromString(const wxChar *name)
+bool wxColour::FromString(const wxString& name)

 {
     Display *dpy = wxGlobalDisplay();
     WXColormap colormap = wxTheApp->GetMainColormap( dpy );
     XColor xcol;
 {
     Display *dpy = wxGlobalDisplay();
     WXColormap colormap = wxTheApp->GetMainColormap( dpy );
     XColor xcol;

-    if ( XParseColor( dpy, (Colormap)colormap, name , &xcol ) )
+    if ( XParseColor( dpy, (Colormap)colormap, name.mbc_str(), &xcol ) )

     {
         UnRef();
 
     {
         UnRef();