X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f7f78039d2e18114efdec0abe46dc4ed2d4529a8..bc07ab17bf5370f452e899128bf89cc7ca7b98f0:/include/wx/x11/privx.h?ds=inline diff --git a/include/wx/x11/privx.h b/include/wx/x11/privx.h index 2f5d931a85..4aa7098bee 100644 --- a/include/wx/x11/privx.h +++ b/include/wx/x11/privx.h @@ -16,14 +16,20 @@ #include "wx/utils.h" #include "wx/colour.h" +#if defined( __cplusplus ) && defined( __VMS ) +#pragma message disable nosimpint +#endif #include "X11/Xlib.h" #include "X11/Xatom.h" #include "X11/Xutil.h" +#if defined( __cplusplus ) && defined( __VMS ) +#pragma message enable nosimpint +#endif -class wxMouseEvent; -class wxKeyEvent; -class wxWindow; -class wxRegion; +class WXDLLIMPEXP_CORE wxMouseEvent; +class WXDLLIMPEXP_CORE wxKeyEvent; +class WXDLLIMPEXP_CORE wxWindow; +class WXDLLIMPEXP_CORE wxRegion; // ---------------------------------------------------------------------------- // key events related functions @@ -32,11 +38,11 @@ class 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(); }