rebaked with aboutdlg.* files

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

diff --git a/src/x11/colour.cpp b/src/x11/colour.cpp
index a0d96399cfb672c860a4eeb02626d68a6f72f1dc..6000924c832e2b9fd0858a4f260685073edb794c 100644 (file)
--- a/src/x11/colour.cpp
+++ b/src/x11/colour.cpp
@@ -14,8 +14,10 @@
 
 #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"
 
@@ -43,7 +45,7 @@ public:
         m_hasPixel = data.m_hasPixel;
     }
 
-    ~wxColourRefData()
+    virtual ~wxColourRefData()
     {
         FreeColour();
     }
@@ -170,7 +172,8 @@ wxObjectRefData *wxColour::CloneRefData(const wxObjectRefData *data) const
     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();
 
@@ -247,7 +250,7 @@ bool wxColour::FromString(const wxChar *name)
     Display *dpy = wxGlobalDisplay();
     WXColormap colormap = wxTheApp->GetMainColormap( dpy );
     XColor xcol;
-    if ( XParseColor( dpy, (Colormap)colormap, wxGTK_CONV_SYS( name ), &xcol ) )
+    if ( XParseColor( dpy, (Colormap)colormap, name , &xcol ) )
     {
         UnRef();