X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/40989e46b86777dd211faeb3e5d2366cdcc6d8cd..8e5ec129614e2473fd240f2a6e94ee56e3a9039b:/src/x11/colour.cpp diff --git a/src/x11/colour.cpp b/src/x11/colour.cpp index a0d96399cf..b894d933b2 100644 --- 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();