Don't assert in wxDataViewCtrl::ItemDeleted() if item doesn't exist.

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

diff --git a/src/x11/colour.cpp b/src/x11/colour.cpp
index ba921cda9dc1760a8000e5118988c45094e38547..53ceebfce940647fa1b97ffe64c981787810f8ad 100644 (file)
--- a/src/x11/colour.cpp
+++ b/src/x11/colour.cpp
@@ -14,8 +14,10 @@
 
 #include "wx/colour.h"
 
 
 #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"
 


@@ -23,7 +25,7 @@
 // wxColour
 //-----------------------------------------------------------------------------
 
 // wxColour
 //-----------------------------------------------------------------------------
 

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

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


@@ -32,23 +34,23 @@ 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_hasPixel = data.m_hasPixel;
     }
 
     {
         m_color = data.m_color;
         m_colormap = data.m_colormap;
         m_hasPixel = data.m_hasPixel;
     }
 

-    ~wxColourRefData()
+    virtual ~wxColourRefData()

     {
         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 &&


@@ -160,17 +162,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();
 


@@ -237,17 +240,17 @@ unsigned long wxColour::GetPixel() const
 
 WXColor *wxColour::GetColor() 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;
 }
 
 
     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();