[ 1508778 ] Fix for wxOwnerDrawnComboBox list selection rendering.

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

diff --git a/src/x11/colour.cpp b/src/x11/colour.cpp
index a0d96399cfb672c860a4eeb02626d68a6f72f1dc..b894d933b2c5a4d0e20397b2072999a568e5a331 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"
 
@@ -247,7 +249,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();