include wx/object.h now that wxConfigBase derives from wxObject

[wxWidgets.git] / include / wx / x11 / privx.h

diff --git a/include/wx/x11/privx.h b/include/wx/x11/privx.h
index 658ee94b34709aba2febca1380ab25e3f6325f13..4aa7098beeda9d250f6f497068e676337602385c 100644 (file)
--- a/include/wx/x11/privx.h
+++ b/include/wx/x11/privx.h
@@ -38,11 +38,11 @@ class WXDLLIMPEXP_CORE wxRegion;
 extern int wxCharCodeXToWX(KeySym keySym);
 extern KeySym wxCharCodeWXToX(int id);
 
-int wxGetBestMatchingPixel(Display *display, XColor *desiredColor, Colormap cmap);
+WXPixel wxGetBestMatchingPixel(Display *display, XColor *desiredColor, Colormap cmap);
 Pixmap XCreateInsensitivePixmap( Display *display, Pixmap pixmap );
 
 extern XColor g_itemColors[];
-extern int wxComputeColours (Display *display, wxColour * back, wxColour * fore);
+extern int wxComputeColours (Display *display, const wxColour * back, const wxColour * fore);
 
 // For convenience
 inline Display* wxGlobalDisplay() { return (Display*) wxGetDisplay(); }