X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/968eb2ef396c78442ffea7a2463f3777ca6d1632..c3c62822fdda9d340179dec663a806e905882cc9:/include/wx/x11/privx.h diff --git a/include/wx/x11/privx.h b/include/wx/x11/privx.h index 658ee94b34..3e01dd4fcf 100644 --- a/include/wx/x11/privx.h +++ b/include/wx/x11/privx.h @@ -26,10 +26,10 @@ #pragma message enable nosimpint #endif -class WXDLLIMPEXP_CORE wxMouseEvent; -class WXDLLIMPEXP_CORE wxKeyEvent; -class WXDLLIMPEXP_CORE wxWindow; -class WXDLLIMPEXP_CORE wxRegion; +class WXDLLIMPEXP_FWD_CORE wxMouseEvent; +class WXDLLIMPEXP_FWD_CORE wxKeyEvent; +class WXDLLIMPEXP_FWD_CORE wxWindow; +class WXDLLIMPEXP_FWD_CORE wxRegion; // ---------------------------------------------------------------------------- // key events related functions @@ -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(); }